Prefix textstream operators with Qt::

As the non prefixed variants are deprecated

Change-Id: I2ba09d71b9cea5203b54297a3f2332e6d44fedcf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 152 insertions, 152 deletions

diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp
index 508db696b1..10b2d173ab 100644
--- a/src/tools/qlalr/cppgenerator.cpp
+++ b/src/tools/qlalr/cppgenerator.cpp
@@ -43,7 +43,7 @@ void generateSeparator(int i, QTextStream &out)
     if (!(i % 10)) {
         if (i)
             out << ",";
-        out << endl << "    ";
+        out << Qt::endl << "    ";
     } else {
         out << ", ";
     }
@@ -187,14 +187,14 @@ void CppGenerator::operator () ()
                 {
                   if (verbose)
                     qout() << "*** Warning. Found a reduce/reduce conflict in state " << q << " on token ``" << s << "'' between rule "
-                         << r << " and " << -u << endl;
+                         << r << " and " << -u << Qt::endl;
 
                   ++reduce_reduce_conflict_count;
 
                   u = qMax (u, -r);
 
                   if (verbose)
-                    qout() << "\tresolved using rule " << -u << endl;
+                    qout() << "\tresolved using rule " << -u << Qt::endl;
                 }
 
               else if (u > 0)
@@ -227,7 +227,7 @@ void CppGenerator::operator () ()
                       ++shift_reduce_conflict_count;
 
                       if (verbose)
-                        qout() << "*** Warning. Found a shift/reduce conflict in state " << q << " on token ``" << s << "'' with rule " << r << endl;
+                        qout() << "*** Warning. Found a shift/reduce conflict in state " << q << " on token ``" << s << "'' with rule " << r << Qt::endl;
                     }
                 }
             }
@@ -238,11 +238,11 @@ void CppGenerator::operator () ()
     {
       if (shift_reduce_conflict_count != grammar.expected_shift_reduce
           || reduce_reduce_conflict_count != grammar.expected_reduce_reduce)
-        qerr() << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << endl;
+        qerr() << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << Qt::endl;
 
       if (verbose)
-        qout() << endl << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << endl
-             << endl;
+        qout() << Qt::endl << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << Qt::endl
+             << Qt::endl;
     }
 
   QBitArray used_rules (grammar.rules.count ());
@@ -266,7 +266,7 @@ void CppGenerator::operator () ()
           RulePointer rule = grammar.rules.begin () + i;
 
           if (rule != grammar.goal)
-            qerr() << "*** Warning: Rule ``" << *rule << "'' is useless!" << endl;
+            qerr() << "*** Warning: Rule ``" << *rule << "'' is useless!" << Qt::endl;
         }
     }
 
@@ -348,26 +348,26 @@ void CppGenerator::operator () ()
         {
           out << copyrightHeader()
               << privateCopyrightHeader()
-              << endl;
+              << Qt::endl;
         }
 
       out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-      out << startIncludeGuard(grammar.merged_output) << endl;
+      out << startIncludeGuard(grammar.merged_output) << Qt::endl;
 
       if (copyright) {
-          out << "#if defined(ERROR)" << endl
-              << "#  undef ERROR" << endl
-              << "#endif" << endl << endl;
+          out << "#if defined(ERROR)" << Qt::endl
+              << "#  undef ERROR" << Qt::endl
+              << "#endif" << Qt::endl << Qt::endl;
       }
 
       generateDecl (out);
       generateImpl (out);
       out << p.decls();
       out << p.impls();
-      out << endl;
+      out << Qt::endl;
 
-      out << endIncludeGuard(grammar.merged_output) << endl;
+      out << endIncludeGuard(grammar.merged_output) << Qt::endl;
 
       return;
     }
@@ -388,24 +388,24 @@ void CppGenerator::operator () ()
       {
         out << copyrightHeader()
             << privateCopyrightHeader()
-            << endl;
+            << Qt::endl;
       }
 
     out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-    out << "#ifndef " << prot << endl
