summaryrefslogtreecommitdiffstats
path: root/src/widgets/util
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-22 14:52:01 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-02 21:57:06 +0200
commit2a6cdec718934ca2cc7f6f9c616ebe62f6912123 (patch)
treec8b9ed8db47912dccd2e8d125d23760936820c29 /src/widgets/util
parentd4c04acc65657d29df5b790281a8d1ba896dd868 (diff)
Use QList instead of QVector in widgets
Task-number: QTBUG-84469 Change-Id: I3007734f8e4f164ece9dd8850ef007cbef9e12ef Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/widgets/util')
-rw-r--r--src/widgets/util/qcolormap.cpp4
-rw-r--r--src/widgets/util/qcolormap.h6
-rw-r--r--src/widgets/util/qcompleter.cpp4
-rw-r--r--src/widgets/util/qcompleter_p.h4
-rw-r--r--src/widgets/util/qsystemtrayicon.cpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/util/qcolormap.cpp b/src/widgets/util/qcolormap.cpp
index 57e61690e9..ba975de4bb 100644
--- a/src/widgets/util/qcolormap.cpp
+++ b/src/widgets/util/qcolormap.cpp
@@ -220,9 +220,9 @@ const QColor QColormap::colorAt(uint pixel) const
return QColor();
}
-const QVector<QColor> QColormap::colormap() const
+const QList<QColor> QColormap::colormap() const
{
- return QVector<QColor>();
+ return QList<QColor>();
}
QColormap &QColormap::operator=(const QColormap &colormap)
diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h
index 8e652d8154..86347dbd8e 100644
--- a/src/widgets/util/qcolormap.h
+++ b/src/widgets/util/qcolormap.h
@@ -41,10 +41,10 @@
#define QCOLORMAP_H
#include <QtWidgets/qtwidgetsglobal.h>
-#include <QtCore/qatomic.h>
#include <QtGui/qrgb.h>
-#include <QtCore/qvector.h>
#include <QtGui/qwindowdefs.h>
+#include <QtCore/qatomic.h>
+#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@@ -75,7 +75,7 @@ public:
uint pixel(const QColor &color) const;
const QColor colorAt(uint pixel) const;
- const QVector<QColor> colormap() const;
+ const QList<QColor> colormap() const;
private:
QColormap();
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 7853398a70..3083889954 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -475,7 +475,7 @@ QMatchData QCompletionEngine::filterHistory()
const bool isFsModel = false;
#endif
Q_UNUSED(isFsModel)
- QVector<int> v;
+ QList<int> v;
QIndexMapper im(v);
QMatchData m(im, -1, true);
@@ -783,7 +783,7 @@ QMatchData QUnsortedModelEngine::filter(const QString& part, const QModelIndex&
{
QMatchData hint;
- QVector<int> v;
+ QList<int> v;
QIndexMapper im(v);
QMatchData m(im, -1, true);
diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
index a52e63a6e2..2ca5a11231 100644
--- a/src/widgets/util/qcompleter_p.h
+++ b/src/widgets/util/qcompleter_p.h
@@ -111,7 +111,7 @@ class QIndexMapper
public:
QIndexMapper() : v(false), f(0), t(-1) { }
QIndexMapper(int f, int t) : v(false), f(f), t(t) { }
- QIndexMapper(const QVector<int> &vec) : v(true), vector(vec), f(-1), t(-1) { }
+ QIndexMapper(const QList<int> &vec) : v(true), vector(vec), f(-1), t(-1) { }
inline int count() const { return v ? vector.count() : t - f + 1; }
inline int operator[] (int index) const { return v ? vector[index] : f + index; }
@@ -127,7 +127,7 @@ public:
private:
bool v;
- QVector<int> vector;
+ QList<int> vector;
int f, t;
};
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 170eba7514..9e49b1ec57 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -735,7 +735,7 @@ void QSystemTrayIconPrivate::addPlatformMenu(QMenu *menu) const
// be higher than 3 levels.
const auto actions = menu->actions();
for (QAction *action : actions) {
- QVector<QWidget*> associatedWidgets = action->associatedWidgets();
+ QList<QWidget *> associatedWidgets = action->associatedWidgets();
if (action->menu())
addPlatformMenu(action->menu());
}