From a7f9d5a7fae029a6d65d55e353ff1b2aeb98f411 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 7 Jul 2020 12:04:21 +0200
Subject: Use QList instead of QVector in util

Task-number: QTBUG-84469
Change-Id: I077fb5c32456d438a457c1f73852313ea2ea9ae5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 util/lexgen/configfile.h  |  8 ++++----
 util/lexgen/generator.cpp |  6 +++---
 util/lexgen/generator.h   |  6 +++---
 util/lexgen/main.cpp      |  2 +-
 util/lexgen/nfa.cpp       |  2 +-
 util/lexgen/nfa.h         | 14 +++++++-------
 util/lexgen/re2nfa.h      |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'util/lexgen')

diff --git a/util/lexgen/configfile.h b/util/lexgen/configfile.h
index da891ea836..48dc65e0df 100644
--- a/util/lexgen/configfile.h
+++ b/util/lexgen/configfile.h
@@ -28,10 +28,10 @@
 #ifndef CONFIGFILE_H
 #define CONFIGFILE_H
 
-#include <QStringList>
-#include <QMap>
-#include <QVector>
 #include <QIODevice>
+#include <QList>
+#include <QMap>
+#include <QStringList>
 
 struct ConfigFile
 {
@@ -42,7 +42,7 @@ struct ConfigFile
         QString key;
         QString value;
     };
-    struct Section : public QVector<Entry>
+    struct Section : public QList<Entry>
     {
         inline bool contains(const QString &key) const
         {
diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp
index 3b966e025b..7f231ded11 100644
--- a/util/lexgen/generator.cpp
+++ b/util/lexgen/generator.cpp
@@ -223,9 +223,9 @@ static inline bool adjacentKeys(int left, int right) { return left + 1 == right;
 //static inline bool adjacentKeys(const InputType &left, const InputType &right)
 //{ return left.val + 1 == right.val; }
 
-static QVector<Generator::TransitionSequence> convertToSequences(const TransitionMap &transitions)
+static QList<Generator::TransitionSequence> convertToSequences(const TransitionMap &transitions)
 {
-    QVector<Generator::TransitionSequence> sequences;
+    QList<Generator::TransitionSequence> sequences;
     if (transitions.isEmpty())
         return sequences;
 
@@ -272,7 +272,7 @@ void Generator::generateTransitions(CodeBlock &body, const TransitionMap &transi
     if (transitions.isEmpty())
         return;
 
-    QVector<TransitionSequence> sequences = convertToSequences(transitions);
+    QList<TransitionSequence> sequences = convertToSequences(transitions);
 
     bool needsCharFunction = false;
     if (!charFunctionRanges.isEmpty()) {
diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h
index b323118b20..958ce75dd2 100644
--- a/util/lexgen/generator.h
+++ b/util/lexgen/generator.h
@@ -161,9 +161,9 @@ private:
     QString cname;
     struct Section
     {
-        QVector<Function> functions;
+        QList<Function> functions;
         QStringList variables;
-        QVector<Function> constructors;
+        QList<Function> constructors;
 
         inline bool isEmpty() const
         { return functions.isEmpty() && variables.isEmpty() && constructors.isEmpty(); }
@@ -202,7 +202,7 @@ public:
         QString testFunction;
     };
 private:
-    QVector<TransitionSequence> charFunctionRanges;
+    QList<TransitionSequence> charFunctionRanges;
 };
 
 #endif
diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp
index 517629f4c1..51b89048ea 100644
--- a/util/lexgen/main.cpp
+++ b/util/lexgen/main.cpp
@@ -203,7 +203,7 @@ static DFA generateMachine(const Config &cfg)
         return DFA();
     }
 
-    QVector<NFA> tokens;
+    QList<NFA> tokens;
 
     foreach (ConfigFile::Entry e, cfg.configSections.value("Tokens")) {
         int errCol = 0;
diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp
index b5c91c5cff..d9de21423f 100644
--- a/util/lexgen/nfa.cpp
+++ b/util/lexgen/nfa.cpp
@@ -430,7 +430,7 @@ void DFA::debug() const
 
 DFA DFA::minimize() const
 {
-    QVector<bool> inequivalentStates(count() * count());
+    QList<bool> inequivalentStates(count() * count());
     inequivalentStates.fill(false);
 
     for (int i = 0; i < count(); ++i)
diff --git a/util/lexgen/nfa.h b/util/lexgen/nfa.h
index 25656afacb..5481edce4c 100644
--- a/util/lexgen/nfa.h
+++ b/util/lexgen/nfa.h
@@ -29,13 +29,13 @@
 #ifndef NFA_H
 #define NFA_H
 
-#include <QMap>
-#include <QHash>
-#include <QString>
-#include <QVector>
+#include <QByteArray>
 #include <QDebug>
+#include <QHash>
+#include <QList>
+#include <QMap>
 #include <QStack>
-#include <QByteArray>
+#include <QString>
 
 #include "global.h"
 
@@ -57,7 +57,7 @@ inline QDataStream &operator>>(QDataStream &stream, State &state)
     return stream >> state.symbol >> state.transitions;
 }
 
-struct DFA : public QVector<State>
+struct DFA : public QList<State>
 {
     void debug() const;
     DFA minimize() const;
@@ -107,7 +107,7 @@ public:
     int initialState;
     int finalState;
 
-    QVector<State> states;
+    QList<State> states;
 };
 
 #endif // NFA_H
diff --git a/util/lexgen/re2nfa.h b/util/lexgen/re2nfa.h
index af3ea99af9..cacb04bf97 100644
--- a/util/lexgen/re2nfa.h
+++ b/util/lexgen/re2nfa.h
@@ -92,7 +92,7 @@ private:
     void tokenize(const QString &input);
 
     QMap<QString, NFA> macros;
-    QVector<Symbol> symbols;
+    QList<Symbol> symbols;
     int index;
     int errorColumn;
     const QSet<InputType> maxInputSet;
-- 
cgit v1.2.3