-        << "#define " << prot << endl
-        << endl;
+    out << "#ifndef " << prot << Qt::endl
+        << "#define " << prot << Qt::endl
+        << Qt::endl;
 
     if (copyright) {
-        out << "#include <QtCore/qglobal.h>" << endl << endl;
-        out << "QT_BEGIN_NAMESPACE" << endl << endl;
+        out << "#include <QtCore/qglobal.h>" << Qt::endl << Qt::endl;
+        out << "QT_BEGIN_NAMESPACE" << Qt::endl << Qt::endl;
     }
     generateDecl (out);
     if (copyright)
-        out << "QT_END_NAMESPACE" << endl;
+        out << "QT_END_NAMESPACE" << Qt::endl;
 
-    out << "#endif // " << prot << endl << endl;
+    out << "#endif // " << prot << Qt::endl << Qt::endl;
   } // end decls
 
   { // bits...
@@ -419,12 +419,12 @@ void CppGenerator::operator () ()
 
     out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-    out << "#include \"" << declFileName << "\"" << endl << endl;
+    out << "#include \"" << declFileName << "\"" << Qt::endl << Qt::endl;
     if (copyright)
-        out << "QT_BEGIN_NAMESPACE" << endl << endl;
+        out << "QT_BEGIN_NAMESPACE" << Qt::endl << Qt::endl;
     generateImpl(out);
     if (copyright)
-        out << "QT_END_NAMESPACE" << endl;
+        out << "QT_END_NAMESPACE" << Qt::endl;
 
   } // end bits
 
