aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-26 10:09:21 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-28 09:56:05 +0100
commit135f6218ad34d4f72507b19126a1e3507e9ba631 (patch)
tree26bee29c4b3e7e675386fd9de6cb54f027cc4406
parent1e06190f2d9baead98529bcefa5eaba7738e4b29 (diff)
Migrate from QList to QVector
Change-Id: Ibed8cd9801a8fd242a41c1c6bfaa58452e6c5aab Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/imports/winextras/qquickjumplistcategory.cpp4
-rw-r--r--src/imports/winextras/qquickjumplistcategory_p.h2
-rw-r--r--src/winextras/qwinjumplist.cpp12
-rw-r--r--src/winextras/qwinjumplist.h4
-rw-r--r--src/winextras/qwinjumplist_p.h8
-rw-r--r--src/winextras/qwinjumplistcategory.cpp2
-rw-r--r--src/winextras/qwinjumplistcategory.h2
-rw-r--r--src/winextras/qwinjumplistcategory_p.h2
-rw-r--r--src/winextras/qwinthumbnailtoolbar.cpp8
-rw-r--r--src/winextras/qwinthumbnailtoolbar.h4
-rw-r--r--src/winextras/qwinthumbnailtoolbar_p.h2
-rw-r--r--tests/auto/qwinjumplist/tst_qwinjumplist.cpp8
-rw-r--r--tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp2
13 files changed, 30 insertions, 30 deletions
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp
index 30183f4..8a578ed 100644
--- a/src/imports/winextras/qquickjumplistcategory.cpp
+++ b/src/imports/winextras/qquickjumplistcategory.cpp
@@ -122,9 +122,9 @@ void QQuickJumpListCategory::setVisible(bool visible)
}
}
-QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
+QVector<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
{
- QList<QWinJumpListItem *> items;
+ QVector<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 19fb65a..1028fcd 100644
--- a/src/imports/winextras/qquickjumplistcategory_p.h
+++ b/src/imports/winextras/qquickjumplistcategory_p.h
@@ -84,7 +84,7 @@ public:
QQmlListProperty<QObject> data();
QQmlListProperty<QQuickJumpListItem> items();
- QList<QWinJumpListItem *> toItemList() const;
+ QVector<QWinJumpListItem *> toItemList() const;
Q_SIGNALS:
void itemsChanged();
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index 55c99f4..4369d36 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -217,7 +217,7 @@ void QWinJumpListPrivate::appendCustomCategory(QWinJumpListCategory *category)
}
}
-void QWinJumpListPrivate::appendTasks(const QList<QWinJumpListItem *> &items)
+void QWinJumpListPrivate::appendTasks(const QVector<QWinJumpListItem *> &items)
{
IObjectCollection *collection = toComCollection(items);
if (collection) {
@@ -228,9 +228,9 @@ void QWinJumpListPrivate::appendTasks(const QList<QWinJumpListItem *> &items)
}
}
-QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *array)
+QVector<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *array)
{
- QList<QWinJumpListItem *> list;
+ QVector<QWinJumpListItem *> list;
UINT count = 0;
array->GetCount(&count);
for (UINT i = 0; i < count; ++i) {
@@ -259,7 +259,7 @@ QList<QWinJumpListItem *> QWinJumpListPrivate::fromComCollection(IObjectArray *a
return list;
}
-IObjectCollection *QWinJumpListPrivate::toComCollection(const QList<QWinJumpListItem *> &list)
+IObjectCollection *QWinJumpListPrivate::toComCollection(const QVector<QWinJumpListItem *> &list)
{
if (list.isEmpty())
return nullptr;
@@ -531,7 +531,7 @@ QWinJumpListCategory *QWinJumpList::tasks() const
/*!
Returns the custom categories in the jump list.
*/
-QList<QWinJumpListCategory *> QWinJumpList::categories() const
+QVector<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 QList<QWinJumpListItem *> items)
+QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QVector<QWinJumpListItem *> items)
{
auto *category = new QWinJumpListCategory(title);
for (QWinJumpListItem *item : items)
diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h
index b4807dd..cb16228 100644
--- a/src/winextras/qwinjumplist.h
+++ b/src/winextras/qwinjumplist.h
@@ -68,9 +68,9 @@ public:
QWinJumpListCategory *frequent() const;
QWinJumpListCategory *tasks() const;
- QList<QWinJumpListCategory *> categories() const;
+ QVector<QWinJumpListCategory *> categories() const;
void addCategory(QWinJumpListCategory *category);
- QWinJumpListCategory *addCategory(const QString &title, const QList<QWinJumpListItem *> items = QList<QWinJumpListItem *>());
+ QWinJumpListCategory *addCategory(const QString &title, const QVector<QWinJumpListItem *> items = QVector<QWinJumpListItem *>());
public Q_SLOTS:
void clear();
diff --git a/src/winextras/qwinjumplist_p.h b/src/winextras/qwinjumplist_p.h
index ff54f96..2704d29 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 QList<QWinJumpListItem *> &items);
+ void appendTasks(const QVector<QWinJumpListItem *> &items);
- static QList<QWinJumpListItem *> fromComCollection(IObjectArray *array);
- static IObjectCollection *toComCollection(const QList<QWinJumpListItem *> &list);
+ static QVector<QWinJumpListItem *> fromComCollection(IObjectArray *array);
+ static IObjectCollection *toComCollection(const QVector<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;
- QList<QWinJumpListCategory *> categories;
+ QVector<QWinJumpListCategory *> categories;
QString identifier;
bool dirty = false;
};
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index a29c37e..b087d25 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.
*/
-QList<QWinJumpListItem *> QWinJumpListCategory::items() const
+QVector<QWinJumpListItem *> QWinJumpListCategory::items() const
{
Q_D(const QWinJumpListCategory);
return d->items;
diff --git a/src/winextras/qwinjumplistcategory.h b/src/winextras/qwinjumplistcategory.h
index d063cc2..88d7fe4 100644
--- a/src/winextras/qwinjumplistcategory.h
+++ b/src/winextras/qwinjumplistcategory.h
@@ -74,7 +74,7 @@ public:
int count() const;
bool isEmpty() const;
- QList<QWinJumpListItem *> items() const;
+ QVector<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 eee17b4..c2d0353 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;
- QList<QWinJumpListItem *> items;
+ QVector<QWinJumpListItem *> items;
};
QT_END_NAMESPACE
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index fc8d76e..ef76bb5 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 QList<QWinThumbnailToolButton *> &buttons)
+void QWinThumbnailToolBar::setButtons(const QVector<QWinThumbnailToolButton *> &buttons)
{
Q_D(QWinThumbnailToolBar);
d->buttonList.clear();
@@ -211,7 +211,7 @@ void QWinThumbnailToolBar::setButtons(const QList<QWinThumbnailToolButton *> &bu
/*!
Returns the list of buttons in the thumbnail toolbar.
*/
-QList<QWinThumbnailToolButton *> QWinThumbnailToolBar::buttons() const
+QVector<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(QList<QWinThumbnailToolButton *>());
+ setButtons(QVector<QWinThumbnailToolButton *>());
}
static inline ITaskbarList4 *createTaskbarList()
@@ -492,7 +492,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar()
if (!pTbList || !window)
return;
THUMBBUTTON buttons[windowsLimitedThumbbarSize];
- QList<HICON> createdIcons;
+ QVector<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 83e2f2b..54ed9ec 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 QList<QWinThumbnailToolButton *> &buttons);
- QList<QWinThumbnailToolButton *> buttons() const;
+ void setButtons(const QVector<QWinThumbnailToolButton *> &buttons);
+ QVector<QWinThumbnailToolButton *> buttons() const;
int count() const;
bool iconicPixmapNotificationsEnabled() const;
diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h
index c3180f3..f331daa 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;
- QList<QWinThumbnailToolButton *> buttonList;
+ QVector<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 52b1ee5..0f5ee0b 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(), QList<QWinJumpListItem *>() << link1);
+ QCOMPARE(tasks->items(), QVector<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(), QList<QWinJumpListItem *>() << link1 << link2);
+ QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1 << link2);
QWinJumpListItem* separator = tasks->addSeparator();
QCOMPARE(separator->type(), QWinJumpListItem::Separator);
QCOMPARE(tasks->count(), 3);
- QCOMPARE(tasks->items(), QList<QWinJumpListItem *>() << link1 << link2 << separator);
+ QCOMPARE(tasks->items(), QVector<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(), QList<QWinJumpListItem *>() << link1 << link2 << separator << destination);
+ QCOMPARE(tasks->items(), QVector<QWinJumpListItem *>() << link1 << link2 << separator << destination);
tasks->clear();
QVERIFY(tasks->isEmpty());
diff --git a/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp b/tests/auto/qwinthumbnailtoolbar/tst_qwinthumbnailtoolbar.cpp
index fc53a24..74a9a3e 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());
- QList<QWinThumbnailToolButton *> buttons;
+ QVector<QWinThumbnailToolButton *> buttons;
for (int i = 0; i < 3; ++i)
buttons << new QWinThumbnailToolButton;