aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-13 15:28:45 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-20 11:37:07 +0100
commit98fea3ae261313b88cb3f67c7f9d3368e635cd51 (patch)
tree1d7672e40e01fd445050843d04fc2d20318cc732
parent62f3e6e012ee9e5738c6c3581fbf2f46414aab2c (diff)
Reduce QList usage
Prepare for migration to Qt 6 by using QVector where possible or auto. Change-Id: I7ee34e15a2ca534343ee5684ae24aadc0945eed9 Reviewed-by: André de la Rocha <andre.rocha@qt.io>
-rw-r--r--examples/winextras/iconextractor/main.cpp2
-rw-r--r--examples/winextras/musicplayer/musicplayer.cpp2
-rw-r--r--src/imports/winextras/qquickjumplist_p.h3
-rw-r--r--src/imports/winextras/qquickjumplistcategory_p.h3
-rw-r--r--src/imports/winextras/qquickthumbnailtoolbar_p.h3
5 files changed, 8 insertions, 5 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp
index b72a49a..97b869a 100644
--- a/examples/winextras/iconextractor/main.cpp
+++ b/examples/winextras/iconextractor/main.cpp
@@ -77,7 +77,7 @@ struct PixmapEntry {
QPixmap pixmap;
};
-using PixmapEntryList = QList<PixmapEntry>;
+using PixmapEntryList = QVector<PixmapEntry>;
static std::wostream &operator<<(std::wostream &str, const QString &s)
{
diff --git a/examples/winextras/musicplayer/musicplayer.cpp b/examples/winextras/musicplayer/musicplayer.cpp
index 2ecff56..4a598d8 100644
--- a/examples/winextras/musicplayer/musicplayer.cpp
+++ b/examples/winextras/musicplayer/musicplayer.cpp
@@ -154,7 +154,7 @@ void MusicPlayer::showEvent(QShowEvent *event)
static bool canHandleDrop(const QDropEvent *event)
{
- const QList<QUrl> urls = event->mimeData()->urls();
+ const auto urls = event->mimeData()->urls();
if (urls.size() != 1)
return false;
QMimeDatabase mimeDatabase;
diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h
index c686294..7b475be 100644
--- a/src/imports/winextras/qquickjumplist_p.h
+++ b/src/imports/winextras/qquickjumplist_p.h
@@ -55,6 +55,7 @@
#include <QObject>
#include <QQmlParserStatus>
#include <QQmlListProperty>
+#include <QVector>
QT_BEGIN_NAMESPACE
@@ -102,7 +103,7 @@ private:
QQuickJumpListCategory *m_recent = nullptr;
QQuickJumpListCategory *m_frequent = nullptr;
QQuickJumpListCategory *m_tasks = nullptr;
- QList<QQuickJumpListCategory *> m_categories;
+ QVector<QQuickJumpListCategory *> m_categories;
};
QT_END_NAMESPACE
diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h
index 69663f8..19fb65a 100644
--- a/src/imports/winextras/qquickjumplistcategory_p.h
+++ b/src/imports/winextras/qquickjumplistcategory_p.h
@@ -55,6 +55,7 @@
#include "qquickjumplistitem_p.h"
#include <QObject>
+#include <QVector>
#include <QQmlListProperty>
#include <QWinJumpListCategory>
#include <QWinJumpListItem>
@@ -97,7 +98,7 @@ private:
bool m_visible = true;
QString m_title;
- QList<QQuickJumpListItem *> m_items;
+ QVector<QQuickJumpListItem *> m_items;
};
QT_END_NAMESPACE
diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h
index 12a9d27..0ea47af 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar_p.h
+++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h
@@ -55,6 +55,7 @@
#include <QQuickItem>
#include <QWinThumbnailToolBar>
#include <QUrl>
+#include <QVector>
QT_BEGIN_NAMESPACE
@@ -117,7 +118,7 @@ private:
static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index);
QWinThumbnailToolBar m_toolbar;
- QList<QQuickThumbnailToolButton *> m_buttons;
+ QVector<QQuickThumbnailToolButton *> m_buttons;
QUrl m_iconicThumbnailSource;
QUrl m_iconicLivePreviewSource;
};