@@ -455,10 +455,10 @@ QString CppGenerator::debugInfoProt() const
 
 void CppGenerator::generateDecl (QTextStream &out)
 {
-  out << "class " << grammar.table_name << endl
-      << "{" << endl
-      << "public:" << endl
-      << "    enum VariousConstants {" << endl;
+  out << "class " << grammar.table_name << Qt::endl
+      << "{" << Qt::endl
+      << "public:" << Qt::endl
+      << "    enum VariousConstants {" << Qt::endl;
 
   for (const Name &t : qAsConst(grammar.terminals))
     {
@@ -474,62 +474,62 @@ void CppGenerator::generateDecl (QTextStream &out)
       else
         name.prepend (grammar.token_prefix);
 
-      out << "        " << name << " = " << value << "," << endl;
+      out << "        " << name << " = " << value << "," << Qt::endl;
     }
 
-  out << endl
-      << "        ACCEPT_STATE = " << accept_state << "," << endl
-      << "        RULE_COUNT = " << grammar.rules.size () << "," << endl
-      << "        STATE_COUNT = " << state_count << "," << endl
-      << "        TERMINAL_COUNT = " << terminal_count << "," << endl
-      << "        NON_TERMINAL_COUNT = " << non_terminal_count << "," << endl
-      << endl
-      << "        GOTO_INDEX_OFFSET = " << compressed_action.index.size () << "," << endl
-      << "        GOTO_INFO_OFFSET = " << compressed_action.info.size () << "," << endl
-      << "        GOTO_CHECK_OFFSET = " << compressed_action.check.size () << endl
-      << "    };" << endl
-      << endl
-      << "    static const char *const     spell[];" << endl
-      << "    static const short             lhs[];" << endl
-      << "    static const short             rhs[];" << endl;
+  out << Qt::endl
+      << "        ACCEPT_STATE = " << accept_state << "," << Qt::endl
+      << "        RULE_COUNT = " << grammar.rules.size () << "," << Qt::endl
+      << "        STATE_COUNT = " << state_count << "," << Qt::endl
+      << "        TERMINAL_COUNT = " << terminal_count << "," << Qt::endl
+      << "        NON_TERMINAL_COUNT = " << non_terminal_count << "," << Qt::endl
+      << Qt::endl
+      << "        GOTO_INDEX_OFFSET = " << compressed_action.index.size () << "," << Qt::endl
+      << "        GOTO_INFO_OFFSET = " << compressed_action.info.size () << "," << Qt::endl
+      << "        GOTO_CHECK_OFFSET = " << compressed_action.check.size () << Qt::endl
+      << "    };" << Qt::endl
+      << Qt::endl
+      << "    static const char *const     spell[];" << Qt::endl
+      << "    static const short             lhs[];" << Qt::endl
+      << "    static const short             rhs[];" << Qt::endl;
 
   if (debug_info)
     {
       QString prot = debugInfoProt();
 
-      out << endl << "#ifndef " << prot << endl
-          << "    static const int     rule_index[];" << endl
-          << "    static const int      rule_info[];" << endl
-          << "#endif // " << prot << endl << endl;
+      out << Qt::endl << "#ifndef " << prot << Qt::endl
+          << "    static const int     rule_index[];" << Qt::endl
+          << "    static const int      rule_info[];" << Qt::endl
+          << "#endif // " << prot << Qt::endl << Qt::endl;
     }
 
-  out << "    static const short    goto_default[];" << endl
-      << "    static const short  action_default[];" << endl
-      << "    static const short    action_index[];" << endl
-      << "    static const short     action_info[];" << endl
-      << "    static const short    action_check[];" << endl
-      << endl
-      << "    static inline int nt_action (int state, int nt)" << endl
-      << "    {" << endl
-      << "        const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;" << endl
-      << "        if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)" << endl
-      << "            return goto_default [nt];" << endl
-      << endl
-      << "        return action_info [GOTO_INFO_OFFSET + yyn];" << endl
-      << "    }" << endl
-      << endl
-      << "    static inline int t_action (int state, int token)" << endl
-      << "    {" << endl
-      << "        const int yyn = action_index [state] + token;" << endl
-      << endl
-      << "        if (yyn < 0 || action_check [yyn] != token)" << endl
-      << "            return - action_default [state];" << endl
-      << endl
-      << "        return action_info [yyn];" << endl
-      << "    }" << endl
-      << "};" << endl
-      << endl
-      << endl;
+  out << "    static const short    goto_default[];" << Qt::endl
+      << "    static const short  action_default[];" << Qt::endl
+      << "    static const short    action_index[];" << Qt::endl
+      << "    static const short     action_info[];" << Qt::endl
+      << "    static const short    action_check[];" << Qt::endl
+      << Qt::endl
+      << "    static inline int nt_action (int state, int nt)" << Qt::endl
+      << "    {" << Qt::endl
+      << "        const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;" << Qt::endl
+      << "        if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)" << Qt::endl
+      << "            return goto_default [nt];" << Qt::endl
+      << Qt::endl
+      << "        return action_info [GOTO_INFO_OFFSET + yyn];" << Qt::endl
+      << "    }" << Qt::endl
+      << Qt::endl
+      << "    static inline int t_action (int state, int token)" << Qt::endl
+      << "    {" << Qt::endl
+      << "        const int yyn = action_index [state] + token;" << Qt::endl
+      << Qt::endl
+      << "        if (yyn < 0 || action_check [yyn] != token)" << Qt::endl
+      << "            return - action_default [state];" << Qt::endl
+      << Qt::endl
+      << "        return action_info [yyn];" << Qt::endl
+      << "    }" << Qt::endl
+      << "};" << Qt::endl
+      << Qt::endl
+      << Qt::endl;
 }
 
 void CppGenerator::generateImpl (QTextStream &out)
@@ -568,16 +568,16 @@ void CppGenerator::generateImpl (QTextStream &out)
             {
               first_nt = false;
               QString prot = debugInfoProt();
-              out << endl << "#ifndef " << prot << endl;
+              out << Qt::endl << "#ifndef " << prot << Qt::endl;
             }
           out << "\"" << *t << "\"";
         }
     }
 
   if (debug_info)
