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

Rename ActionInterfaces Target to TargetView

Browse Source 
Change-Id: I55692f9d773a1466fec5285fdc53149a3a1359f1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2021-01-07 11:50:13 +01:00
committed by Thomas Hartmann
parent e7a65dd3c9
commit dd8b73cfd2
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/componentcore/actioninterface.h
View File

@@ -53,7 +53,7 @@ public:
LowestPriority = ComponentCoreConstants::priorityLast LowestPriority = ComponentCoreConstants::priorityLast
}; };
enum class Target { enum class TargetView {
Undefined, Undefined,
ConnectionEditor ConnectionEditor
}; };
@@ -66,7 +66,7 @@ public:
virtual int priority() const = 0; virtual int priority() const = 0;
virtual Type type() const = 0; virtual Type type() const = 0;
virtual void currentContextChanged(const SelectionContext &selectionState) = 0; virtual void currentContextChanged(const SelectionContext &selectionState) = 0;
virtual Target target() const { return Target::Undefined; } virtual TargetView targetView() const { return TargetView::Undefined; }
}; };

4
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -1480,11 +1480,11 @@ void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByt
addDesignerAction(new CommandAction(command, category, priority, overrideIcon)); addDesignerAction(new CommandAction(command, category, priority, overrideIcon));
} }
QList<QSharedPointer<ActionInterface> > DesignerActionManager::actionsForTarget(const ActionInterface::Target &target) QList<QSharedPointer<ActionInterface> > DesignerActionManager::actionsForTargetView(const ActionInterface::TargetView &target)
{ {
QList<QSharedPointer<ActionInterface> > out; QList<QSharedPointer<ActionInterface> > out;
for (auto interface : m_designerActions) for (auto interface : m_designerActions)
if (interface->target() == target) if (interface->targetView() == target)
out << interface; out << interface;
return out; return out;

2
src/plugins/qmldesigner/components/componentcore/designeractionmanager.h
View File

@@ -107,7 +107,7 @@ public:
void addCreatorCommand(Core::Command *command, const QByteArray &category, int priority, void addCreatorCommand(Core::Command *command, const QByteArray &category, int priority,
const QIcon &overrideIcon = QIcon()); const QIcon &overrideIcon = QIcon());
QList<QSharedPointer<ActionInterface>> actionsForTarget(const ActionInterface::Target &target); QList<QSharedPointer<ActionInterface>> actionsForTargetView(const ActionInterface::TargetView &target);
QList<ActionInterface* > designerActions() const; QList<ActionInterface* > designerActions() const;

5
src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
View File

@@ -176,7 +176,10 @@ void ConnectionViewWidget::contextMenuEvent(QContextMenuEvent *event)
data["ModelNode"] = index.siblingAtColumn(ConnectionModel::TargetModelNodeRow).data(); data["ModelNode"] = index.siblingAtColumn(ConnectionModel::TargetModelNodeRow).data();
data["Signal"] = index.siblingAtColumn(ConnectionModel::TargetPropertyNameRow).data(); data["Signal"] = index.siblingAtColumn(ConnectionModel::TargetPropertyNameRow).data();
DesignerActionManager &designerActionManager = QmlDesignerPlugin::instance()->designerActionManager(); 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(); auto *action = actionInterface->action();
action->setData(data); action->setData(data);
menu.addAction(action); menu.addAction(action);