Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I458409460d6b3009e3e846d0472af91a039f042d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

20 files changed, 43 insertions, 44 deletions

diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp
index 3fafada..6e11816 100644
--- a/examples/winextras/iconextractor/main.cpp
+++ b/examples/winextras/iconextractor/main.cpp
@@ -77,7 +77,7 @@ struct PixmapEntry {
     QPixmap pixmap;
 };
 
-using PixmapEntryList = QVector<PixmapEntry>;
+using PixmapEntryList = QList<PixmapEntry>;
 
 static std::wostream &operator<<(std::wostream &str, const QString &s)
 {
diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h
index 67c43f0..25bf2e2 100644
--- a/src/imports/winextras/qquickjumplist_p.h
+++ b/src/imports/winextras/qquickjumplist_p.h
@@ -57,7 +57,7 @@
 #include <QObject>
 #include <QQmlParserStatus>
 #include <QQmlListProperty>
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 
@@ -105,7 +105,7 @@ private:
     QQuickJumpListCategory *m_recent = nullptr;
     QQuickJumpListCategory *m_frequent = nullptr;
     QQuickJumpListCategory *m_tasks = nullptr;
-    QVector<QQuickJumpListCategory *> m_categories;
+    QList<QQuickJumpListCategory *> m_categories;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp
index 8a578ed..30183f4 100644
--- a/src/imports/winextras/qquickjumplistcategory.cpp
+++ b/src/imports/winextras/qquickjumplistcategory.cpp
@@ -122,9 +122,9 @@ void QQuickJumpListCategory::setVisible(bool visible)
     }
 }
 
-QVector<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
+QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
 {
-    QVector<QWinJumpListItem *> items;
+    QList<QWinJumpListItem *> items;
     for (QQuickJumpListItem *item : m_items)
         items.append(item->toJumpListItem());
     return items;
diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h
index 1028fcd..9e1fda7 100644
--- a/src/imports/winextras/qquickjumplistcategory_p.h
+++ b/src/imports/winextras/qquickjumplistcategory_p.h
@@ -55,7 +55,7 @@
 #include "qquickjumplistitem_p.h"
 
 #include <QObject>
-#include <QVector>
+#include <QList>
 #include <QQmlListProperty>
 #include <QWinJumpListCategory>
 #include <QWinJumpListItem>
@@ -84,7 +84,7 @@ public:
     QQmlListProperty<QObject> data();
     QQmlListProperty<QQuickJumpListItem> items();
 
-    QVector<QWinJumpListItem *> toItemList() const;
+    QList<QWinJumpListItem *> toItemList() const;
 
 Q_SIGNALS:
     void itemsChanged();
@@ -98,7 +98,7 @@ private:
 
     bool m_visible = true;
     QString m_title;
-    QVector<QQuickJumpListItem *> m_items;
+    QList<QQuickJumpListItem *> m_items;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h
index 0ea47af..fc1e67a 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar_p.h
+++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h
@@ -55,7 +55,7 @@
 #include <QQuickItem>
 #include <QWinThumbnailToolBar>
 #include <QUrl>
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 
@@ -118,7 +118,7 @@ private:
     static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index);
 
     QWinThumbnailToolBar m_toolbar;
-    QVector<QQuickThumbnailToolButton *> m_buttons;
+    QList<QQuickThumbnailToolButton *> m_buttons;
     QUrl m_iconicThumbnailSource;
     QUrl m_iconicLivePreviewSource;
 };
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index 78efbff..f479096 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -217,7 +217,7 @@ void QWinJumpListPrivate::appendCustomCategory(QWinJumpListCategory *category)
     }
 }
 
-void QWinJumpListPrivate::appendTasks(const QVector<QWinJumpListItem *> &items)
+void QWinJumpListPrivate::appendTasks(const QList<QWinJumpListItem *> &items)
 {
     IObjectCollection *collection = toComCollection(items);
     if (collection) {
@@ -228,9 +228,9 @@ void QWinJumpListPrivate::appendTasks(const QVector<QWinJumpListItem *> &items)
     }
 }
 