-    out << endl << "#endif // " << debugInfoProt() << endl;
+    out << Qt::endl << "#endif // " << debugInfoProt() << Qt::endl;
 
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::lhs [] = {";
   idx = 0;
@@ -587,7 +587,7 @@ void CppGenerator::generateImpl (QTextStream &out)
 
       out << aut.id (rule->lhs);
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::rhs [] = {";
   idx = 0;
@@ -597,13 +597,13 @@ void CppGenerator::generateImpl (QTextStream &out)
 
       out << rule->rhs.size ();
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   if (debug_info)
     {
       QString prot = debugInfoProt();
 
-      out << endl << "#ifndef " << prot << endl;
+      out << Qt::endl << "#ifndef " << prot << Qt::endl;
       out << "const int " << grammar.table_name << "::rule_info [] = {";
       idx = 0;
       for (auto rule = grammar.rules.cbegin (); rule != grammar.rules.cend (); ++rule, ++idx)
@@ -615,7 +615,7 @@ void CppGenerator::generateImpl (QTextStream &out)
           for (const Name &n : rule->rhs)
             out << ", " << name_ids.value (n);
         }
-      out << endl << "};" << endl << endl;
+      out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
       out << "const int " << grammar.table_name << "::rule_index [] = {";
       idx = 0;
@@ -627,8 +627,8 @@ void CppGenerator::generateImpl (QTextStream &out)
           out << offset;
           offset += rule->rhs.size () + 1;
         }
-      out << endl << "};" << endl
-          << "#endif // " << prot << endl << endl;
+      out << Qt::endl << "};" << Qt::endl
+          << "#endif // " << prot << Qt::endl << Qt::endl;
     }
 
   out << "const short " << grammar.table_name << "::action_default [] = {";
@@ -642,27 +642,27 @@ void CppGenerator::generateImpl (QTextStream &out)
       else
         out << "0";
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::goto_default [] = {";
   generateList(defgoto, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_index [] = {";
   generateList(compressed_action.index, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.index, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_info [] = {";
   generateList(compressed_action.info, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.info, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_check [] = {";
   generateList(compressed_action.check, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.check, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 }
diff --git a/src/tools/qlalr/dotgraph.cpp b/src/tools/qlalr/dotgraph.cpp
index 1fa0a1ac77..1d479af2b2 100644
--- a/src/tools/qlalr/dotgraph.cpp
+++ b/src/tools/qlalr/dotgraph.cpp
@@ -41,9 +41,9 @@ void DotGraph::operator () (Automaton *aut)
 {
   Grammar *g = aut->_M_grammar;
 
-  out << "digraph {" << endl << endl;
+  out << "digraph {" << Qt::endl << Qt::endl;
 
-  out << "subgraph Includes {" << endl;
+  out << "subgraph Includes {" << Qt::endl;
   for (Automaton::IncludesGraph::iterator incl = Automaton::IncludesGraph::begin_nodes ();
        incl != Automaton::IncludesGraph::end_nodes (); ++incl)
     {
@@ -53,14 +53,14 @@ void DotGraph::operator () (Automaton *aut)
           out << "\t->\t";
           out << "\"(" << aut->id ((*edge)->data.state) << ", " << (*edge)->data.nt << ")\"\t";
           out << "[label=\"" << incl->data.state->follows [incl->data.nt] << "\"]";
-          out << endl;
+          out << Qt::endl;
         }
     }
-  out << "}" << endl << endl;
+  out << "}" << Qt::endl << Qt::endl;
 
 
-  out << "subgraph LRA {" << endl;
-  //out << "node [shape=record];" << endl << endl;
+  out << "subgraph LRA {" << Qt::endl;
+  //out << "node [shape=record];" << Qt::endl << Qt::endl;
 
   for (StatePointer q = aut->states.begin (); q != aut->states.end (); ++q)
     {
@@ -74,16 +74,16 @@ void DotGraph::operator () (Automaton *aut)
       for (ItemPointer item = q->kernel.begin (); item != q->kernel.end (); ++item)
         out << "| <" << index++ << "> " << *item;
 
-      out << "}\"]" << endl;
+      out << "}\"]" << Qt::endl;
 
       for (Bundle::iterator a = q->bundle.begin (); a != q->bundle.end (); ++a)
         {
           const char *clr = g->isTerminal (a.key ()) ? "blue" : "red";
-          out << "\t" << state << "\t->\t" << aut->id (*a) << "\t[color=\"" << clr << "\",label=\"" << a.key () << "\"]" << endl;
+          out << "\t" << state << "\t->\t" << aut->id (*a) << "\t[color=\"" << clr << "\",label=\"" << a.key () << "\"]" << Qt::endl;
         }
-      out << endl;
+      out << Qt::endl;
     }
 
-  out << "}" << endl;
-  out << endl << endl << "}" << endl;
+  out << "}" << Qt::endl;
+  out << Qt::endl << Qt::endl << "}" << Qt::endl;
 }
diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index ec960925aa..2a82eb154e 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -313,7 +313,7 @@ void Automaton::buildNullables ()
     }
 
 #ifndef QLALR_NO_DEBUG_NULLABLES
-  qerr() << "nullables = {" << nullables << endl;
+  qerr() << "nullables = {" << nullables << Qt::endl;
 #endif
 }
 
@@ -456,7 +456,7 @@ void Automaton::buildLookbackSets ()
               lookbacks.insert (item, Lookback (p, A));
 
 #ifndef QLALR_NO_DEBUG_LOOKBACKS
-              qerr() << "*** (" << id (q) << ", " << *rule << ") lookback (" << id (p) << ", " << *A << ")" << endl;
+              qerr() << "*** (" << id (q) << ", " << *rule << ") lookback (" << id (p) << ", " << *A << ")" << Qt::endl;
 #endif
             }
         }
@@ -487,7 +487,7 @@ void Automaton::buildDirectReads ()
 
 #ifndef QLALR_NO_DEBUG_DIRECT_READS
       for (QMap<Name, NameSet>::iterator dr = q->reads.begin (); dr != q->reads.end (); ++dr)
-        qerr() << "*** DR(" << id (q) << ", " << dr.key () << ") = " << dr.value () << endl;
+        qerr() << "*** DR(" << id (q) << ", " << dr.key () << ") = " << dr.value () << Qt::endl;
 #endif
     }
 }
