diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 12:04:21 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 20:34:48 +0200 |
| commit | a7f9d5a7fae029a6d65d55e353ff1b2aeb98f411 (patch) | |
| tree | 3fd469d522a3acc5f48fb31eac0de1f27bb11e89 /util/unicode | |
| parent | c7c28b340662915a9f8fdb84c0a94c458fe6a290 (diff) | |
Use QList instead of QVector in util
Task-number: QTBUG-84469
Change-Id: I077fb5c32456d438a457c1f73852313ea2ea9ae5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'util/unicode')
| -rw-r--r-- | util/unicode/main.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
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 <qlist.h> -#include <qhash.h> -#include <qfile.h> #include <qbytearray.h> -#include <qstring.h> #include <qchar.h> -#include <qvector.h> #include <qdebug.h> +#include <qfile.h> +#include <qhash.h> +#include <qlist.h> +#include <qstring.h> #if 0 #include <private/qunicodetables_p.h> #endif @@ -2310,7 +2309,7 @@ struct UniqueBlock { { return values == other.values; } int index; - QVector<int> values; + QList<int> values; }; static QByteArray createPropertyInfo() @@ -2332,7 +2331,7 @@ static QByteArray createPropertyInfo() const int SMP_SHIFT = 8; QList<UniqueBlock> uniqueBlocks; - QVector<int> blockMap; + QList<int> 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<unsigned short> decompositions; + QList<unsigned short> decompositions; int tableIndex = 0; QList<UniqueBlock> uniqueBlocks; - QVector<int> blockMap; + QList<int> 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<UniqueBlock> uniqueBlocks; - QVector<int> blockMap; + QList<int> blockMap; int used = 0; for (int block = 0; block < BMP_END/BMP_BLOCKSIZE; ++block) { |