From 84bbab1c97679aa42ed97a938d47fe6daaf123c7 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 28 Sep 2020 11:54:48 +0200 Subject: [PATCH] ProjectExplorer: Simplify ProjectTree:aboutToShowContextMenu() Only one user that doesn't use one of the arguments. Change-Id: I72c1360b23edf88e8de733542bde608f84d8de0b Reviewed-by: Christian Kandeler --- src/plugins/modeleditor/modelsmanager.cpp | 5 +---- src/plugins/modeleditor/modelsmanager.h | 2 +- src/plugins/projectexplorer/projecttree.cpp | 3 +-- src/plugins/projectexplorer/projecttree.h | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp index 6b4ee052e5c..da02d474623 100644 --- a/src/plugins/modeleditor/modelsmanager.cpp +++ b/src/plugins/modeleditor/modelsmanager.cpp @@ -227,11 +227,8 @@ void ModelsManager::setDiagramClipboard(ExtDocumentController *documentControlle emit diagramClipboardChanged(isDiagramClipboardEmpty()); } -void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project, - ProjectExplorer::Node *node) +void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Node *node) { - Q_UNUSED(project) - bool canOpenDiagram = false; foreach (const ManagedModel &managedModel, d->managedModels) { diff --git a/src/plugins/modeleditor/modelsmanager.h b/src/plugins/modeleditor/modelsmanager.h index 71972203503..049b506d838 100644 --- a/src/plugins/modeleditor/modelsmanager.h +++ b/src/plugins/modeleditor/modelsmanager.h @@ -81,7 +81,7 @@ public: const qmt::MContainer &mcontainer); private: - void onAboutToShowContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node); + void onAboutToShowContextMenu(ProjectExplorer::Node *node); void onOpenDiagramFromProjectExplorer(); void onOpenDefaultModel(const qmt::Uid &modelUid); diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index 01cb2f0ca69..d8b57ce4f1a 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -360,8 +360,7 @@ ProjectTreeWidget *ProjectTree::currentWidget() const void ProjectTree::showContextMenu(ProjectTreeWidget *focus, const QPoint &globalPos, Node *node) { QMenu *contextMenu = nullptr; - Project *project = projectForNode(node); - emit s_instance->aboutToShowContextMenu(project, node); + emit s_instance->aboutToShowContextMenu(node); if (!node) { contextMenu = Core::ActionManager::actionContainer(Constants::M_SESSIONCONTEXT)->menu(); diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h index aeefa6bea00..1765a87d5be 100644 --- a/src/plugins/projectexplorer/projecttree.h +++ b/src/plugins/projectexplorer/projecttree.h @@ -102,8 +102,7 @@ signals: // Emitted whenever the model needs to send a update signal. void subtreeChanged(ProjectExplorer::FolderNode *node); - void aboutToShowContextMenu(ProjectExplorer::Project *project, - ProjectExplorer::Node *node); + void aboutToShowContextMenu(ProjectExplorer::Node *node); // Emitted on any change to the tree void treeChanged();