@@ -520,7 +520,7 @@ void Automaton::buildReadsDigraph ()
               dump (qerr(), source);
               qerr() << " reads ";
               dump (qerr(), target);
-              qerr() << endl;
+              qerr() << Qt::endl;
 #endif
             }
         }
@@ -555,7 +555,7 @@ void Automaton::visitReadNode (ReadNode node)
   _M_reads_stack.push (node);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << endl;
+  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << Qt::endl;
 #endif
 
   for (ReadsGraph::edge_iterator edge = node->begin (); edge != node->end (); ++edge)
@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph ()
                       source->insertEdge (target);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-                      qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << endl;
+                      qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << Qt::endl;
 #endif // QLALR_NO_DEBUG_INCLUDES
 
                       continue;
@@ -657,7 +657,7 @@ void Automaton::buildIncludesDigraph ()
                   source->insertEdge (target);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-                  qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << endl;
+                  qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << Qt::endl;
 #endif // QLALR_NO_DEBUG_INCLUDES
                 }
             }
@@ -674,7 +674,7 @@ void Automaton::visitIncludeNode (IncludeNode node)
   _M_includes_stack.push (node);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << endl;
+  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << Qt::endl;
 #endif
 
   for (IncludesGraph::edge_iterator edge = node->begin (); edge != node->end (); ++edge)
@@ -690,7 +690,7 @@ void Automaton::visitIncludeNode (IncludeNode node)
       dump (qerr(), node);
       qerr() << " += follows";
       dump (qerr(), r);
-      qerr() << endl;
+      qerr() << Qt::endl;
 #endif
 
       NameSet &dst = node->data.state->follows [node->data.nt];
@@ -726,7 +726,7 @@ void Automaton::buildLookaheads ()
 #ifndef QLALR_NO_DEBUG_LOOKAHEADS
               qerr() << "(" << id (p) << ", " << *item->rule << ") lookbacks ";
               dump (qerr(), lookback);
