From a7f9d5a7fae029a6d65d55e353ff1b2aeb98f411 Mon Sep 17 00:00:00 2001 From: Jarek Kobus 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 --- util/corelib/qurl-generateTLDs/main.cpp | 2 +- util/gradientgen/gradientgen.cpp | 6 +++--- 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 +- util/unicode/main.cpp | 19 +++++++++---------- 10 files changed, 33 insertions(+), 34 deletions(-) (limited to 'util') diff --git a/util/corelib/qurl-generateTLDs/main.cpp b/util/corelib/qurl-generateTLDs/main.cpp index ef61a62abf..ba2bcdbebd 100644 --- a/util/corelib/qurl-generateTLDs/main.cpp +++ b/util/corelib/qurl-generateTLDs/main.cpp @@ -129,7 +129,7 @@ int main(int argc, char **argv) outFile.write(";\n"); file.reset(); - QVector strings(lineCount); + QStringList strings(lineCount); while (!file.atEnd()) { QString st = QString::fromUtf8(file.readLine()).trimmed(); int num = qt_hash(st) % lineCount; diff --git a/util/gradientgen/gradientgen.cpp b/util/gradientgen/gradientgen.cpp index bd89ae7383..44ef501b3d 100644 --- a/util/gradientgen/gradientgen.cpp +++ b/util/gradientgen/gradientgen.cpp @@ -32,12 +32,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include @@ -174,7 +174,7 @@ static void printGradientStops(Printer &p, const QJsonArray &presets) const QJsonArray stops = preset[QLatin1String("stops")].toArray(); Q_ASSERT(!stops.isEmpty()); - QVector gradientStops; + QList gradientStops; gradientStops.reserve(stops.size()); std::transform(stops.cbegin(), stops.cend(), 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 -#include -#include #include +#include +#include +#include struct ConfigFile { @@ -42,7 +42,7 @@ struct ConfigFile QString key; QString value; }; - struct Section : public QVector + struct Section : public QList { 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 convertToSequences(const TransitionMap &transitions) +static QList convertToSequences(const TransitionMap &transitions) { - QVector sequences; + QList sequences; if (transitions.isEmpty()) return sequences; @@ -272,7 +272,7 @@ void Generator::generateTransitions(CodeBlock &body, const TransitionMap &transi if (transitions.isEmpty()) return; - QVector sequences = convertToSequences(transitions); + QList 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 functions; + QList functions; QStringList variables; - QVector constructors; + QList constructors; inline bool isEmpty() const { return functions.isEmpty() && variables.isEmpty() && constructors.isEmpty(); } @@ -202,7 +202,7 @@ public: QString testFunction; }; private: - QVector charFunctionRanges; + QList 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 tokens; + QList 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 inequivalentStates(count() * count()); + QList 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 -#include -#include -#include +#include #include +#include +#include +#include #include -#include +#include #include "global.h" @@ -57,7 +57,7 @@ inline QDataStream &operator>>(QDataStream &stream, State &state) return stream >> state.symbol >> state.transitions; } -struct DFA : public QVector +struct DFA : public QList { void debug() const; DFA minimize() const; @@ -107,7 +107,7 @@ public: int initialState; int finalState; - QVector states; + QList 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 macros; - QVector symbols; + QList symbols; int index; int errorColumn; const QSet maxInputSet; diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 32cc1d32e1..1ed3bba0e4 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -26,14 +26,13 @@ ** ****************************************************************************/ -#include -#include -#include #include -#include #include -#include #include +#include +#include +#include +#include #if 0 #include #endif @@ -2310,7 +2309,7 @@ struct UniqueBlock { { return values == other.values; } int index; - QVector values; + QList values; }; static QByteArray createPropertyInfo() @@ -2332,7 +2331,7 @@ static QByteArray createPropertyInfo() const int SMP_SHIFT = 8; QList uniqueBlocks; - QVector blockMap; + QList blockMap; int used = 0; for (int block = 0; block < BMP_END/BMP_BLOCKSIZE; ++block) { @@ -2617,11 +2616,11 @@ static QByteArray createCompositionInfo() if (SMP_END <= highestComposedCharacter) qFatal("end of table smaller than highest composed character 0x%x", highestComposedCharacter); - QVector decompositions; + QList decompositions; int tableIndex = 0; QList uniqueBlocks; - QVector blockMap; + QList blockMap; int used = 0; for (int block = 0; block < BMP_END/BMP_BLOCKSIZE; ++block) { @@ -2832,7 +2831,7 @@ static QByteArray createLigatureInfo() int tableIndex = 0; QList uniqueBlocks; - QVector blockMap; + QList blockMap; int used = 0; for (int block = 0; block < BMP_END/BMP_BLOCKSIZE; ++block) { -- cgit v1.2.3