diff --git a/src/plugins/qmldesigner/components/componentcore/actioninterface.h b/src/plugins/qmldesigner/components/componentcore/actioninterface.h index d570d1dc229..1ca50d74e39 100644 --- a/src/plugins/qmldesigner/components/componentcore/actioninterface.h +++ b/src/plugins/qmldesigner/components/componentcore/actioninterface.h @@ -53,7 +53,7 @@ public: LowestPriority = ComponentCoreConstants::priorityLast }; - enum class Target { + enum class TargetView { Undefined, ConnectionEditor }; @@ -66,7 +66,7 @@ public: virtual int priority() const = 0; virtual Type type() const = 0; virtual void currentContextChanged(const SelectionContext &selectionState) = 0; - virtual Target target() const { return Target::Undefined; } + virtual TargetView targetView() const { return TargetView::Undefined; } }; diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index a8851f9eb51..4353b4f7f30 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -1480,11 +1480,11 @@ void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByt addDesignerAction(new CommandAction(command, category, priority, overrideIcon)); } -QList > DesignerActionManager::actionsForTarget(const ActionInterface::Target &target) +QList > DesignerActionManager::actionsForTargetView(const ActionInterface::TargetView &target) { QList > out; for (auto interface : m_designerActions) - if (interface->target() == target) + if (interface->targetView() == target) out << interface; return out; diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h index 5dfbfc9db12..66109d16402 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h @@ -107,7 +107,7 @@ public: void addCreatorCommand(Core::Command *command, const QByteArray &category, int priority, const QIcon &overrideIcon = QIcon()); - QList> actionsForTarget(const ActionInterface::Target &target); + QList> actionsForTargetView(const ActionInterface::TargetView &target); QList designerActions() const; diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp index 401ddc5841f..11bfebe5e73 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp @@ -176,7 +176,10 @@ void ConnectionViewWidget::contextMenuEvent(QContextMenuEvent *event) data["ModelNode"] = index.siblingAtColumn(ConnectionModel::TargetModelNodeRow).data(); data["Signal"] = index.siblingAtColumn(ConnectionModel::TargetPropertyNameRow).data(); DesignerActionManager &designerActionManager = QmlDesignerPlugin::instance()->designerActionManager(); - for (auto actionInterface : designerActionManager.actionsForTarget(ActionInterface::Target::ConnectionEditor)) { + const auto actions = designerActionManager.actionsForTargetView( + ActionInterface::TargetView::ConnectionEditor); + + for (auto actionInterface : actions) { auto *action = actionInterface->action(); action->setData(data); menu.addAction(action);