-QVector<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *array)
+QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *array)
 {
-    QVector<QWinJumpListItem *> list;
+    QList<QWinJumpListItem *> list;
     UINT count = 0;
     array->GetCount(&count);
     for (UINT i = 0; i < count; ++i) {
@@ -259,7 +259,7 @@ QVector<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray
     return list;
 }
 
-IObjectCollection *QWinJumpListPrivate::toComCollection(const QVector<QWinJumpListItem *> &list)
+IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpListItem *> &list)
 {
     if (list.isEmpty())
         return nullptr;
@@ -531,7 +531,7 @@ QWinJumpListCategory *QWinJumpList::tasks() const
 /*!
     Returns the custom categories in the jump list.
  */
-QVector<QWinJumpListCategory *> QWinJumpList::categories() const
+QList<QWinJumpListCategory *> QWinJumpList::categories() const
 {
     Q_D(const QWinJumpList);
     return d->categories;
@@ -556,7 +556,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category)
     Creates a custom category with provided \a title and optional \a items,
     and adds it to the jump list.
  */
-QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QVector<QWinJumpListItem *> items)
+QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList<QWinJumpListItem *> items)
 {
     auto *category = new QWinJumpListCategory(title);
     for (QWinJumpListItem *item : items)
diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h
index cb16228..b4807dd 100644
--- a/src/winextras/qwinjumplist.h
+++ b/src/winextras/qwinjumplist.h
@@ -68,9 +68,9 @@ public:
     QWinJumpListCategory *frequent() const;
     QWinJumpListCategory *tasks() const;
 
-    QVector<QWinJumpListCategory *> categories() const;
+    QList<QWinJumpListCategory *> categories() const;
     void addCategory(QWinJumpListCategory *category);
-    QWinJumpListCategory *addCategory(const QString &title, const QVector<QWinJumpListItem *> items = QVector<QWinJumpListItem *>());
+    QWinJumpListCategory *addCategory(const QString &title, const QList<QWinJumpListItem *> items = QList<QWinJumpListItem *>());
 
 public Q_SLOTS:
     void clear();
diff --git a/src/winextras/qwinjumplist_p.h b/src/winextras/qwinjumplist_p.h
index 2704d29..ff54f96 100644
--- a/src/winextras/qwinjumplist_p.h
+++ b/src/winextras/qwinjumplist_p.h
@@ -79,10 +79,10 @@ public:
 
     void appendKnownCategory(KNOWNDESTCATEGORY category);
     void appendCustomCategory(QWinJumpListCategory *category);
-    void appendTasks(const QVector<QWinJumpListItem *> &items);
+    void appendTasks(const QList<QWinJumpListItem *> &items);
 
-    static QVector<QWinJumpListItem *> fromComCollection(IObjectArray *array);
-    static IObjectCollection *toComCollection(const QVector<QWinJumpListItem *> &list);
+    static QList<QWinJumpListItem *> fromComCollection(IObjectArray *array);
+    static IObjectCollection *toComCollection(const QList<QWinJumpListItem *> &list);
     static QWinJumpListItem *fromIShellLink(IShellLinkW *link);
     static QWinJumpListItem *fromIShellItem(IShellItem2 *shellitem);
     static IUnknown *toICustomDestinationListItem(const QWinJumpListItem *item);
@@ -95,7 +95,7 @@ public:
     QWinJumpListCategory *recent = nullptr;
     QWinJumpListCategory *frequent = nullptr;
     QWinJumpListCategory *tasks = nullptr;
-    QVector<QWinJumpListCategory *> categories;
+    QList<QWinJumpListCategory *> categories;
     QString identifier;
     bool dirty = false;
 };
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index b087d25..a29c37e 100644
--- a/src/winextras/qwinjumplistcategory.cpp
+++ b/src/winextras/qwinjumplistcategory.cpp
@@ -253,7 +253,7 @@ bool QWinJumpListCategory::isEmpty() const
 /*!
     Returns the list of items in the category.
  */
-QVector<QWinJumpListItem *> QWinJumpListCategory::items() const
+QList<QWinJumpListItem *> QWinJumpListCategory::items() const
 {
     Q_D(const QWinJumpListCategory);
     return d->items;
diff --git a/src/winextras/qwinjumplistcategory.h b/src/winextras/qwinjumplistcategory.h
index 88d7fe4..d063cc2 100644
--- a/src/winextras/qwinjumplistcategory.h
+++ b/src/winextras/qwinjumplistcategory.h
@@ -74,7 +74,7 @@ public:
 
     int count() const;
     bool isEmpty() const;
-    QVector<QWinJumpListItem *> items() const;
+    QList<QWinJumpListItem *> items() const;
 
     void addItem(QWinJumpListItem *item);
     QWinJumpListItem *addDestination(const QString &filePath);
diff --git a/src/winextras/qwinjumplistcategory_p.h b/src/winextras/qwinjumplistcategory_p.h
index c2d0353..eee17b4 100644
--- a/src/winextras/qwinjumplistcategory_p.h
+++ b/src/winextras/qwinjumplistcategory_p.h
@@ -77,7 +77,7 @@ public:
     QString title;
     QWinJumpList *jumpList = nullptr;
     QWinJumpListCategory::Type type = QWinJumpListCategory::Custom;
-    QVector<QWinJumpListItem *> items;
+    QList<QWinJumpListItem *> items;
 };
 
 QT_END_NAMESPACE
