diff options
| author | Eike Ziller <[email protected]> | 2012-05-24 13:49:06 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2012-05-25 10:08:24 +0200 |
| commit | 3934347fe9ed7e1567c3ff377f857928e8b03304 (patch) | |
| tree | 09f1ccaf1af2d8032bb12ea0a5a05b4b4185d431 /src/plugins/qmljstools/qmljstoolsplugin.cpp | |
| parent | 7c7ccdc764629042729ceede4ca3e47b464aee42 (diff) | |
ActionManager API cleanup.
d-pointer instead of inheritance
static methods
Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index e2cfdc828a5..28679e9ad3b 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -77,8 +77,6 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) Q_UNUSED(arguments) Q_UNUSED(error) - Core::ActionManager *am = Core::ICore::actionManager(); - m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings // Objects @@ -96,8 +94,8 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(new QmlJSCodeStyleSettingsPage); // Menus - Core::ActionContainer *mtools = am->actionContainer(Core::Constants::M_TOOLS); - Core::ActionContainer *mqmljstools = am->createMenu(Constants::M_TOOLS_QMLJS); + Core::ActionContainer *mtools = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS); + Core::ActionContainer *mqmljstools = Core::ActionManager::createMenu(Constants::M_TOOLS_QMLJS); QMenu *menu = mqmljstools->menu(); menu->setTitle(tr("&QML/JS")); menu->setEnabled(true); @@ -106,7 +104,8 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) // Update context in global context m_resetCodeModelAction = new QAction(tr("Reset Code Model"), this); Core::Context globalContext(Core::Constants::C_GLOBAL); - Core::Command *cmd = am->registerAction(m_resetCodeModelAction, Core::Id(Constants::RESET_CODEMODEL), globalContext); + Core::Command *cmd = Core::ActionManager::registerAction( + m_resetCodeModelAction, Core::Id(Constants::RESET_CODEMODEL), globalContext); connect(m_resetCodeModelAction, SIGNAL(triggered()), m_modelManager, SLOT(resetCodeModel())); mqmljstools->addAction(cmd); |