diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp index 415127cb529..c0dea6b3c5b 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp @@ -63,7 +63,7 @@ void populateMenu(QSet &actionInterfaces, actionInterfaces.subtract(matchingFactories); - QList matchingFactoriesList = matchingFactories.toList(); + QList matchingFactoriesList = Utils::toList(matchingFactories); Utils::sort(matchingFactoriesList, [](ActionInterface *l, ActionInterface *r) { return l->priority() > r->priority(); }); @@ -100,8 +100,7 @@ void ModelNodeContextMenu::execute(const QPoint &position, bool selectionMenuBoo manager.setupContext(); - QSet factories = - QSet::fromList(manager.designerActions()); + QSet factories = Utils::toSet(manager.designerActions()); populateMenu(factories, QByteArray(), mainMenu, m_selectionContext); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 045aec90074..71d86712961 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -39,6 +39,7 @@ #include #include +#include #include #include @@ -255,16 +256,16 @@ void FormEditorScene::mousePressEvent(QGraphicsSceneMouseEvent *event) currentTool()->mousePressEvent(removeLayerItems(itemsAt(event->scenePos())), event); } -static QTime staticTimer() +static QElapsedTimer staticTimer() { - QTime timer; + QElapsedTimer timer; timer.start(); return timer; } void FormEditorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - static QTime time = staticTimer(); + static QElapsedTimer time = staticTimer(); QGraphicsScene::mouseMoveEvent(event); diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h index 6bfcf72f6b3..72bad79f4f6 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h @@ -33,6 +33,7 @@ #include "bindingindicator.h" #include "contentnoteditableindicator.h" +#include #include namespace QmlDesigner { @@ -87,7 +88,7 @@ private: AnchorIndicator m_anchorIndicator; BindingIndicator m_bindingIndicator; ContentNotEditableIndicator m_contentNotEditableIndicator; - QTime m_mousePressTimer; + QElapsedTimer m_mousePressTimer; QCursor m_cursor; bool m_itemAlreadySelected = false; }; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index ae47586641c..c0b96a7baea 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -273,7 +273,7 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q qCInfo(propertyEditorBenchmark) << Q_FUNC_INFO; - QTime time; + QElapsedTimer time; if (propertyEditorBenchmark().isInfoEnabled()) time.start(); diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index c0e0b415373..f77ac4645b0 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -195,7 +196,7 @@ private: //variables QPointer m_nodeInstanceServer; QImage m_baseStatePreviewImage; - QTime m_lastCrashTime; + QElapsedTimer m_lastCrashTime; NodeInstanceServerInterface::RunModus m_runModus; ProjectExplorer::Kit *m_currentKit = nullptr; ProjectExplorer::Project *m_currentProject = nullptr; diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index d53b8cfc1d5..981524b3095 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -1396,7 +1396,7 @@ void ModelPrivate::setSelectedNodes(const QList &selected QList sortedSelectedList = Utils::filtered(selectedNodeList, &InternalNode::isValid); - sortedSelectedList = sortedSelectedList.toSet().toList(); + sortedSelectedList = Utils::toList(Utils::toSet(sortedSelectedList)); Utils::sort(sortedSelectedList); if (sortedSelectedList == m_selectedInternalNodeList) @@ -1767,7 +1767,8 @@ QList ModelPrivate::allNodes() const nodeList.append(m_rootInternalNode); nodeList.append(m_rootInternalNode->allSubNodes()); - nodeList.append((m_nodeSet - nodeList.toSet()).toList()); + // FIXME: This is horribly expensive compared to a loop. + nodeList.append(Utils::toList(m_nodeSet - Utils::toSet(nodeList))); return nodeList; } diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index c2f36fad905..989ea8dbb40 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -47,6 +47,7 @@ #include +#include #include #include @@ -102,8 +103,7 @@ DesignDocument *ViewManager::currentDesignDocument() const void ViewManager::attachNodeInstanceView() { - - QTime time; + QElapsedTimer time; if (viewBenchmark().isInfoEnabled()) time.start(); @@ -117,7 +117,7 @@ void ViewManager::attachNodeInstanceView() void ViewManager::attachRewriterView() { - QTime time; + QElapsedTimer time; if (viewBenchmark().isInfoEnabled()) time.start(); @@ -253,7 +253,7 @@ void ViewManager::attachViewsExceptRewriterAndComponetView() attachNodeInstanceView(); - QTime time; + QElapsedTimer time; if (viewBenchmark().isInfoEnabled()) time.start();