diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-27 14:12:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-27 14:21:00 +0000 |
| commit | e0b0a08e50cef4c91808e30c2d3d33ee1b0cd0b8 (patch) | |
| tree | f0f8231b559ea100015eb1dc3029b076dd78399a /src/plugins/qmlpreview | |
| parent | e846b8717aad09e71650c6ca95b05d320f1eb3f1 (diff) | |
ExtensionSystem: Move away from QList
Qt 6 API will move away from it.
Use QVector for API and some std container for internal things.
Change-Id: Iff14d48a47d5ac52ade875d9c8c84ad8a4f577d8
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmlpreview')
| -rw-r--r-- | src/plugins/qmlpreview/qmlpreviewplugin.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmlpreview/qmlpreviewplugin.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index 732f81ddd1..42e56851ee 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -196,9 +196,9 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlPreviewPlugin::aboutToShutdown() return SynchronousShutdown; } -QList<QObject *> QmlPreviewPlugin::createTestObjects() const +QVector<QObject *> QmlPreviewPlugin::createTestObjects() const { - QList<QObject *> tests; + QVector<QObject *> tests; #ifdef WITH_TESTS tests.append(new QmlPreviewClientTest); tests.append(new QmlPreviewPluginTest); diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.h b/src/plugins/qmlpreview/qmlpreviewplugin.h index 5fc6f9d592..559cbb81dd 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.h +++ b/src/plugins/qmlpreview/qmlpreviewplugin.h @@ -64,7 +64,7 @@ public: bool initialize(const QStringList &arguments, QString *errorString) override; void extensionsInitialized() override; ShutdownFlag aboutToShutdown() override; - QList<QObject *> createTestObjects() const override; + QVector<QObject *> createTestObjects() const override; QString previewedFile() const; void setPreviewedFile(const QString &previewedFile); diff --git a/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp b/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp index 3b84cd4d4f..9ca2f38b08 100644 --- a/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp +++ b/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp @@ -43,7 +43,7 @@ QmlPreviewPluginTest::QmlPreviewPluginTest(QObject *parent) : QObject(parent) static ExtensionSystem::IPlugin *getPlugin() { - const QList<ExtensionSystem::PluginSpec *> plugins = ExtensionSystem::PluginManager::plugins(); + const QVector<ExtensionSystem::PluginSpec *> plugins = ExtensionSystem::PluginManager::plugins(); auto it = std::find_if(plugins.begin(), plugins.end(), [](ExtensionSystem::PluginSpec *spec) { return spec->name() == "QmlPreview"; }); |