diff options
-rw-r--r-- | src/imports/platform/qquickplatformfiledialog.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickaction_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicksplitview_p_p.h | 2 | ||||
-rw-r--r-- | tests/manual/gifs/eventcapturer.cpp | 4 | ||||
-rw-r--r-- | tests/manual/gifs/eventcapturer.h | 6 | ||||
-rw-r--r-- | tests/manual/gifs/tst_gifs.cpp | 20 | ||||
-rw-r--r-- | tests/manual/headerview/main.cpp | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index c15625e6..3b9ceab2 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -622,7 +622,7 @@ static QStringList extractExtensions(QStringView filter) const int to = filter.lastIndexOf(QLatin1Char(')')) - 1; if (from >= 0 && from < to) { const QStringView ref = filter.mid(from + 1, to - from); - const QVector<QStringView> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts); + const QList<QStringView> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts); for (const QStringView &ref : exts) extensions += extractExtension(ref); } diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates2/qquickaction_p_p.h index 252b0075..d9b83548 100644 --- a/src/quicktemplates2/qquickaction_p_p.h +++ b/src/quicktemplates2/qquickaction_p_p.h @@ -125,7 +125,7 @@ public: QKeySequence keySequence; QVariant vshortcut; ShortcutEntry *defaultShortcutEntry = nullptr; - QVector<ShortcutEntry *> shortcutEntries; + QList<ShortcutEntry *> shortcutEntries; #endif QQuickActionGroup *group = nullptr; }; diff --git a/src/quicktemplates2/qquicksplitview_p_p.h b/src/quicktemplates2/qquicksplitview_p_p.h index 2430eac1..6123f83d 100644 --- a/src/quicktemplates2/qquicksplitview_p_p.h +++ b/src/quicktemplates2/qquicksplitview_p_p.h @@ -109,7 +109,7 @@ public: Qt::Orientation m_orientation = Qt::Horizontal; QQmlComponent *m_handle = nullptr; - QVector<QQuickItem*> m_handleItems; + QList<QQuickItem*> m_handleItems; int m_hoveredHandleIndex = -1; int m_pressedHandleIndex = -1; int m_nextVisibleIndexAfterPressedHandle = -1; diff --git a/tests/manual/gifs/eventcapturer.cpp b/tests/manual/gifs/eventcapturer.cpp index b3bbd7c8..ad88b1db 100644 --- a/tests/manual/gifs/eventcapturer.cpp +++ b/tests/manual/gifs/eventcapturer.cpp @@ -124,7 +124,7 @@ void EventCapturer::setCapturedEventTypes(QSet<QEvent::Type> types) mCapturedEventTypes = types; } -QVector<CapturedEvent> EventCapturer::capturedEvents() const +QList<CapturedEvent> EventCapturer::capturedEvents() const { if (mMoveEventTrimFlags == TrimNone || mEvents.isEmpty()) return mEvents; @@ -167,7 +167,7 @@ QVector<CapturedEvent> EventCapturer::capturedEvents() const // the indices are still valid - we could be removing from the middle of // the commands next. Also, the function is const, so we can't remove from // mEvents anyway. :) - QVector<CapturedEvent> events = mEvents.mid(firstEventIndex, (lastEventIndex - firstEventIndex) + 1); + QList<CapturedEvent> events = mEvents.mid(firstEventIndex, (lastEventIndex - firstEventIndex) + 1); if (mMoveEventTrimFlags.testFlag(TrimAfterReleases)) { bool lastNonMoveEventWasRelease = false; diff --git a/tests/manual/gifs/eventcapturer.h b/tests/manual/gifs/eventcapturer.h index e2b8b3a4..ea01299f 100644 --- a/tests/manual/gifs/eventcapturer.h +++ b/tests/manual/gifs/eventcapturer.h @@ -40,9 +40,9 @@ #include <QObject> #include <QElapsedTimer> #include <QEvent> +#include <QList> #include <QPoint> #include <QSet> -#include <QVector> #include "capturedevent.h" @@ -72,7 +72,7 @@ public: QSet<QEvent::Type> capturedEventTypes(); void setCapturedEventTypes(QSet<QEvent::Type> types); - QVector<CapturedEvent> capturedEvents() const; + QList<CapturedEvent> capturedEvents() const; protected: bool eventFilter(QObject *object, QEvent *event) override; @@ -87,7 +87,7 @@ private: Qt::Key mStopCaptureKey; MoveEventTrimFlags mMoveEventTrimFlags; QElapsedTimer mDelayTimer; - QVector<CapturedEvent> mEvents; + QList<CapturedEvent> mEvents; int mDuration; int mLastCaptureTime; }; diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index d7d8f98d..80c3fd9f 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -609,19 +609,19 @@ void tst_Gifs::swipeDelegateBehind() void tst_Gifs::delegates_data() { QTest::addColumn<QString>("name"); - QTest::addColumn<QVector<int> >("pressIndices"); + QTest::addColumn<QList<int> >("pressIndices"); QTest::addColumn<int>("duration"); - QTest::newRow("ItemDelegate") << "itemdelegate" << (QVector<int>() << 0 << 1 << 2) << 5; - QTest::newRow("CheckDelegate") << "checkdelegate" << (QVector<int>() << 0 << 0) << 5; - QTest::newRow("RadioDelegate") << "radiodelegate" << (QVector<int>() << 1 << 0) << 5; - QTest::newRow("SwitchDelegate") << "switchdelegate" << (QVector<int>() << 0 << 0) << 5; + QTest::newRow("ItemDelegate") << "itemdelegate" << (QList<int> { 0, 1, 2 }) << 5; + QTest::newRow("CheckDelegate") << "checkdelegate" << (QList<int> { 0, 0 }) << 5; + QTest::newRow("RadioDelegate") << "radiodelegate" << (QList<int> { 1, 0 }) << 5; + QTest::newRow("SwitchDelegate") << "switchdelegate" << (QList<int> { 0, 0 }) << 5; } void tst_Gifs::delegates() { QFETCH(QString, name); - QFETCH(QVector<int>, pressIndices); + QFETCH(QList<int>, pressIndices); QFETCH(int, duration); GifRecorder gifRecorder; @@ -710,16 +710,16 @@ void tst_Gifs::dial() void tst_Gifs::checkables_data() { QTest::addColumn<QString>("name"); - QTest::addColumn<QVector<int> >("pressIndices"); + QTest::addColumn<QList<int> >("pressIndices"); - QTest::newRow("checkbox") << "checkbox" << (QVector<int>() << 1 << 2 << 2 << 1); - QTest::newRow("radiobutton") << "radiobutton" << (QVector<int>() << 1 << 2 << 1 << 0); + QTest::newRow("checkbox") << "checkbox" << (QList<int> { 1, 2, 2, 1 }); + QTest::newRow("radiobutton") << "radiobutton" << (QList<int> { 1, 2, 1, 0 }); } void tst_Gifs::checkables() { QFETCH(QString, name); - QFETCH(QVector<int>, pressIndices); + QFETCH(QList<int>, pressIndices); GifRecorder gifRecorder; gifRecorder.setDataDirPath(dataDirPath); diff --git a/tests/manual/headerview/main.cpp b/tests/manual/headerview/main.cpp index 4c1e611c..b1573f08 100644 --- a/tests/manual/headerview/main.cpp +++ b/tests/manual/headerview/main.cpp @@ -199,7 +199,7 @@ public: } private: - QVector<QVariant> hData, vData; + QList<QVariant> hData, vData; }; int main(int argc, char *argv[]) |