-              qerr() << " with follows (" << id (q) << ", " << lookback.nt << ") = " << q->follows [lookback.nt] << endl;
+              qerr() << " with follows (" << id (q) << ", " << lookback.nt << ") = " << q->follows [lookback.nt] << Qt::endl;
 #endif
 
               lookaheads [item].insert (q->follows [lookback.nt].begin (), q->follows [lookback.nt].end ());
diff --git a/src/tools/qlalr/lalr.g b/src/tools/qlalr/lalr.g
index 05d30c21fd..a849800dd5 100644
--- a/src/tools/qlalr/lalr.g
+++ b/src/tools/qlalr/lalr.g
@@ -261,7 +261,7 @@ int Recognizer::nextToken()
       if (ch == QLatin1Char ('"'))
         inp ();
       else
-        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << endl;
+        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << Qt::endl;
 
       _M_current_value = text;
       return (token = STRING_LITERAL);
@@ -314,7 +314,7 @@ int Recognizer::nextToken()
         return (token = PREC);
       else
         {
-          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << endl;
+          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << Qt::endl;
           exit (EXIT_FAILURE);
           return (token = ERROR);
         }
@@ -659,7 +659,7 @@ case $rule_number: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -683,7 +683,7 @@ case $rule_number: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -712,7 +712,7 @@ case $rule_number: {
   Name tok = _M_grammar->intern (sym(2));
   if (! _M_grammar->isTerminal (tok))
     {
-      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << Qt::endl;
       _M_current_rule->prec = _M_grammar->names.end ();
     }
   else
@@ -758,7 +758,7 @@ case $rule_number: {
         }
     }
 
-  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << endl;
+  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << Qt::endl;
   return false;
 }
 
diff --git a/src/tools/qlalr/main.cpp b/src/tools/qlalr/main.cpp
index 5971eb201d..a920b13c85 100644
--- a/src/tools/qlalr/main.cpp
+++ b/src/tools/qlalr/main.cpp
@@ -44,15 +44,15 @@
 
 static void help_me ()
 {
-  qerr() << "Usage: qlalr [options] [input file name]" << endl
-       << endl
-       << "  --help, -h\t\tdisplay this help and exit" << endl
-       << "  --verbose, -v\t\tverbose output" << endl
-       << "  --no-debug\t\tno debug information" << endl
-       << "  --no-lines\t\tno #line directives" << endl
-       << "  --dot\t\t\tgenerate a graph" << endl
-       << "  --qt\t\tadd the Qt copyright header and Qt-specific types and macros" << endl
-       << endl;
+  qerr() << "Usage: qlalr [options] [input file name]" << Qt::endl
+       << Qt::endl
+       << "  --help, -h\t\tdisplay this help and exit" << Qt::endl
+       << "  --verbose, -v\t\tverbose output" << Qt::endl
+       << "  --no-debug\t\tno debug information" << Qt::endl
+       << "  --no-lines\t\tno #line directives" << Qt::endl
+       << "  --dot\t\t\tgenerate a graph" << Qt::endl
+       << "  --qt\t\tadd the Qt copyright header and Qt-specific types and macros" << Qt::endl
+       << Qt::endl;
   exit (0);
 }
 
@@ -91,7 +91,7 @@ int main (int argc, char *argv[])
         file_name = arg;
 
       else
-        qerr() << "*** Warning. Ignore argument `" << arg << "'" << endl;
+        qerr() << "*** Warning. Ignore argument `" << arg << "'" << Qt::endl;
     }
 
   if (file_name.isEmpty ())
@@ -108,13 +108,13 @@ int main (int argc, char *argv[])
 
   if (grammar.rules.isEmpty ())
     {
-      qerr() << "*** Fatal. No rules!" << endl;
+      qerr() << "*** Fatal. No rules!" << Qt::endl;
       exit (EXIT_FAILURE);
     }
 
   else if (grammar.start == grammar.names.end ())
     {
-      qerr() << "*** Fatal. No start symbol!" << endl;
+      qerr() << "*** Fatal. No start symbol!" << Qt::endl;
       exit (EXIT_FAILURE);
     }
 
