diff --git a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.cpp b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp similarity index 83% rename from src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.cpp rename to src/plugins/qmldesigner/components/componentcore/abstractaction.cpp index 28fa5bcba18..f73dd5e404c 100644 --- a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp @@ -28,32 +28,32 @@ ****************************************************************************/ -#include "defaultdesigneraction.h" +#include "abstractaction.h" namespace QmlDesigner { -DefaultDesignerAction::DefaultDesignerAction(const QString &description) +AbstractAction::AbstractAction(const QString &description) : m_defaultAction(new DefaultAction(description)) { } -DefaultDesignerAction::DefaultDesignerAction(DefaultAction *action) +AbstractAction::AbstractAction(DefaultAction *action) : m_defaultAction(action) { } -QAction *DefaultDesignerAction::action() const +QAction *AbstractAction::action() const { return m_defaultAction.data(); } -void DefaultDesignerAction::currentContextChanged(const SelectionContext &selectionContext) +void AbstractAction::currentContextChanged(const SelectionContext &selectionContext) { m_selectionContext = selectionContext; updateContext(); } -void DefaultDesignerAction::updateContext() +void AbstractAction::updateContext() { m_defaultAction->setSelectionContext(m_selectionContext); if (m_selectionContext.isValid()) { @@ -62,12 +62,12 @@ void DefaultDesignerAction::updateContext() } } -DefaultAction *DefaultDesignerAction::defaultAction() const +DefaultAction *AbstractAction::defaultAction() const { return m_defaultAction.data(); } -SelectionContext DefaultDesignerAction::selectionContext() const +SelectionContext AbstractAction::selectionContext() const { return m_selectionContext; } diff --git a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h b/src/plugins/qmldesigner/components/componentcore/abstractaction.h similarity index 93% rename from src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h rename to src/plugins/qmldesigner/components/componentcore/abstractaction.h index a199c9c8888..ef622d948e8 100644 --- a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.h @@ -56,11 +56,11 @@ protected: SelectionContext m_selectionContext; }; -class QMLDESIGNERCORE_EXPORT DefaultDesignerAction : public ActionInterface +class QMLDESIGNERCORE_EXPORT AbstractAction : public ActionInterface { public: - DefaultDesignerAction(const QString &description = QString()); - DefaultDesignerAction(DefaultAction *action); + AbstractAction(const QString &description = QString()); + AbstractAction(DefaultAction *action); QAction *action() const; DefaultAction *defaultAction() const; diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore.pri b/src/plugins/qmldesigner/components/componentcore/componentcore.pri index 959a6ef8c9d..94aeaa540e7 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore.pri +++ b/src/plugins/qmldesigner/components/componentcore/componentcore.pri @@ -3,7 +3,7 @@ VPATH += $$PWD SOURCES += modelnodecontextmenu.cpp SOURCES += abstractactiongroup.cpp SOURCES += designeractionmanagerview.cpp -SOURCES += defaultdesigneraction.cpp +SOURCES += abstractaction.cpp SOURCES += modelnodecontextmenu_helper.cpp SOURCES += selectioncontext.cpp SOURCES += designeractionmanager.cpp @@ -13,7 +13,7 @@ SOURCES += crumblebar.cpp HEADERS += modelnodecontextmenu.h HEADERS += abstractactiongroup.h HEADERS += designeractionmanagerview.h -HEADERS += defaultdesigneraction.h +HEADERS += abstractaction.h HEADERS += modelnodecontextmenu_helper.h HEADERS += selectioncontext.h HEADERS += componentcore_constants.h diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h index 1c1ee414110..11f87d2f5b5 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h @@ -31,7 +31,7 @@ #define MODELNODECONTEXTMENU_HELPER_H #include "modelnodeoperations.h" -#include "defaultdesigneraction.h" +#include "abstractaction.h" #include "abstractactiongroup.h" #include "qmlitemnode.h" @@ -142,7 +142,7 @@ private: SelectionContextFunction m_visibility; }; -class SeperatorDesignerAction : public DefaultDesignerAction +class SeperatorDesignerAction : public AbstractAction { public: SeperatorDesignerAction(const QByteArray &category, int priority) : @@ -165,14 +165,14 @@ private: SelectionContextFunction m_visibility; }; -class ModelNodeAction : public DefaultDesignerAction +class ModelNodeAction : public AbstractAction { public: ModelNodeAction(const QString &description, const QByteArray &category, int priority, ModelNodeOperations::SelectionAction selectionAction, SelectionContextFunction enabled = &SelectionContextFunctors::always, SelectionContextFunction visibility = &SelectionContextFunctors::always) : - DefaultDesignerAction(new ActionTemplate(description, selectionAction)), + AbstractAction(new ActionTemplate(description, selectionAction)), m_category(category), m_priority(priority), m_enabled(enabled), diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp index 4884d95f617..742ddcd9d87 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp +++ b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp @@ -57,7 +57,7 @@ bool isTabAndParentIsTabView(const ModelNode &modelNode) } AddTabDesignerAction::AddTabDesignerAction() - : DefaultDesignerAction(QCoreApplication::translate("TabViewToolAction","Add Tab...")) + : AbstractAction(QCoreApplication::translate("TabViewToolAction","Add Tab...")) { connect(action(), SIGNAL(triggered()), this, SLOT(addNewTab())); } diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h index 9fdad028ea2..133591ad66e 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h @@ -30,11 +30,11 @@ #ifndef QMLDESIGNER_TABVIEWDESIGNERACTION_H #define QMLDESIGNER_TABVIEWDESIGNERACTION_H -#include "defaultdesigneraction.h" +#include "abstractaction.h" namespace QmlDesigner { -class AddTabDesignerAction : public QObject, public DefaultDesignerAction +class AddTabDesignerAction : public QObject, public AbstractAction { Q_OBJECT public: