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

QmlDesigner: Refactor ModelPrivate::changeSelectedNodes

Browse Source 
Change the name to notifySelectedNodesChanged to make it clear it is
notifying. Use the template function to simplify code.

Change-Id: I52c2a08c728c4be29899b1cab67650f607633850
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2025-05-23 15:09:21 +02:00
parent 8839b73420
commit 3f6293ed1f
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/libs/designercore/model/model.cpp
View File

@@ -1304,7 +1304,7 @@ void ModelPrivate::setSelectedNodes(const FewNodes &selectedNodeList)
})); }));
} }
changeSelectedNodes(sortedSelectedList, lastSelectedNodeList); notifySelectedNodesChanged(sortedSelectedList, lastSelectedNodeList);
} }
void ModelPrivate::clearSelectedNodes() void ModelPrivate::clearSelectedNodes()
@@ -1313,7 +1313,7 @@ void ModelPrivate::clearSelectedNodes()
auto lastSelectedNodeList = m_selectedInternalNodes; auto lastSelectedNodeList = m_selectedInternalNodes;
m_selectedInternalNodes.clear(); m_selectedInternalNodes.clear();
changeSelectedNodes(m_selectedInternalNodes, lastSelectedNodeList); notifySelectedNodesChanged(m_selectedInternalNodes, lastSelectedNodeList);
} }
void ModelPrivate::removeAuxiliaryData(const InternalNodePointer &node, const AuxiliaryDataKeyView &key) void ModelPrivate::removeAuxiliaryData(const InternalNodePointer &node, const AuxiliaryDataKeyView &key)
@@ -1378,21 +1378,15 @@ QList<std::tuple<InternalBindingProperty *, QString>> ModelPrivate::toInternalBi
return internalProperties; return internalProperties;
} }
void ModelPrivate::changeSelectedNodes(const FewNodes &newSelectedNodeList, void ModelPrivate::notifySelectedNodesChanged(const FewNodes &newSelectedNodeList,
const FewNodes &oldSelectedNodeList) const FewNodes &oldSelectedNodeList)
{ {
NanotraceHR::Tracer tracer{"model private change selected nodes", ModelTracing::category()}; NanotraceHR::Tracer tracer{"model private change selected nodes", ModelTracing::category()};
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) { notifyNodeInstanceViewLast([&](AbstractView *view) {
Q_ASSERT(view != nullptr); view->selectedNodesChanged(toModelNodeList(newSelectedNodeList, view),
view->selectedNodesChanged(toModelNodeList(newSelectedNodeList, view.data()), toModelNodeList(oldSelectedNodeList, view));
toModelNodeList(oldSelectedNodeList, view.data())); });
}
if (nodeInstanceView()) {
nodeInstanceView()->selectedNodesChanged(toModelNodeList(newSelectedNodeList, nodeInstanceView()),
toModelNodeList(oldSelectedNodeList, nodeInstanceView()));
}
} }
const ModelPrivate::FewNodes &ModelPrivate::selectedNodes() const const ModelPrivate::FewNodes &ModelPrivate::selectedNodes() const

3
src/plugins/qmldesigner/libs/designercore/model/model_p.h
View File

@@ -231,7 +231,8 @@ public:
const FewNodes &selectedNodes() const; const FewNodes &selectedNodes() const;
void selectNode(const InternalNodePointer &node); void selectNode(const InternalNodePointer &node);
void deselectNode(const InternalNodePointer &node); void deselectNode(const InternalNodePointer &node);
void changeSelectedNodes(const FewNodes &newSelectedNodeList, const FewNodes &oldSelectedNodeList); void notifySelectedNodesChanged(const FewNodes &newSelectedNodeList,
const FewNodes &oldSelectedNodeList);
void setAuxiliaryData(const InternalNodePointer &node, void setAuxiliaryData(const InternalNodePointer &node,
const AuxiliaryDataKeyView &key, const AuxiliaryDataKeyView &key,