diff --git a/src/winextras/qwinmime.cpp b/src/winextras/qwinmime.cpp
index f0f5232..c0300ae 100644
--- a/src/winextras/qwinmime.cpp
+++ b/src/winextras/qwinmime.cpp
@@ -156,9 +156,9 @@ int QWinMime::registerMimeType(const QString &mime)
 */
 
 /*!
-    \fn QVector<FORMATETC> QWinMime::formatsForMime(const QString &mimeType, const QMimeData *mimeData) const
+    \fn QList<FORMATETC> QWinMime::formatsForMime(const QString &mimeType, const QMimeData *mimeData) const
 
-    Returns a QVector of FORMATETC structures representing the different windows clipboard
+    Returns a QList of FORMATETC structures representing the different windows clipboard
     formats that can be provided for the \a mimeType from the \a mimeData.
 
     All subclasses must reimplement this pure virtual function.
diff --git a/src/winextras/qwinmime.h b/src/winextras/qwinmime.h
index df21529..008911c 100644
--- a/src/winextras/qwinmime.h
+++ b/src/winextras/qwinmime.h
@@ -43,7 +43,6 @@
 #include <QtWinExtras/qwinextrasglobal.h>
 
 #include <QtCore/qt_windows.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qvariant.h>
 
@@ -70,7 +69,7 @@ public:
     // for converting from Qt
     virtual bool canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const = 0;
     virtual bool convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM * pmedium) const = 0;
-    virtual QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const = 0;
+    virtual QList<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const = 0;
 
     // for converting to Qt
     virtual bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const = 0;
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index ef76bb5..fc8d76e 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -199,7 +199,7 @@ void QWinThumbnailToolBar::removeButton(QWinThumbnailToolButton *button)
 
     \note Any existing buttons are replaced.
  */
-void QWinThumbnailToolBar::setButtons(const QVector<QWinThumbnailToolButton *> &buttons)
+void QWinThumbnailToolBar::setButtons(const QList<QWinThumbnailToolButton *> &buttons)
 {
     Q_D(QWinThumbnailToolBar);
     d->buttonList.clear();
@@ -211,7 +211,7 @@ void QWinThumbnailToolBar::setButtons(const QVector<QWinThumbnailToolButton *> &
 /*!
     Returns the list of buttons in the thumbnail toolbar.
  */
-QVector<QWinThumbnailToolButton *> QWinThumbnailToolBar::buttons() const
+QList<QWinThumbnailToolButton *> QWinThumbnailToolBar::buttons() const
 {
     Q_D(const QWinThumbnailToolBar);
     return d->buttonList;
@@ -416,7 +416,7 @@ inline void QWinThumbnailToolBarPrivate::updateIconicLivePreview(const MSG *mess
  */
 void QWinThumbnailToolBar::clear()
 {
-    setButtons(QVector<QWinThumbnailToolButton *>());
+    setButtons(QList<QWinThumbnailToolButton *>());
 }
 
 static inline ITaskbarList4 *createTaskbarList()
@@ -492,7 +492,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar()
     if (!pTbList || !window)
         return;
     THUMBBUTTON buttons[windowsLimitedThumbbarSize];
-    QVector<HICON> createdIcons;
+    QList<HICON> createdIcons;
     initButtons(buttons);
     const int thumbbarSize = qMin(buttonList.size(), windowsLimitedThumbbarSize);
     // filling from the right fixes some strange bug which makes last button bg look like first btn bg
diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h
index 54ed9ec..83e2f2b 100644
--- a/src/winextras/qwinthumbnailtoolbar.h
+++ b/src/winextras/qwinthumbnailtoolbar.h
@@ -69,8 +69,8 @@ public:
 
     void addButton(QWinThumbnailToolButton *button);
     void removeButton(QWinThumbnailToolButton *button);
-    void setButtons(const QVector<QWinThumbnailToolButton *> &buttons);
-    QVector<QWinThumbnailToolButton *> buttons() const;
+    void setButtons(const QList<QWinThumbnailToolButton *> &buttons);
+    QList<QWinThumbnailToolButton *> buttons() const;
     int count() const;
 
     bool iconicPixmapNotificationsEnabled() const;
diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h
index f331daa..c3180f3 100644
--- a/src/winextras/qwinthumbnailtoolbar_p.h
+++ b/src/winextras/qwinthumbnailtoolbar_p.h
@@ -107,7 +107,7 @@ public:
     static QString msgComFailed(const char *function, HRESULT hresult);
 
     bool updateScheduled = false;
-    QVector<QWinThumbnailToolButton *> buttonList;
+    QList<QWinThumbnailToolButton *> buttonList;
     QWindow *window = nullptr;
     ITaskbarList4 * const pTbList;
 
diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
index 061b2ce..4676524 100644
--- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
+++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
@@ -172,7 +172,7 @@ void tst_QWinJumpList::testTasks()
     QCOMPARE(link1->title(), QStringLiteral("tst_QWinJumpList"));
     QCOMPARE(link1->filePath(), QCoreApplication::applicationFilePath());
     QCOMPARE(tasks->count(), 1);
-    QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1);
+    QCOMPARE(tasks->items(), QList<QWinJumpListItem *>() << link1);
 
     QWinJumpListItem* link2 = tasks->addLink(QStringLiteral("tst_QWinJumpList"), QCoreApplication::applicationFilePath(), QStringList(QStringLiteral("-test")));
     QCOMPARE(link2->type(), QWinJumpListItem::Link);
@@ -180,18 +180,18 @@ void tst_QWinJumpList::testTasks()
     QCOMPARE(link2->filePath(), QCoreApplication::applicationFilePath());
     QCOMPARE(link2->arguments(), QStringList(QStringLiteral("-test")));
     QCOMPARE(tasks->count(), 2);
-    QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1 << link2);
+    QCOMPARE(tasks->items(), QList<QWinJumpListItem *>() << link1 << link2);
 
     QWinJumpListItem* separator = tasks->addSeparator();
     QCOMPARE(separator->type(), QWinJumpListItem::Separator);
     QCOMPARE(tasks->count(), 3);
-    QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1 << link2 << separator);
+    QCOMPARE(tasks->items(), QList<QWinJumpListItem *>() << link1 << link2 << separator);
 
     QWinJumpListItem* destination = tasks->addDestination(QCoreApplication::applicationDirPath());
     QCOMPARE(destination->type(), QWinJumpListItem::Destination);
     QCOMPARE(destination->filePath(), QCoreApplication::applicationDirPath());
     QCOMPARE(tasks->count(), 4);
-    QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1 << link2 << separator << destination);
+    QCOMPARE(tasks->items(), QList<QWinJumpListItem *>() << link1 << link2 << separator << destination);
 
     tasks->clear();
     QVERIFY(tasks->isEmpty());
