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 /tests/auto | |
| 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 'tests/auto')
| -rw-r--r-- | tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp index 14722c6d57..c3c144a16c 100644 --- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp +++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp @@ -161,7 +161,7 @@ void tst_PluginManager::circularPlugins() { m_pm->setPluginPaths(QStringList() << pluginFolder(QLatin1String("circularplugins"))); m_pm->loadPlugins(); - QList<PluginSpec *> plugins = m_pm->plugins(); + QVector<PluginSpec *> plugins = m_pm->plugins(); QCOMPARE(plugins.count(), 3); foreach (PluginSpec *spec, plugins) { if (spec->name() == "plugin1") { diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp index c846458615..8092bfa57e 100644 --- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp +++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp @@ -245,7 +245,7 @@ void tst_PluginSpec::locationAndPath() void tst_PluginSpec::resolveDependencies() { - QList<PluginSpec *> specs; + QVector<PluginSpec *> specs; PluginSpec *spec1 = Internal::PluginManagerPrivate::createSpec(); specs.append(spec1); Internal::PluginSpecPrivate *spec1Priv = Internal::PluginManagerPrivate::privateSpec(spec1); @@ -291,7 +291,7 @@ void tst_PluginSpec::loadLibrary() PluginSpec *ps = Internal::PluginManagerPrivate::createSpec(); Internal::PluginSpecPrivate *spec = Internal::PluginManagerPrivate::privateSpec(ps); QVERIFY(spec->read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test")))); - QVERIFY(spec->resolveDependencies(QList<PluginSpec *>())); + QVERIFY(spec->resolveDependencies(QVector<PluginSpec *>())); QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString)); QVERIFY(spec->plugin != 0); QVERIFY(QLatin1String(spec->plugin->metaObject()->className()) == QLatin1String("MyPlugin::MyPluginImpl")); @@ -305,7 +305,7 @@ void tst_PluginSpec::initializePlugin() { Internal::PluginSpecPrivate spec(0); QVERIFY(spec.read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test")))); - QVERIFY(spec.resolveDependencies(QList<PluginSpec *>())); + QVERIFY(spec.resolveDependencies(QVector<PluginSpec *>())); QVERIFY2(spec.loadLibrary(), qPrintable(spec.errorString)); bool isInitialized; QMetaObject::invokeMethod(spec.plugin, "isInitialized", @@ -323,7 +323,7 @@ void tst_PluginSpec::initializeExtensions() { Internal::PluginSpecPrivate spec(0); QVERIFY(spec.read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test")))); - QVERIFY(spec.resolveDependencies(QList<PluginSpec *>())); + QVERIFY(spec.resolveDependencies(QVector<PluginSpec *>())); QVERIFY2(spec.loadLibrary(), qPrintable(spec.errorString)); bool isExtensionsInitialized; QVERIFY(spec.initializePlugin()); |