diff --git a/src/tools/qlalr/parsetable.cpp b/src/tools/qlalr/parsetable.cpp
index c88ac1291e..9e71acebb4 100644
--- a/src/tools/qlalr/parsetable.cpp
+++ b/src/tools/qlalr/parsetable.cpp
@@ -43,13 +43,13 @@ void ParseTable::operator () (Automaton *aut)
 
   int rindex = 1;
   for (RulePointer rule = g->rules.begin (); rule != g->rules.end (); ++rule)
-    out << rindex++ << ")\t" << *rule << endl;
-  out << endl << endl;
+    out << rindex++ << ")\t" << *rule << Qt::endl;
+  out << Qt::endl << Qt::endl;
 
   int index = 0;
   for (StatePointer state = aut->states.begin (); state != aut->states.end (); ++state)
     {
-      out << "state " << index++ << endl << endl;
+      out << "state " << index++ << Qt::endl << Qt::endl;
 
       for (ItemPointer item = state->kernel.begin (); item != state->kernel.end (); ++item)
         {
@@ -58,7 +58,7 @@ void ParseTable::operator () (Automaton *aut)
           if (item->dot == item->end_rhs ())
             out << " " << aut->lookaheads [item];
 
-          out << endl;
+          out << Qt::endl;
         }
 
       bool first = true;
@@ -68,11 +68,11 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
-          out << "    " << *arrow.key () << " shift, and go to state " << std::distance (aut->states.begin (), *arrow) << endl;
+          out << "    " << *arrow.key () << " shift, and go to state " << std::distance (aut->states.begin (), *arrow) << Qt::endl;
         }
 
       first = true;
@@ -82,13 +82,13 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
           const auto lookaheads = aut->lookaheads.value(item);
           for (const Name &la : lookaheads)
-            out << "    " << *la << " reduce using rule " << aut->id (item->rule) << " (" << *item->rule->lhs << ")" << endl;
+            out << "    " << *la << " reduce using rule " << aut->id (item->rule) << " (" << *item->rule->lhs << ")" << Qt::endl;
         }
 
       first = true;
@@ -98,19 +98,19 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
-          out << "    " << *arrow.key () << " go to state " << std::distance (aut->states.begin (), *arrow) << endl;
+          out << "    " << *arrow.key () << " go to state " << std::distance (aut->states.begin (), *arrow) << Qt::endl;
         }
 
       if (state->defaultReduce != g->rules.end ())
         {
-          out << endl
-              << "    $default reduce using rule " << aut->id (state->defaultReduce) << " (" << *state->defaultReduce->lhs << ")" << endl;
+          out << Qt::endl
+              << "    $default reduce using rule " << aut->id (state->defaultReduce) << " (" << *state->defaultReduce->lhs << ")" << Qt::endl;
         }
 
-      out << endl;
+      out << Qt::endl;
     }
 }
diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index ab797c85d0..3da54c0c6a 100644
--- a/src/tools/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
@@ -97,7 +97,7 @@ int Recognizer::nextToken()
       if (ch == QLatin1Char ('"'))
         inp ();
       else
-        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << endl;
+        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << Qt::endl;
 
       _M_current_value = text;
       return (token = STRING_LITERAL);
@@ -150,7 +150,7 @@ int Recognizer::nextToken()
         return (token = PREC);
       else
         {
-          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << endl;
+          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << Qt::endl;
           exit (EXIT_FAILURE);
           return (token = ERROR);
         }
@@ -405,7 +405,7 @@ case 34: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -420,7 +420,7 @@ case 38: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -443,7 +443,7 @@ case 40: {
   Name tok = _M_grammar->intern (sym(2));
   if (! _M_grammar->isTerminal (tok))
     {
-      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << Qt::endl;
       _M_current_rule->prec = _M_grammar->names.end ();
     }
   else
@@ -474,7 +474,7 @@ case 43: {
         }
     }
 
-  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << endl;
+  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << Qt::endl;
   return false;
 }