feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Replace QQueue with QList

Browse Source 
No QQueue's specific API was used anyway.

Change-Id: I6ac2d02c43ce4e3700589a4df97dd3f0983d23b9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-30 12:06:57 +02:00
parent 63f3921334
commit 00741a7216
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/modeleditor/pxnodeutilities.cpp
View File

@@ -15,7 +15,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QFileInfo> #include <QFileInfo>
#include <QQueue> #include <QList>
#include <QPair> #include <QPair>
#include <typeinfo> #include <typeinfo>
@@ -76,8 +76,8 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
suggestedParent = dynamic_cast<qmt::MPackage *>(suggestedParent->owner()); suggestedParent = dynamic_cast<qmt::MPackage *>(suggestedParent->owner());
} }
QQueue<QPair<qmt::MPackage *, int> > roots; QList<QPair<qmt::MPackage *, int>>
roots.append(qMakePair(d->diagramSceneController->modelController()->rootPackage(), 0)); roots{{d->diagramSceneController->modelController()->rootPackage(), 0}};
int maxChainLength = -1; int maxChainLength = -1;
int minChainDepth = -1; int minChainDepth = -1;
@@ -94,7 +94,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
if (auto childPackage = dynamic_cast<qmt::MPackage *>(handle.target())) { if (auto childPackage = dynamic_cast<qmt::MPackage *>(handle.target())) {
// only accept root packages in the same path as the suggested parent package // only accept root packages in the same path as the suggested parent package
if (suggestedParents.contains(childPackage)) { if (suggestedParents.contains(childPackage)) {
roots.append(qMakePair(childPackage, depth + 1)); roots.push_back({childPackage, depth + 1});
break; break;
} }
} }
@@ -160,8 +160,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElements, qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElements,
const qmt::MObject *object) const qmt::MObject *object)
{ {
QQueue<qmt::MPackage *> roots; QList<qmt::MPackage *> roots{d->diagramSceneController->modelController()->rootPackage()};
roots.append(d->diagramSceneController->modelController()->rootPackage());
while (!roots.isEmpty()) { while (!roots.isEmpty()) {
qmt::MPackage *package = roots.takeFirst(); qmt::MPackage *package = roots.takeFirst();