diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-26 08:21:15 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-29 12:35:09 +0200 |
| commit | b0f9c06a9b199a7474eb94a6292b5824364344b6 (patch) | |
| tree | 15bfdcd6322d34b9dfeaf1f7b170219b0bab9fa0 /src/corelib/plugin | |
| parent | be1bb192955631c44a872014fcb631efc5fcfb8a (diff) | |
Use QList instead of QVector in corelib implementation
Omitting state machine and docs for now.
Task-number: QTBUG-84469
Change-Id: Ibfa5e7035515773461f6cdbff35299315ef65737
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 32b07a5636..8b87baaff9 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -404,7 +404,7 @@ QObject *QFactoryLoader::instance(int index) const lock.unlock(); #endif - QVector<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins(); + QList<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins(); for (int i = 0; i < staticPlugins.count(); ++i) { const QJsonObject object = staticPlugins.at(i).metaData(); if (object.value(QLatin1String("IID")) != QLatin1String(d->iid.constData(), d->iid.size())) diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index b66eb3e993..9ea8e2793c 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -56,7 +56,7 @@ #include <errno.h> #endif // NO_ERROR_H #include <qdebug.h> -#include <qvector.h> +#include <qlist.h> #include <qdir.h> #include <qendian.h> #include <qjsondocument.h> diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 2ae6913868..b8de3690d9 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -427,7 +427,7 @@ QLibrary::LoadHints QPluginLoader::loadHints() const #endif // QT_CONFIG(library) -typedef QVector<QStaticPlugin> StaticPluginList; +typedef QList<QStaticPlugin> StaticPluginList; Q_GLOBAL_STATIC(StaticPluginList, staticPluginList) /*! @@ -467,12 +467,12 @@ QObjectList QPluginLoader::staticInstances() meta data information. \sa staticInstances() */ -QVector<QStaticPlugin> QPluginLoader::staticPlugins() +QList<QStaticPlugin> QPluginLoader::staticPlugins() { StaticPluginList *plugins = staticPluginList(); if (plugins) return *plugins; - return QVector<QStaticPlugin>(); + return QList<QStaticPlugin>(); } /*! |