diff --git a/tests/auto/qwinmime/tst_qwinmime.cpp b/tests/auto/qwinmime/tst_qwinmime.cpp
index 0c57de4..20a404a 100644
--- a/tests/auto/qwinmime/tst_qwinmime.cpp
+++ b/tests/auto/qwinmime/tst_qwinmime.cpp
@@ -52,12 +52,12 @@ public:
         return false;
     }
 
-    QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const Q_DECL_OVERRIDE
+    QList<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const Q_DECL_OVERRIDE
     {
         formatsForMimeCalled = true;
         if (m_verbose)
             qDebug() << Q_FUNC_INFO << mimeType << mimeData->formats();
-        return QVector<FORMATETC>();
+        return QList<FORMATETC>();
     }
 
     bool canConvertToMime(const QString &mimeType, IDataObject *) const Q_DECL_OVERRIDE
diff --git a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp
index 74a9a3e..fc53a24 100644
--- a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp
+++ b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp
@@ -82,7 +82,7 @@ void tst_QWinThumbnailToolBar::testButtons()
     QCOMPARE(tbar.count(), 0);
     QVERIFY(tbar.buttons().isEmpty());
 
-    QVector<QWinThumbnailToolButton *> buttons;
+    QList<QWinThumbnailToolButton *> buttons;
     for (int i = 0; i < 3; ++i)
         buttons << new QWinThumbnailToolButton;
 
diff --git a/tests/manual/imageconversion/main.cpp b/tests/manual/imageconversion/main.cpp
index 20e93de..5404348 100644
--- a/tests/manual/imageconversion/main.cpp
+++ b/tests/manual/imageconversion/main.cpp
@@ -91,7 +91,7 @@ static void formatImage(QDebug d, const QImage &image)
     d.nospace();
     d << image;
     if (const int colorTableSize = image.colorCount()) {
-        QVector<QRgb> colorTable = image.colorTable();
+        QList<QRgb> colorTable = image.colorTable();
         d << " Color table: " << colorTableSize << " (" << Qt::showbase << Qt::hex; // 256 by standard
         int c = 0;
         for ( ; c < qMin(8, colorTableSize); ++c) {