Qt6: Q{Text,Data}Stream::endl

These have been removed in Qt6, use Qt::endl instead (compiles with Qt5.15 LTS). Signed-off-by: John Bowler <jbowler@acm.org>
MeVisLab · Oct 2, 2023 · d9450b8 · d9450b8
1 parent 1801491
commit d9450b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/generator/generator.cpp b/generator/generator.cpp
@@ -91,7 +91,7 @@ void Generator::printClasses()
         if (!shouldGenerate(cls))
             continue;
         write(s, cls);
-        s << endl << endl;
+        s << Qt::endl << Qt::endl;
     }
 }
 

diff --git a/generator/typesystem.cpp b/generator/typesystem.cpp
@@ -1768,7 +1768,7 @@ QString formattedCodeHelper(QTextStream &s, Indentor &indentor, QStringList &lin
         const QString line = lines.takeFirst().trimmed();
         if (line.isEmpty()) {
             if (!lastEmpty)
-                s << endl;
+                s << Qt::endl;
             lastEmpty = true;
             continue;
         } else {
@@ -1781,23 +1781,23 @@ QString formattedCodeHelper(QTextStream &s, Indentor &indentor, QStringList &lin
             s << indentor;
             if (line.startsWith("*"))
                 s << " ";
-            s << line << endl;
+            s << line << Qt::endl;
             if (line.endsWith("*/"))
                 multilineComment = false;
         } else if (line.startsWith("}")) {
             return line;
         } else if (line.endsWith("}")) {
-            s << indentor << line << endl;
+            s << indentor << line << Qt::endl;
             return 0;
         } else if(line.endsWith("{")) {
-            s << indentor << line << endl;
+            s << indentor << line << Qt::endl;
             QString tmp;
             {
                 Indentation indent(indentor);
                 tmp = formattedCodeHelper(s, indentor, lines);
             }
             if (!tmp.isNull()) {
-                s << indentor << tmp << endl;
+                s << indentor << tmp << Qt::endl;
             }
             lastLine = tmp;
             continue;
@@ -1811,7 +1811,7 @@ QString formattedCodeHelper(QTextStream &s, Indentor &indentor, QStringList &lin
                 !lastLine.endsWith("}") &&
                 !line.startsWith("{"))
                 s << "    ";
-            s << line << endl;
+            s << line << Qt::endl;
         }
         lastLine = line;
     }
@@ -1825,7 +1825,7 @@ QTextStream &CodeSnip::formattedCode(QTextStream &s, Indentor &indentor) const
     while (!lst.isEmpty()) {
         QString tmp = formattedCodeHelper(s, indentor, lst);
         if (!tmp.isNull()) {
-            s << indentor << tmp << endl;
+            s << indentor << tmp << Qt::endl;
         }
     }
     s.flush();