From 3fe492862650139a72cdfe46bf2bb6328ab4cd73 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 15 Jul 2024 18:17:46 +0200 Subject: [PATCH] Use QObjectList alias Change-Id: I11d4071088e2b44c37d4a8ac59945fe49fe68351 Reviewed-by: hjk --- src/libs/aggregation/aggregate.cpp | 6 ++--- src/libs/aggregation/aggregate.h | 6 ++--- src/libs/extensionsystem/pluginmanager.cpp | 12 +++++----- src/libs/extensionsystem/pluginmanager.h | 6 ++--- src/libs/extensionsystem/pluginmanager_p.h | 2 +- .../actionmanager/actioncontainer_p.h | 2 +- src/plugins/designer/formeditor.cpp | 2 +- src/plugins/perfprofiler/perfprofilertool.h | 2 +- .../miniprojecttargetselector.cpp | 24 +++++++++---------- .../components/edit3d/edit3dview.cpp | 2 +- .../timelineeditor/timelinetoolbar.h | 2 +- .../transitioneditortoolbar.h | 2 +- .../instances/nodeinstanceserver.cpp | 6 ++--- .../qml2puppet/instances/nodeinstanceserver.h | 2 +- .../qt5informationnodeinstanceserver.h | 2 +- .../instances/quickitemnodeinstance.cpp | 4 ++-- .../qmlprivategate/qmlprivategate.cpp | 2 +- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index 305de428614..9da9b04b018 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -185,7 +185,7 @@ Aggregate::Aggregate(QObject *parent) */ Aggregate::~Aggregate() { - QList components; + QObjectList components; { QWriteLocker locker(&lock()); for (QObject *component : std::as_const(m_components)) { @@ -262,11 +262,11 @@ void Aggregate::remove(QObject *component) \sa Aggregate */ -void aggregate(QList components) +void aggregate(const QObjectList &components) { QWriteLocker locker(&Aggregate::lock()); Aggregate *agg = nullptr; - QList toAdd; + QObjectList toAdd; for (QObject *comp : components) { Aggregate *existing = Aggregate::aggregateMap().value(comp); if (existing) { diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 383f0b3511e..21fcc4fb171 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -51,7 +51,7 @@ signals: void changed(); private: - friend AGGREGATION_EXPORT void aggregate(QList); + friend AGGREGATION_EXPORT void aggregate(const QObjectList &); enum PrivateConstructor { PrivateConstructor }; Aggregate(enum PrivateConstructor); void construct(); @@ -60,10 +60,10 @@ private: static QHash &aggregateMap(); - QList m_components; + QObjectList m_components; }; -AGGREGATION_EXPORT void aggregate(QList components); +AGGREGATION_EXPORT void aggregate(const QObjectList &components); // get a component via global template function template T *query(Aggregate *obj) diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 4fbaba01e57..bc30f954f93 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -297,7 +297,7 @@ void PluginManager::removeObject(QObject *obj) \sa PluginManager::getObject() */ -QVector PluginManager::allObjects() +QObjectList PluginManager::allObjects() { return d->allObjects; } @@ -1152,7 +1152,7 @@ static QStringList matchingTestFunctions(const QStringList &testFunctions, return matchingFunctions; } -static QObject *objectWithClassName(const QVector &objects, const QString &className) +static QObject *objectWithClassName(const QObjectList &objects, const QString &className) { return Utils::findOr(objects, nullptr, [className] (QObject *object) -> bool { QString candidate = QString::fromUtf8(object->metaObject()->className()); @@ -1193,7 +1193,7 @@ static int executeTestPlan(const TestPlan &testPlan) /// Resulting plan consists of all test functions of the plugin object and /// all test functions of all test objects of the plugin. -static TestPlan generateCompleteTestPlan(IPlugin *plugin, const QVector &testObjects) +static TestPlan generateCompleteTestPlan(IPlugin *plugin, const QObjectList &testObjects) { TestPlan testPlan; @@ -1214,7 +1214,7 @@ static TestPlan generateCompleteTestPlan(IPlugin *plugin, const QVector &testObjects, + const QObjectList &testObjects, const QStringList &matchTexts) { TestPlan testPlan; @@ -1222,7 +1222,7 @@ static TestPlan generateCustomTestPlan(IPlugin *plugin, const QStringList testFunctionsOfPluginObject = testFunctions(plugin->metaObject()); QStringList matchedTestFunctionsOfPluginObject; QStringList remainingMatchTexts = matchTexts; - QVector remainingTestObjectsOfPlugin = testObjects; + QObjectList remainingTestObjectsOfPlugin = testObjects; while (!remainingMatchTexts.isEmpty()) { const QString matchText = remainingMatchTexts.takeFirst(); @@ -1289,7 +1289,7 @@ void PluginManagerPrivate::startTests() continue; // plugin not loaded const QList testCreators = g_testCreators[plugin]; - const QVector testObjects = Utils::transform(testCreators, &TestCreator::operator()); + const QObjectList testObjects = Utils::transform(testCreators, &TestCreator::operator()); const QScopeGuard cleanup([&] { qDeleteAll(testObjects); }); const bool hasDuplicateTestObjects = testObjects.size() diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 68bba7a83c3..d601bf16180 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -35,14 +35,14 @@ public: // Object pool operations static void addObject(QObject *obj); static void removeObject(QObject *obj); - static QVector allObjects(); + static QObjectList allObjects(); static QReadWriteLock *listLock(); // This is useful for soft dependencies using pure interfaces. template static T *getObject() { QReadLocker lock(listLock()); - const QVector all = allObjects(); + const QObjectList all = allObjects(); for (QObject *obj : all) { if (T *result = qobject_cast(obj)) return result; @@ -52,7 +52,7 @@ public: template static T *getObject(Predicate predicate) { QReadLocker lock(listLock()); - const QVector all = allObjects(); + const QObjectList all = allObjects(); for (QObject *obj : all) { if (T *result = qobject_cast(obj)) if (predicate(result)) diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index ad9d4f81ee2..5a7064c464c 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -93,7 +93,7 @@ public: std::vector testSpecs; Utils::FilePaths pluginPaths; QString pluginIID; - QVector allObjects; // ### make this a QVector > > ? + QObjectList allObjects; // ### make this a QList > > ? QStringList defaultDisabledPlugins; // Plugins/Ignored from install settings QStringList defaultEnabledPlugins; // Plugins/ForceEnabled from install settings QStringList disabledPlugins; diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index cb94852aa0c..6823a4aab40 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -17,7 +17,7 @@ struct Group { Group(Utils::Id id) : id(id) {} Utils::Id id; - QList items; // Command * or ActionContainer * + QObjectList items; // Command * or ActionContainer * }; class ActionContainerPrivate : public ActionContainer diff --git a/src/plugins/designer/formeditor.cpp b/src/plugins/designer/formeditor.cpp index 4d478d2adc7..9c174272dc1 100644 --- a/src/plugins/designer/formeditor.cpp +++ b/src/plugins/designer/formeditor.cpp @@ -376,7 +376,7 @@ void FormEditorData::fullInit() /** * This will initialize our TabOrder, Signals and slots and Buddy editors. */ - const QList plugins = QPluginLoader::staticInstances() + m_formeditor->pluginInstances(); + const QObjectList plugins = QPluginLoader::staticInstances() + m_formeditor->pluginInstances(); for (QObject *plugin : plugins) { if (QDesignerFormEditorPluginInterface *formEditorPlugin = qobject_cast(plugin)) { if (!formEditorPlugin->isInitialized()) diff --git a/src/plugins/perfprofiler/perfprofilertool.h b/src/plugins/perfprofiler/perfprofilertool.h index 014ac091471..941fa6a1780 100644 --- a/src/plugins/perfprofiler/perfprofilertool.h +++ b/src/plugins/perfprofiler/perfprofilertool.h @@ -99,7 +99,7 @@ private: QMenu *m_filterMenu = nullptr; QToolButton *m_aggregateButton = nullptr; QToolButton *m_tracePointsButton = nullptr; - QList m_objectsToDelete; + QObjectList m_objectsToDelete; PerfProfilerTraceView *m_traceView = nullptr; PerfProfilerStatisticsView *m_statisticsView = nullptr; diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index a33cd3e247e..02694b7cbe9 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -150,7 +150,7 @@ class GenericModel : public TreeModel public: GenericModel(QObject *parent) : TreeModel(parent) { } - void rebuild(const QList &objects) + void rebuild(const QObjectList &objects) { clear(); for (QObject * const e : objects) @@ -249,8 +249,8 @@ public: explicit ProjectListView(QWidget *parent = nullptr) : SelectorView(parent) { const auto model = new GenericModel(this); - model->rebuild(transform>(ProjectManager::projects(), - [](Project *p) { return p; })); + model->rebuild(transform(ProjectManager::projects(), + [](Project *p) { return p; })); connect(ProjectManager::instance(), &ProjectManager::projectAdded, this, [this, model](Project *project) { const GenericItem *projectItem = model->addItemForObject(project); @@ -322,7 +322,7 @@ signals: void changeActiveProjectConfiguration(QObject *pc); public: - void setProjectConfigurations(const QList &list, QObject *active) + void setProjectConfigurations(const QObjectList &list, QObject *active) { theModel()->rebuild(list); resetOptimalWidth(); @@ -1194,13 +1194,13 @@ void MiniProjectTargetSelector::changeStartupProject(Project *project) } if (project) { - QList list; + QObjectList list; const QList targets = project->targets(); for (Target *t : targets) list.append(t); m_listWidgets[TARGET]->setProjectConfigurations(list, project->activeTarget()); } else { - m_listWidgets[TARGET]->setProjectConfigurations(QList(), nullptr); + m_listWidgets[TARGET]->setProjectConfigurations({}, nullptr); } updateActionAndSummary(); @@ -1239,17 +1239,17 @@ void MiniProjectTargetSelector::activeTargetChanged(Target *target) this, &MiniProjectTargetSelector::updateActionAndSummary); if (m_target) { - QList bl; + QObjectList bl; for (BuildConfiguration *bc : target->buildConfigurations()) bl.append(bc); m_listWidgets[BUILD]->setProjectConfigurations(bl, target->activeBuildConfiguration()); - QList dl; + QObjectList dl; for (DeployConfiguration *dc : target->deployConfigurations()) dl.append(dc); m_listWidgets[DEPLOY]->setProjectConfigurations(dl, target->activeDeployConfiguration()); - QList rl; + QObjectList rl; for (RunConfiguration *rc : target->runConfigurations()) rl.append(rc); m_listWidgets[RUN]->setProjectConfigurations(rl, target->activeRunConfiguration()); @@ -1278,9 +1278,9 @@ void MiniProjectTargetSelector::activeTargetChanged(Target *target) connect(m_target, &Target::activeRunConfigurationChanged, this, &MiniProjectTargetSelector::activeRunConfigurationChanged); } else { - m_listWidgets[BUILD]->setProjectConfigurations(QList(), nullptr); - m_listWidgets[DEPLOY]->setProjectConfigurations(QList(), nullptr); - m_listWidgets[RUN]->setProjectConfigurations(QList(), nullptr); + m_listWidgets[BUILD]->setProjectConfigurations({}, nullptr); + m_listWidgets[DEPLOY]->setProjectConfigurations({}, nullptr); + m_listWidgets[RUN]->setProjectConfigurations({}, nullptr); m_buildConfiguration = nullptr; m_deployConfiguration = nullptr; m_runConfiguration = nullptr; diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index f4fe6de0922..a3eedd7bc28 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -693,7 +693,7 @@ void Edit3DView::createSeekerSliderAction() QPoint Edit3DView::resolveToolbarPopupPos(Edit3DAction *action) const { QPoint pos; - const QList &objects = action->action()->associatedObjects(); + const QObjectList &objects = action->action()->associatedObjects(); for (QObject *obj : objects) { if (auto button = qobject_cast(obj)) { if (auto toolBar = qobject_cast(button->parent())) { diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.h b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.h index 1d5fb9eaebb..b8f07cf3a48 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.h +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.h @@ -75,7 +75,7 @@ private: void addSpacing(int width); void setupCurrentFrameValidator(); - QList m_grp; + QObjectList m_grp; QLabel *m_timelineLabel = nullptr; QLabel *m_stateLabel = nullptr; diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.h b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.h index a3ec6468ff8..9d942d17dbf 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.h +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.h @@ -56,7 +56,7 @@ private: void createRightControls(); void addSpacing(int width); - QList m_grp; + QObjectList m_grp; QComboBox *m_transitionComboBox = nullptr; QSlider *m_scale = nullptr; diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp index 0f7133b1ff5..9038ade7903 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -746,7 +746,7 @@ QList NodeInstanceServer::allSubContextsForObject(QObject *object QList contextList; if (object) { - const QList subObjects = object->findChildren(); + const QObjectList subObjects = object->findChildren(); for (QObject *subObject : subObjects) { QQmlContext *contextOfObject = QQmlEngine::contextForObject(subObject); if (contextOfObject) { @@ -759,9 +759,9 @@ QList NodeInstanceServer::allSubContextsForObject(QObject *object return contextList; } -QList NodeInstanceServer::allSubObjectsForObject(QObject *object) +QObjectList NodeInstanceServer::allSubObjectsForObject(QObject *object) { - QList subChildren; + QObjectList subChildren; if (object) subChildren = object->findChildren(); diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h index 09c87b3af92..e7070a63bde 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h +++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h @@ -291,7 +291,7 @@ protected: QList setupInstances(const CreateSceneCommand &command); QList allSubContextsForObject(QObject *object); - static QList allSubObjectsForObject(QObject *object); + static QObjectList allSubObjectsForObject(QObject *object); virtual void resizeCanvasToRootItem() = 0; void setupState(qint32 stateInstanceId); diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h index 321751cf238..4d729cbf026 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h +++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h @@ -151,7 +151,7 @@ private: QSet m_view3Ds; QMultiHash m_3DSceneMap; // key: scene root, value: node QObject *m_active3DView = nullptr; - QList m_priorityView3DsToRender; + QObjectList m_priorityView3DsToRender; QObject *m_active3DScene = nullptr; QSet m_parentChangedSet; QList m_completedComponentList; diff --git a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp index a9c49b96611..e2859f26845 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -217,7 +217,7 @@ QStringList QuickItemNodeInstance::allStates() const { QStringList list; - QList stateList = QQuickDesignerSupport::statesForItem(quickItem()); + QObjectList stateList = QQuickDesignerSupport::statesForItem(quickItem()); for (QObject *state : stateList) { QQmlProperty property(state, "name"); if (property.isValid()) @@ -493,7 +493,7 @@ bool QuickItemNodeInstance::isRenderable() const QList QuickItemNodeInstance::stateInstances() const { QList instanceList; - const QList stateList = QQuickDesignerSupport::statesForItem(quickItem()); + const QObjectList stateList = QQuickDesignerSupport::statesForItem(quickItem()); for (QObject *state : stateList) { if (state && nodeInstanceServer()->hasInstanceForObject(state)) diff --git a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp index 6897a23973b..e6eaa66a0b9 100644 --- a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp +++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp @@ -762,7 +762,7 @@ void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInsta if (!nodeInstanceServer->hasInstanceForObject(item)) emitComponentComplete(object); - QList childList = object->children(); + QObjectList childList = object->children(); if (item) { const QList childItems = item->childItems();