1 files changed, 23 insertions, 46 deletions

diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index c3d3da41fa..51f1d94a40 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the utils of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "lalr.h"
 
@@ -39,16 +14,18 @@
 #define QLALR_NO_DEBUG_INCLUDES
 #define QLALR_NO_DEBUG_LOOKAHEADS
 
+using namespace Qt::StringLiterals;
+
 QT_BEGIN_NAMESPACE
 QTextStream &qerr()
 {
-    static QTextStream result(stderr, QIODevice::WriteOnly);
+    static QTextStream result(stderr, QTextStream::WriteOnly);
     return result;
 }
 
 QTextStream &qout()
 {
-    static QTextStream result(stdout, QIODevice::WriteOnly);
+    static QTextStream result(stdout, QTextStream::WriteOnly);
     return result;
 }
 QT_END_NAMESPACE
@@ -162,24 +139,24 @@ State::State (Grammar *g):
 {
 }
 
-QPair<ItemPointer, bool> State::insert (const Item &item)
+std::pair<ItemPointer, bool> State::insert(const Item &item)
 {
   ItemPointer it = std::find (kernel.begin (), kernel.end (), item);
 
   if (it != kernel.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (kernel.insert (it, item), true);
+  return {kernel.insert(it, item), true};
 }
 
-QPair<ItemPointer, bool> State::insertClosure (const Item &item)
+std::pair<ItemPointer, bool> State::insertClosure(const Item &item)
 {
   ItemPointer it = std::find (closure.begin (), closure.end (), item);
 
   if (it != closure.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (closure.insert (it, item), true);
+  return {closure.insert (it, item), true};
 }
 
 
@@ -194,11 +171,11 @@ Grammar::Grammar ():
   current_prec = 0;
   current_assoc = NonAssoc;
 
-  table_name = QLatin1String ("parser_table");
+  table_name = "parser_table"_L1;
 
   tk_end = intern ("$end");
   terminals.insert (tk_end);
-  spells.insert (tk_end, QLatin1String("end of file"));
+  spells.insert (tk_end, "end of file"_L1);
 
   /*tk_error= terminals.insert (intern ("error"))*/;
 }
@@ -319,14 +296,14 @@ void Automaton::buildNullables ()
 #endif
 }
 
-QPair<StatePointer, bool> Automaton::internState (const State &state)
+std::pair<StatePointer, bool> Automaton::internState(const State &state)
 {
   StatePointer it = std::find (states.begin (), states.end (), state);
 
   if (it != states.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (states.insert (it, state), true);
+  return {states.insert (it, state), true};
 }
 
 struct _Bucket
@@ -374,7 +351,7 @@ void Automaton::closure (StatePointer state)
 
       if (_M_grammar->isNonTerminal (*item->dot))
         {
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(*item->dot);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(*item->dot);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -382,7 +359,7 @@ void Automaton::closure (StatePointer state)
               ii.rule = rule;
               ii.dot = rule->rhs.begin ();
 
-              QPair<ItemPointer, bool> r = state->insertClosure (ii);
+              std::pair<ItemPointer, bool> r = state->insertClosure(ii);
 
               if (r.second)
                 working_list.push (r.first);
@@ -394,7 +371,7 @@ void Automaton::closure (StatePointer state)
 
   for (bucket_map_type::iterator bucket = buckets.begin (); bucket != buckets.end (); ++bucket)
     {
-      QPair<StatePointer, bool> r = internState (bucket->toState (this));
+      std::pair<StatePointer, bool> r = internState(bucket->toState(this));
 
       StatePointer target = r.first;
 
@@ -422,7 +399,7 @@ void Automaton::buildLookbackSets ()
           if (! _M_grammar->isNonTerminal (A))
             continue;
 
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(A);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(A);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -617,7 +594,7 @@ void Automaton::buildIncludesDigraph ()
           if (! _M_grammar->isNonTerminal (name))
             continue;
 
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(name);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(name);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -719,7 +696,7 @@ void Automaton::buildLookaheads ()
     {
       for (ItemPointer item = p->closure.begin (); item != p->closure.end (); ++item)
         {
-          const auto range = qAsConst(lookbacks).equal_range(item);
+          const auto range = std::as_const(lookbacks).equal_range(item);
           for (auto it = range.first; it != range.second; ++it)
             {
               const Lookback &lookback = *it;