1 files changed, 17 insertions, 15 deletions

diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index 541523d49c..c7269bed5f 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -51,7 +51,9 @@ QTextStream &qout()
     static QTextStream result(stdout, QIODevice::WriteOnly);
     return result;
 }
+QT_END_NAMESPACE
 
+namespace std {
 bool operator < (Name a, Name b)
 {
     return *a < *b;
@@ -66,7 +68,7 @@ bool operator < (StatePointer a, StatePointer b)
 {
   return &*a < &*b;
 }
-QT_END_NAMESPACE
+}
 
 bool Read::operator < (const Read &other) const
 {
@@ -319,7 +321,7 @@ void Automaton::buildNullables ()
     }
 
 #ifndef QLALR_NO_DEBUG_NULLABLES
-  qerr() << "nullables = {" << nullables << endl;
+  qerr() << "nullables = {" << nullables << Qt::endl;
 #endif
 }
 
@@ -335,7 +337,7 @@ QPair<StatePointer, bool> Automaton::internState (const State &state)
 
 struct _Bucket
 {
-  QLinkedList<ItemPointer> items;
+  std::list<ItemPointer> items;
 
   void insert (ItemPointer item)
   { items.push_back (item); }
@@ -344,8 +346,8 @@ struct _Bucket
   {
     State st (aut->_M_grammar);
 
-    for (QLinkedList<ItemPointer>::iterator item = items.begin (); item != items.end (); ++item)
-      st.insert ((*item)->next ());
+    for (auto &item : items)
+      st.insert(item->next());
 
     return st;
   }
@@ -462,7 +464,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
             }
         }
@@ -493,7 +495,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
     }
 }
@@ -526,7 +528,7 @@ void Automaton::buildReadsDigraph ()
               dump (qerr(), source);
               qerr() << " reads ";
               dump (qerr(), target);
-              qerr() << endl;
+              qerr() << Qt::endl;
 #endif
             }
         }
@@ -561,7 +563,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)
@@ -641,7 +643,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;
@@ -663,7 +665,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
                 }
             }
@@ -680,7 +682,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)
@@ -696,7 +698,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];
@@ -732,7 +734,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 ());
@@ -760,7 +762,7 @@ void Automaton::buildDefaultReduceActions ()
           if (item->dot != item->end_rhs ())
             continue;
 
-          int la = lookaheads.value (item).size ();
+          int la = static_cast<int>(lookaheads.value(item).size());
           if (def == state->closure.end () || la > size)
             {
               def = item;