summaryrefslogtreecommitdiffstats
path: root/src/gui/text/windows
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 11:55:39 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 20:35:05 +0200
commit471e4fcb226c4523efe93b1bdaf0db026495da94 (patch)
treebb963937b2446eb32d7632568433083a386f2c68 /src/gui/text/windows
parent7f400522c39f6a1abf083dc1af49ea3109635cc8 (diff)
Use QList instead of QVector in gui implementation
Task-number: QTBUG-84469 Change-Id: I366e845249203d80d640355a7780ac2f91a762f1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/text/windows')
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase.cpp8
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase_ft.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index 6d9096786d..4db0043b7f 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -890,8 +890,8 @@ static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag,
static void getFamiliesAndSignatures(const QByteArray &fontData,
QList<QFontNames> *families,
- QVector<FONTSIGNATURE> *signatures,
- QVector<QFontValues> *values)
+ QList<FONTSIGNATURE> *signatures,
+ QList<QFontValues> *values)
{
const uchar *data = reinterpret_cast<const uchar *>(fontData.constData());
@@ -952,8 +952,8 @@ QStringList QWindowsFontDatabase::addApplicationFont(const QByteArray &fontData,
{
WinApplicationFont font;
font.fileName = fileName;
- QVector<FONTSIGNATURE> signatures;
- QVector<QFontValues> fontValues;
+ QList<FONTSIGNATURE> signatures;
+ QList<QFontValues> fontValues;
QList<QFontNames> families;
QStringList familyNames;
diff --git a/src/gui/text/windows/qwindowsfontdatabase_ft.cpp b/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
index e5a59d46f7..a576302dda 100644
--- a/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase_ft.cpp
@@ -111,7 +111,7 @@ struct FontKey
};
} // namespace
-typedef QVector<FontKey> FontKeys;
+using FontKeys = QList<FontKey>;
static FontKeys &fontKeys()
{