diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:44:14 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-29 19:19:47 +0200 |
commit | 9fa3cf15c8500fba5bbb861f1925160815ae2afd (patch) | |
tree | f779e08446bf302803b27130cf4c92fe46ba68b6 /src/gui/kernel | |
parent | c70c4e42665eb34e677fc51a49552c9af3f58d7a (diff) |
Use QList instead of QVector in gui
Applied to headers only. Source file to be changed separately.
Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qaction.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qaction_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qevent.h | 10 | ||||
-rw-r--r-- | src/gui/kernel/qevent_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 10 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdialoghelper.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformsharedgraphicscache.h | 21 | ||||
-rw-r--r-- | src/gui/kernel/qshortcutmap_p.h | 8 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.h | 2 |
11 files changed, 31 insertions, 32 deletions
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index 37c6b3a647..8466bc41f7 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -102,7 +102,7 @@ public: ~QAction(); - QVector<QObject *> associatedObjects() const; + QList<QObject *> associatedObjects() const; #if QT_DEPRECATED_SINCE(6,0) #ifdef Q_CLANG_QDOC diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 111cb2958b..3e137a09d6 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -104,7 +104,7 @@ public: #if QT_CONFIG(shortcut) int shortcutId = 0; - QVector<int> alternateShortcutIds; + QList<int> alternateShortcutIds; Qt::ShortcutContext shortcutContext = Qt::WindowShortcut; uint autorepeat : 1; #endif diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 0039be5ae9..baf39439df 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -44,11 +44,11 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qiodevice.h> +#include <QtCore/qlist.h> #include <QtCore/qnamespace.h> #include <QtCore/qstring.h> -#include <QtCore/qvariant.h> -#include <QtCore/qvector.h> #include <QtCore/qurl.h> +#include <QtCore/qvariant.h> #include <QtGui/qpointingdevice.h> #include <QtGui/qregion.h> #include <QtGui/qvector2d.h> @@ -607,7 +607,7 @@ private: QVariant value; }; friend QTypeInfo<QueryPair>; - QVector<QueryPair> m_values; + QList<QueryPair> m_values; }; Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE); @@ -902,7 +902,7 @@ public: QVector2D velocity() const; InfoFlags flags() const; - QVector<QPointF> rawScreenPositions() const; + QList<QPointF> rawScreenPositions() const; // internal // ### Qt 6: move private, rename appropriately, only friends can call them @@ -927,7 +927,7 @@ public: void setEllipseDiameters(const QSizeF &dia); void setVelocity(const QVector2D &v); void setFlags(InfoFlags flags); - void setRawScreenPositions(const QVector<QPointF> &positions); + void setRawScreenPositions(const QList<QPointF> &positions); #endif // QT_DEPRECATED_SINCE(6, 0) private: diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index 9c2d084b39..bfe0740ace 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -93,7 +93,7 @@ public: QVector2D velocity; QTouchEvent::TouchPoint::InfoFlags flags; bool stationaryWithModifiedProperty : 1; - QVector<QPointF> rawScreenPositions; + QList<QPointF> rawScreenPositions; }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index aed5cb96c1..c5c4bd09d1 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -244,7 +244,7 @@ public: Qt::MouseButtons state; QWindow *target; }; - static QVector<TabletPointData> tabletDevicePoints; + static QList<TabletPointData> tabletDevicePoints; static TabletPointData &tabletDevicePoint(qint64 deviceId); #ifndef QT_NO_CLIPBOARD diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index ed493a94c6..dfacf2a4f3 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -52,11 +52,11 @@ // #include <QtGui/private/qtguiglobal_p.h> +#include <QtCore/qlist.h> +#include <QtCore/qloggingcategory.h> #include <QtCore/qmargins.h> #include <QtCore/qmath.h> #include <QtCore/qrect.h> -#include <QtCore/qvector.h> -#include <QtCore/qloggingcategory.h> #include <QtGui/qregion.h> #include <QtGui/qscreen.h> #include <QtGui/qvector2d.h> @@ -184,13 +184,13 @@ inline QMargins scale(const QMargins &margins, qreal scaleFactor, QPoint origin qRound(qreal(margins.right()) * scaleFactor), qRound(qreal(margins.bottom()) * scaleFactor)); } -template <typename T> -QVector<T> scale(const QVector<T> &vector, qreal scaleFactor, QPoint origin = QPoint(0, 0)) +template<typename T> +QList<T> scale(const QList<T> &vector, qreal scaleFactor, QPoint origin = QPoint(0, 0)) { if (!QHighDpiScaling::isActive()) return vector; - QVector<T> scaled; + QList<T> scaled; scaled.reserve(vector.size()); for (const T &item : vector) scaled.append(scale(item, scaleFactor, origin)); diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index fa58177a2d..59f01c9fc3 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -482,7 +482,7 @@ public: int addButton(const QString &label, QPlatformDialogHelper::ButtonRole role, void *buttonImpl = nullptr); void removeButton(int id); - const QVector<CustomButton> &customButtons(); + const QList<CustomButton> &customButtons(); const CustomButton *customButton(int id); private: diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index acad5c246b..32ad047147 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -150,7 +150,7 @@ public: virtual PowerState powerState() const; virtual void setPowerState(PowerState state); - virtual QVector<Mode> modes() const; + virtual QList<Mode> modes() const; virtual int currentMode() const; virtual int preferredMode() const; diff --git a/src/gui/kernel/qplatformsharedgraphicscache.h b/src/gui/kernel/qplatformsharedgraphicscache.h index b3b5488139..56e51188cc 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache.h +++ b/src/gui/kernel/qplatformsharedgraphicscache.h @@ -74,11 +74,10 @@ public: virtual void beginRequestBatch() = 0; virtual void ensureCacheInitialized(const QByteArray &cacheId, BufferType bufferType, PixelFormat pixelFormat) = 0; - virtual void requestItems(const QByteArray &cacheId, const QVector<quint32> &itemIds) = 0; - virtual void insertItems(const QByteArray &cacheId, - const QVector<quint32> &itemIds, - const QVector<QImage> &items) = 0; - virtual void releaseItems(const QByteArray &cacheId, const QVector<quint32> &itemIds) = 0; + virtual void requestItems(const QByteArray &cacheId, const QList<quint32> &itemIds) = 0; + virtual void insertItems(const QByteArray &cacheId, const QList<quint32> &itemIds, + const QList<QImage> &items) = 0; + virtual void releaseItems(const QByteArray &cacheId, const QList<quint32> &itemIds) = 0; virtual void endRequestBatch() = 0; virtual bool requestBatchStarted() const = 0; @@ -90,12 +89,12 @@ public: virtual void *eglImageForBuffer(void *bufferId) = 0; Q_SIGNALS: - void itemsMissing(const QByteArray &cacheId, const QVector<quint32> &itemIds); - void itemsAvailable(const QByteArray &cacheId, void *bufferId, - const QVector<quint32> &itemIds, const QVector<QPoint> &positionsInBuffer); - void itemsInvalidated(const QByteArray &cacheId, const QVector<quint32> &itemIds); - void itemsUpdated(const QByteArray &cacheId, void *bufferId, - const QVector<quint32> &itemIds, const QVector<QPoint> &positionsInBuffer); + void itemsMissing(const QByteArray &cacheId, const QList<quint32> &itemIds); + void itemsAvailable(const QByteArray &cacheId, void *bufferId, const QList<quint32> &itemIds, + const QList<QPoint> &positionsInBuffer); + void itemsInvalidated(const QByteArray &cacheId, const QList<quint32> &itemIds); + void itemsUpdated(const QByteArray &cacheId, void *bufferId, const QList<quint32> &itemIds, + const QList<QPoint> &positionsInBuffer); }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h index aa3dd969f0..ff92a38e56 100644 --- a/src/gui/kernel/qshortcutmap_p.h +++ b/src/gui/kernel/qshortcutmap_p.h @@ -53,7 +53,7 @@ #include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qkeysequence.h" -#include "QtCore/qvector.h" +#include "QtCore/qlist.h" #include "QtCore/qscopedpointer.h" QT_REQUIRE_CONFIG(shortcut); @@ -98,9 +98,9 @@ private: QKeySequence::SequenceMatch find(QKeyEvent *e, int ignoredModifiers = 0); QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const; - QVector<const QShortcutEntry *> matches() const; - void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers); - void clearSequence(QVector<QKeySequence> &ksl); + QList<const QShortcutEntry *> matches() const; + void createNewSequences(QKeyEvent *e, QList<QKeySequence> &ksl, int ignoredModifiers); + void clearSequence(QList<QKeySequence> &ksl); int translateModifiers(Qt::KeyboardModifiers modifiers); QScopedPointer<QShortcutMapPrivate> d_ptr; diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h index 7445ca475f..5116c72120 100644 --- a/src/gui/kernel/qwindowsysteminterface.h +++ b/src/gui/kernel/qwindowsysteminterface.h @@ -169,7 +169,7 @@ public: Qt::TouchPointState state; //Qt::TouchPoint{Pressed|Moved|Stationary|Released} QVector2D velocity; // in screen coordinate system, pixels / seconds QTouchEvent::TouchPoint::InfoFlags flags; - QVector<QPointF> rawPositions; // in screen coordinates + QList<QPointF> rawPositions; // in screen coordinates }; static void registerInputDevice(const QInputDevice *device); |