Fixes: - Rename ActionManagerInterface --> ActionManager

Details:  - To make it conform to naming convention.

50 files changed, 107 insertions, 107 deletions

diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index ff07d5e876..b5d4c1d904 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -46,7 +46,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 63fbb1c2ee..c926f868f8 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -42,7 +42,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/QDebug>
@@ -68,7 +68,7 @@ void BookmarksPlugin::extensionsInitialized()
 bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
 {
     m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     QList<int> context = QList<int>() << m_core->uniqueIDManager()->
         uniqueIdentifier(Constants::BOOKMARKS_CONTEXT);
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index f333152a6b..889bb9eafe 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -52,15 +52,15 @@ namespace {
 }
 
 /*!
-    \class Core::ActionManagerInterface
+    \class Core::ActionManager
     \mainclass
     \ingroup qwb
-    \inheaderfile actionmanagerinterface.h
+    \inheaderfile actionmanager.h
 
     \brief All actions should be registered in the ActionManager, since this enables the user to
     e.g. change their shortcuts at a central place.
 
-    The ActionManagerInterface is the central bookkeeper of actions and their shortcuts and layout.
+    The ActionManager is the central bookkeeper of actions and their shortcuts and layout.
     You get the only implementation of this class from the core interface (ICore::actionManager()).
 
     The main reasons for the need of this class is to provide a central place where the user
@@ -94,52 +94,52 @@ namespace {
 */
 
 /*!
-    \fn virtual IActionContainer *ActionManagerInterface::createMenu(const QString &id) = 0
+    \fn virtual IActionContainer *ActionManager::createMenu(const QString &id) = 0
     ...
 */
 
 /*!
-    \fn virtual IActionContainer *ActionManagerInterface::createMenuBar(const QString &id) = 0
+    \fn virtual IActionContainer *ActionManager::createMenuBar(const QString &id) = 0
     ...
 */
 
 /*!
-    \fn virtual ICommand *ActionManagerInterface::registerAction(QAction *action, const QString &id, const QList<int> &context) = 0
+    \fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id, const QList<int> &context) = 0
     ...
 */
 
 /*!
-    \fn virtual ICommand *ActionManagerInterface::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context) = 0
+    \fn virtual ICommand *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context) = 0
     ...
 */
 
 /*!
-    \fn virtual ICommand *ActionManagerInterface::registerAction(QAction *action, const QString &id) = 0
+    \fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id) = 0
     ...
 */
 
 /*!
-    \fn virtual void ActionManagerInterface::addAction(ICommand *action, const QString &globalGroup) = 0
+    \fn virtual void ActionManager::addAction(ICommand *action, const QString &globalGroup) = 0
     ...
 */
 
 /*!
-    \fn virtual void ActionManagerInterface::addMenu(IActionContainer *menu, const QString &globalGroup) = 0
+    \fn virtual void ActionManager::addMenu(IActionContainer *menu, const QString &globalGroup) = 0
     ...
 */
 
 /*!
-    \fn virtual ICommand *ActionManagerInterface::command(const QString &id) const = 0
+    \fn virtual ICommand *ActionManager::command(const QString &id) const = 0
     ...
 */
 
 /*!
-    \fn virtual IActionContainer *ActionManagerInterface::actionContainer(const QString &id) const = 0
+    \fn virtual IActionContainer *ActionManager::actionContainer(const QString &id) const = 0
     ...
 */
 
 /*!
-    \fn virtual ActionManagerInterface::~ActionManagerInterface()
+    \fn virtual ActionManager::~ActionManager()
     ...
 */
 
@@ -160,7 +160,7 @@ ActionManagerPrivate* ActionManagerPrivate::m_instance = 0;
     ...
 */
 ActionManagerPrivate::ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr) :
-    ActionManagerInterface(mainWnd),
+    ActionManager(mainWnd),
     m_mainWnd(mainWnd)
 {
     m_defaultGroups << uidmgr->uniqueIdentifier(Constants::G_DEFAULT_ONE);
diff --git a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index f77e9ca484..d1c570ae4a 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef ACTIONMANAGERINTERFACE_H
-#define ACTIONMANAGERINTERFACE_H
+#ifndef ACTIONMANAGER_H
+#define ACTIONMANAGER_H
 
 #include "coreplugin/core_global.h"
 
@@ -50,12 +50,12 @@ QT_END_NAMESPACE
 
 namespace Core {
 
-class CORE_EXPORT ActionManagerInterface : public QObject
+class CORE_EXPORT ActionManager : public QObject
 {
     Q_OBJECT
 public:
-    ActionManagerInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~ActionManagerInterface() {}
+    ActionManager(QObject *parent = 0) : QObject(parent) {}
+    virtual ~ActionManager() {}
 
     virtual IActionContainer *createMenu(const QString &id) = 0;
     virtual IActionContainer *createMenuBar(const QString &id) = 0;
@@ -74,4 +74,4 @@ public:
 
 } // namespace Core
 
-#endif // ACTIONMANAGERINTERFACE_H
+#endif // ACTIONMANAGER_H
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
index 9d3e49de09..5ca979ed6d 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -34,7 +34,7 @@
 #ifndef ACTIONMANAGERPRIVATE_H
 #define ACTIONMANAGERPRIVATE_H
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 
 #include <QtCore/QMap>
 #include <QtCore/QHash>
@@ -60,7 +60,7 @@ class ActionContainer;
 class MainWindow;
 class Command;
 
-class ActionManagerPrivate : public Core::ActionManagerInterface
+class ActionManagerPrivate : public Core::ActionManager
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index cd96a9c24f..0a3af052c4 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/src/plugins/coreplugin/coreimpl.cpp
@@ -64,7 +64,7 @@ void CoreImpl::showOptionsDialog(const QString &group, const QString &page)
     m_mainwindow->showOptionsDialog(group, page);
 }
 
-ActionManagerInterface *CoreImpl::actionManager() const
+ActionManager *CoreImpl::actionManager() const
 {
     return m_mainwindow->actionManager();
 }
diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h
index fc5375d370..19cc94564d 100644
--- a/src/plugins/coreplugin/coreimpl.h
+++ b/src/plugins/coreplugin/coreimpl.h
@@ -56,7 +56,7 @@ public:
     void showOptionsDialog(const QString &group = QString(),
                                    const QString &page = QString());
 
-    ActionManagerInterface *actionManager() const;
+    ActionManager *actionManager() const;
     FileManager *fileManager() const ;
     UniqueIDManager *uniqueIDManager() const;
     MessageManager *messageManager() const;
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index e78e049d01..452e71cb23 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -99,7 +99,7 @@ HEADERS += mainwindow.h \
     editormanager/ieditor.h \
     editormanager/ieditorfactory.h \
     actionmanager/iactioncontainer.h \
-    actionmanager/actionmanagerinterface.h \
+    actionmanager/actionmanager.h \
     actionmanager/icommand.h \
     actionmanager/actionmanager_p.h \
     actionmanager/command.h \
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 1eb3abb133..923f90ce0c 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -48,7 +48,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 #include <coreplugin/baseview.h>
 #include <coreplugin/imode.h>
@@ -207,7 +207,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
     const QList<int> editManagerContext =
             QList<int>() << m_d->m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER);
 
-    ActionManagerInterface *am = m_d->m_core->actionManager();
+    ActionManager *am = m_d->m_core->actionManager();
     IActionContainer *mfile = am->actionContainer(Constants::M_FILE);
 
     //Revert to saved
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index 370cae409f..dbb9e0c20b 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -41,7 +41,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 
 #include <utils/qtcassert.h>
 
@@ -72,7 +72,7 @@ void EditorSplitter::registerActions()
     const QList<int> editorManagerContext =
             QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER);
 
-    ActionManagerInterface *am = m_core->actionManager();
+    ActionManager *am = m_core->actionManager();
     IActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
     ICommand *cmd;
 
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 317ebbbc45..b2f4011ba7 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -51,7 +51,7 @@
 */
 
 /*!
-    \fn ActionManagerInterface *ICore::actionManager() const
+    \fn ActionManager *ICore::actionManager() const
     \brief Returns the application's action manager.
 
     The action manager is responsible for registration of menus and
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 53ff1e96f9..01b5b36b02 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -50,7 +50,7 @@ QT_END_NAMESPACE
 namespace Core {
 
 // forward declarations
-class ActionManagerInterface;
+class ActionManager;
 class IFile;
 class FileManager;
 class MessageManager;
@@ -81,7 +81,7 @@ public:
     virtual void showOptionsDialog(const QString &group = QString(),
                                    const QString &page = QString()) = 0;
 
-    virtual ActionManagerInterface *actionManager() const = 0;
+    virtual ActionManager *actionManager() const = 0;
     virtual FileManager *fileManager() const = 0;
     virtual UniqueIDManager *uniqueIDManager() const = 0;
     virtual MessageManager *messageManager() const = 0;
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f5d5a24c1c..b49628e914 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -815,7 +815,7 @@ void MainWindow::openFileWith()
     }
 }
 
-ActionManagerInterface *MainWindow::actionManager() const
+ActionManager *MainWindow::actionManager() const
 {
     return m_actionManager;
 }
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index c7462fd809..1256baaf79 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -55,7 +55,7 @@ class PluginManager;
 
 namespace Core {
 
-class ActionManagerInterface;
+class ActionManager;
 class BaseMode;
 class BaseView;
 class EditorManager;
@@ -105,7 +105,7 @@ public:
 
     //ICore
     inline ExtensionSystem::PluginManager *pluginManager() { return m_pluginManager; }
-    Core::ActionManagerInterface *actionManager() const;
+    Core::ActionManager *actionManager() const;
     Core::FileManager *fileManager() const;
     Core::UniqueIDManager *uniqueIDManager() const;
     Core::MessageManager *messageManager() const;
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index 2e1713d05f..f26efaf978 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -39,7 +39,7 @@
 
 #include <aggregation/aggregate.h>
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/coreimpl.h>
@@ -140,7 +140,7 @@ void ModeManager::objectAdded(QObject *obj)
     m_modeStack->insertTab(index, mode->widget(), mode->icon(), mode->name());
 
     // Register mode shortcut
-    ActionManagerInterface *am = m_mainWindow->actionManager();
+    ActionManager *am = m_mainWindow->actionManager();
     const QString shortcutId = QLatin1String("QtCreator.Mode.") + mode->uniqueModeName();
     QShortcut *shortcut = new QShortcut(m_mainWindow);
     shortcut->setWhatsThis(tr("Switch to %1 mode").arg(mode->name()));
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 491c394343..80d71f5b41 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -38,7 +38,7 @@
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <extensionsystem/ExtensionSystemInterfaces>
 
 #include <QtGui/QAction>
@@ -316,7 +316,7 @@ void NavigationWidget::objectAdded(QObject * obj)
         return;
 
     Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
-    Core::ActionManagerInterface *am = core->actionManager();
+    Core::ActionManager *am = core->actionManager();
     QList<int> navicontext = QList<int>() << core->uniqueIDManager()->
         uniqueIdentifier(Core::Constants::C_NAVIGATION_PANE);
 
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 6b5c3b146d..1f0f7d983c 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -37,7 +37,7 @@
 #include "mainwindow.h"
 #include "modemanager.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/iactioncontainer.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/editorgroup.h>
@@ -210,7 +210,7 @@ void OutputPane::init(ICore *core, ExtensionSystem::PluginManager *pm)
     m_pluginManager = pm;
     m_core = core;
 
-    ActionManagerInterface *am = m_core->actionManager();
+    ActionManager *am = m_core->actionManager();
     IActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
 
     // Window->Output Panes
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 17887450d9..8d4299a9f9 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -35,7 +35,7 @@
 #include "imode.h"
 #include "modemanager.h"
 
-#include "actionmanager/actionmanagerinterface.h"
+#include "actionmanager/actionmanager.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QEvent>
diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp
index 5032d45b4d..400f3d5518 100644
--- a/src/plugins/coreplugin/viewmanager.cpp
+++ b/src/plugins/coreplugin/viewmanager.cpp
@@ -38,7 +38,7 @@
 #include "uniqueidmanager.h"
 #include "iview.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <extensionsystem/ExtensionSystemInterfaces>
 #include <aggregation/aggregate.h>
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 548c48be7d..ba56ad542a 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -43,7 +43,7 @@
 #include <coreplugin/filemanager.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/itexteditor.h>
 #include <coreplugin/messageoutputwindow.h>
@@ -95,7 +95,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
     addObject(m_settingsPage);
 
     //register actions
-    Core::ActionManagerInterface *actionManager = gCoreInstance->actionManager();
+    Core::ActionManager *actionManager = gCoreInstance->actionManager();
 
     Core::IActionContainer *toolsContainer =
         actionManager->actionContainer(Core::Constants::M_TOOLS);
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 1eb298aa37..a5de130a7a 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -55,7 +55,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index c30bc97f29..ccb1a87ec1 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -44,7 +44,7 @@
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/fileiconprovider.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/completionsupport.h>
@@ -194,7 +194,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
     QList<int> context;
     context << m_core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
 
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     am->createMenu(CppEditor::Constants::M_CONTEXT);
 
     Core::ICommand *cmd;
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 866a3d05c9..a8b4366bab 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -45,7 +45,7 @@
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <cppeditor/cppeditorconstants.h>
 
@@ -81,7 +81,7 @@ CppToolsPlugin::~CppToolsPlugin()
 bool CppToolsPlugin::initialize(const QStringList & /*arguments*/, QString *)
 {
     m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     // Objects
     m_modelManager = new CppModelManager(this);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d65f9ac9ac..401bafad7f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -40,7 +40,7 @@
 #include "gdbengine.h"
 #include "mode.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
@@ -227,7 +227,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
     ICore *core = m_pm->getObject<Core::ICore>();
     QTC_ASSERT(core, return false);
 
-    Core::ActionManagerInterface *actionManager = core->actionManager();
+    Core::ActionManager *actionManager = core->actionManager();
     QTC_ASSERT(actionManager, return false);
 
     Core::UniqueIDManager *uidm = core->uniqueIDManager();
diff --git a/src/plugins/debugger/mode.cpp b/src/plugins/debugger/mode.cpp
index 4499414858..fdb94ea187 100644
--- a/src/plugins/debugger/mode.cpp
+++ b/src/plugins/debugger/mode.cpp
@@ -40,7 +40,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/findplaceholder.h>
@@ -151,7 +151,7 @@ QToolBar *DebugMode::createToolBar()
     IDebuggerManagerAccessForDebugMode *managerAccess =
         m_manager->debugModeInterface();
 
-    Core::ActionManagerInterface *am =
+    Core::ActionManager *am =
             ExtensionSystem::PluginManager::instance()
             ->getObject<Core::ICore>()->actionManager();
     QToolBar *debugToolBar = new QToolBar;
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 59e64c4cf9..d7f176d6e1 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -41,7 +41,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 
@@ -99,7 +99,7 @@ static inline QIcon designerIcon(const QString &iconName)
 // Create an action to activate a designer tool
 static inline QAction *createEditModeAction(QActionGroup *ag,
                                      const QList<int> &context,
-                                     Core::ActionManagerInterface *am,
+                                     Core::ActionManager *am,
                                      Core::IActionContainer *medit,
                                      const QString &actionName,
                                      const QString &name,
@@ -124,7 +124,7 @@ static inline QAction *createEditModeAction(QActionGroup *ag,
 
 // Create a menu separato
 static inline QAction * createSeparator(QObject *parent,
-                                 Core::ActionManagerInterface *am,
+                                 Core::ActionManager *am,
                                  const QList<int> &context,
                                  Core::IActionContainer *container,
                                  const QString &name = QString(),
@@ -139,7 +139,7 @@ static inline QAction * createSeparator(QObject *parent,
 
 // Create a tool action
 static inline void addToolAction(QAction *a,
-                   Core::ActionManagerInterface *am,
+                   Core::ActionManager *am,
                    const QList<int> &context,
                    const QString &name,
                    Core::IActionContainer *c1,
@@ -305,7 +305,7 @@ void FormEditorW::deleteInstance()
 
 void FormEditorW::setupActions()
 {
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     Core::ICommand *command;
 
     //menus
@@ -443,7 +443,7 @@ QToolBar *FormEditorW::createEditorToolBar() const
 {
     QToolBar *rc = new QToolBar;
     rc->addSeparator();
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     const QStringList::const_iterator cend = m_toolActionIds.constEnd();
     for (QStringList::const_iterator it = m_toolActionIds.constBegin(); it != cend; ++it) {
         Core::ICommand *cmd = am->command(*it);
@@ -457,7 +457,7 @@ QToolBar *FormEditorW::createEditorToolBar() const
     return rc;
 }
 
-Core::IActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManagerInterface *am,
+Core::IActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *am,
                                                             QActionGroup *actionGroup)
 {
     const QString menuId = QLatin1String(M_FORMEDITOR_PREVIEW);
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h
index 0e36ff3b9f..164c985a3f 100644
--- a/src/plugins/designer/formeditorw.h
+++ b/src/plugins/designer/formeditorw.h
@@ -65,7 +65,7 @@ namespace qdesigner_internal {
 QT_END_NAMESPACE
 
 namespace Core {
-class ActionManagerInterface;
+class ActionManager;
 class IActionContainer;
 class ICore;
 class IEditor;
@@ -142,7 +142,7 @@ private:
     typedef QList<FormWindowEditor *> EditorList;
 
     void setupActions();
-    Core::IActionContainer *createPreviewStyleMenu(Core::ActionManagerInterface *am,
+    Core::IActionContainer *createPreviewStyleMenu(Core::ActionManager *am,
                                                    QActionGroup *actionGroup);
 
     void critical(const QString &errorMessage);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 3ee96e97c7..a05c6a4ed3 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -36,7 +36,7 @@
 #include "fakevimconstants.h"
 #include "fakevimhandler.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
@@ -116,7 +116,7 @@ bool FakeVimPlugin::initialize(const QStringList &arguments, QString *error_mess
     m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
     QTC_ASSERT(m_core, return false);
 
-    Core::ActionManagerInterface *actionManager = m_core->actionManager();
+    Core::ActionManager *actionManager = m_core->actionManager();
     QTC_ASSERT(actionManager, return false);
 
     QList<int> globalcontext;
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 0bf2ec4fdb..a61e22df48 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -38,7 +38,7 @@
 #include "findtoolwindow.h"
 #include "searchresultwindow.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/iactioncontainer.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <coreplugin/coreconstants.h>
@@ -126,7 +126,7 @@ void FindPlugin::openFindFilter()
 
 void FindPlugin::setupMenu()
 {
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     Core::IActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT);
     Core::IActionContainer *mfind = am->createMenu(Constants::M_FIND);
     medit->addMenu(mfind, Core::Constants::G_EDIT_FIND);
@@ -149,7 +149,7 @@ void FindPlugin::setupMenu()
 
 void FindPlugin::setupFilterMenuItems()
 {
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     QList<IFindFilter*> findInterfaces =
         ExtensionSystem::PluginManager::instance()->getObjects<IFindFilter>();
     Core::ICommand *cmd;
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index edfb5015ba..359b4a4e9c 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -37,7 +37,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/findplaceholder.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/iactioncontainer.h>
 #include <coreplugin/actionmanager/icommand.h>
 
@@ -138,7 +138,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     QList<int> globalcontext;
     globalcontext << Core::Constants::C_GLOBAL_ID;
 
-    Core::ActionManagerInterface *am = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->actionManager();
+    Core::ActionManager *am = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->actionManager();
     Core::IActionContainer *mfind = am->actionContainer(Constants::M_FIND);
     Core::ICommand *cmd;
 
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 5ae6d0b7da..456c61eb35 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -38,7 +38,7 @@
 #include "gitplugin.h"
 #include "gitsubmiteditor.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 63e1f19d18..1592497601 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -47,7 +47,7 @@
 #include <coreplugin/filemanager.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/qtcassert.h>
@@ -213,7 +213,7 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = {
     Git::Constants::C_GITSUBMITEDITOR
 };
 
-static Core::ICommand *createSeparator(Core::ActionManagerInterface *am,
+static Core::ICommand *createSeparator(Core::ActionManager *am,
                                        const QList<int> &context,
                                        const QString &id,
                                        QObject *parent)
@@ -263,7 +263,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *error_message)
     addObject(m_versionControl);
 
     //register actions
-    Core::ActionManagerInterface *actionManager = m_core->actionManager();
+    Core::ActionManager *actionManager = m_core->actionManager();
 
     Core::IActionContainer *toolsContainer =
         actionManager->actionContainer(Core::Constants::M_TOOLS);
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index a8eb79c051..e4e93bd82b 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -91,7 +91,7 @@ bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *error_m
     connect(helloWorldAction, SIGNAL(triggered()), SLOT(sayHelloWorld()));
 
     // Register the action with the action manager
-    Core::ActionManagerInterface *actionManager = core->actionManager();
+    Core::ActionManager *actionManager = core->actionManager();
     Core::ICommand *command =
             actionManager->registerAction(
                     helloWorldAction, "HelloWorld.HelloWorldAction", context);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 3ed3263478..a5854d27e5 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -49,7 +49,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/rightpane.h>
@@ -165,7 +165,7 @@ bool HelpPlugin::initialize(const QStringList & /*arguments*/, QString *)
     connect(m_bookmarkWidget, SIGNAL(addBookmark()),
         this, SLOT(addBookmark()));
 
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     Core::ICommand *cmd;
 
     // Add Home, Previous and Next actions (used in the toolbar)
@@ -607,7 +607,7 @@ void HelpPlugin::activateSearch()
 QToolBar *HelpPlugin::createToolBar()
 {
     QToolBar *toolWidget = new QToolBar;
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
     toolWidget->addAction(am->command(QLatin1String("Help.Home"))->action());
     toolWidget->addAction(am->command(QLatin1String("Help.Previous"))->action());
     toolWidget->addAction(am->command(QLatin1String("Help.Next"))->action());
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index c616a019aa..ac916b4831 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -43,7 +43,7 @@
 #include "perforceversioncontrol.h"
 #include "settingspage.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/filemanager.h>
@@ -225,7 +225,7 @@ bool PerforcePlugin::initialize(const QStringList & /*arguments*/, QString *erro
 
 
     //register actions
-    Core::ActionManagerInterface *am = m_coreInstance->actionManager();
+    Core::ActionManager *am = m_coreInstance->actionManager();
 
     Core::IActionContainer *mtools =
         am->actionContainer(Core::Constants::M_TOOLS);
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 597a6daba6..af396124b5 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -35,7 +35,7 @@
 #include "projectexplorerconstants.h"
 #include "runconfiguration.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <find/basetextfind.h>
@@ -78,7 +78,7 @@ OutputPane::OutputPane(Core::ICore *core)
             this, SLOT(reRunRunControl()));
 
     // Stop
-    Core::ActionManagerInterface *am = core->actionManager();
+    Core::ActionManager *am = core->actionManager();
     QList<int> globalcontext;
     globalcontext.append(Core::Constants::C_GLOBAL_ID);
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 3548023d64..081b57b941 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -66,7 +66,7 @@
 #include <coreplugin/filemanager.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
@@ -155,7 +155,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList & /*arguments*/, QStrin
 {
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     m_core = pm->getObject<Core::ICore>();
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     addObject(this);
 
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 91fa1d31ba..b702bb98bd 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -34,7 +34,7 @@
 #include "taskwindow.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.cpp b/src/plugins/qhelpproject/qhelpprojectmanager.cpp
index 88870e675e..34d7cf7674 100644
--- a/src/plugins/qhelpproject/qhelpprojectmanager.cpp
+++ b/src/plugins/qhelpproject/qhelpprojectmanager.cpp
@@ -52,7 +52,7 @@ bool QHelpProjectManager::init(ExtensionSystem::PluginManager *pm, QString *erro
 {
     m_pm = pm;
     m_core = m_pm->interface<QWorkbench::ICore>();
-    QWorkbench::ActionManagerInterface *am = m_core->actionManager();
+    QWorkbench::ActionManager *am = m_core->actionManager();
 
     m_projectContext = m_core->uniqueIDManager()->
         uniqueIdentifier(QLatin1String("QHelpProject"));
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index debb89dae4..9e246cf109 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -52,7 +52,7 @@
 #include <projectexplorer/projectnodes.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/mimedatabase.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <texteditor/texteditoractionhandler.h>
 
 #include <QtCore/qplugin.h>
@@ -82,7 +82,7 @@ Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
     delete m_qt4ProjectManager;
 }
 /*
-static Core::ICommand *createSeparator(Core::ActionManagerInterface *am,
+static Core::ICommand *createSeparator(Core::ActionManager *am,
                                        QObject *parent,
                                        const QString &name,
                                        const QList<int> &context)
@@ -100,7 +100,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList & /*arguments*/, QStr
 
     m_projectExplorer = m_core->pluginManager()->getObject<ProjectExplorer::ProjectExplorerPlugin>();
 
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     //create and register objects
     m_qt4ProjectManager = new Qt4Manager(this, m_core);
diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp
index 39ba4f0d94..d471583a80 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditor.cpp
@@ -39,7 +39,7 @@
 #include <indenter.h>
 
 #include <coreplugin/icore.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/textblockiterator.h>
diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
index f51d8a8329..0ed9105c18 100644
--- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
@@ -35,7 +35,7 @@
 #include "qtscripteditorconstants.h"
 #include "qtscripteditor.h"
 
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/scriptmanager/scriptmanagerinterface.h>
 
 #include <QtGui/QAction>
diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
index d03692b9d6..2c14ccd713 100644
--- a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
@@ -42,7 +42,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/storagesettings.h>
 #include <texteditor/texteditorconstants.h>
@@ -131,7 +131,7 @@ void QtScriptEditorPlugin::initializeEditor(QtScriptEditor::Internal::ScriptEdit
 
 void QtScriptEditorPlugin::registerActions(Core::ICore *core)
 {
-    Core::ActionManagerInterface *am = core->actionManager();
+    Core::ActionManager *am = core->actionManager();
     Core::IActionContainer *mcontext = am->createMenu(QtScriptEditor::Constants::M_CONTEXT);
 
     QAction *action = new QAction(this);
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index 734f1488fd..d38502815d 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -49,7 +49,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/progressmanager/progressmanagerinterface.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <qtconcurrent/QtConcurrentTools>
 
 using namespace QuickOpen;
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 2d8c3370bf..382297d1a8 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -42,7 +42,7 @@
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/qtcassert.h>
@@ -88,7 +88,7 @@ bool ResourceEditorPlugin::initialize(const QStringList & /*arguments*/, QString
     error_message->clear();
 
     // Register undo and redo
-    Core::ActionManagerInterface * const actionManager = m_core->actionManager();
+    Core::ActionManager * const actionManager = m_core->actionManager();
     int const pluginId = m_core->uniqueIDManager()->uniqueIdentifier(
             Constants::C_RESOURCEEDITOR);
     QList<int> const idList = QList<int>() << pluginId;
diff --git a/src/plugins/snippets/snippetsplugin.cpp b/src/plugins/snippets/snippetsplugin.cpp
index d46e773b73..f0ad500ce6 100644
--- a/src/plugins/snippets/snippetsplugin.cpp
+++ b/src/plugins/snippets/snippetsplugin.cpp
@@ -72,7 +72,7 @@ void SnippetsPlugin::extensionsInitialized()
 bool SnippetsPlugin::initialize(const QStringList & /*arguments*/, QString *)
 {
     m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     QList<int> context;
     context << m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 9a5067f4dc..3f1f1ec0c5 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -53,7 +53,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/ProjectExplorerInterfaces>
 #include <utils/qtcassert.h>
@@ -289,7 +289,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments*/, QString *er
     addObject(m_subversionOutputWindow);
 
     //register actions
-    Core::ActionManagerInterface *ami = m_coreInstance->actionManager();
+    Core::ActionManager *ami = m_coreInstance->actionManager();
     Core::IActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
 
     Core::IActionContainer *subversionMenu =
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 12475d221b..b9209d33ab 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -40,7 +40,7 @@
 #include <quickopen/quickopenmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 
@@ -111,7 +111,7 @@ void TextEditorActionHandler::createActions()
     m_gotoAction      = registerNewAction(QLatin1String(Core::Constants::GOTO),      this, SLOT(gotoAction()));
     m_printAction     = registerNewAction(QLatin1String(Core::Constants::PRINT),     this, SLOT(printAction()));
 
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     Core::IActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT);
     Core::IActionContainer *advancedMenu = am->actionContainer(Core::Constants::M_EDIT_ADVANCED);
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 01a6ccdf95..948a6f6ca4 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -46,7 +46,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditoractionhandler.h>
@@ -120,7 +120,7 @@ bool TextEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
 
     int contextId = m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
     QList<int> context = QList<int>() << contextId;
-    Core::ActionManagerInterface *am = m_core->actionManager();
+    Core::ActionManager *am = m_core->actionManager();
 
     // Add shortcut for invoking automatic completion
     QShortcut *completionShortcut = new QShortcut(m_core->mainWindow());
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index a26f811e8d..2bb179a531 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -37,7 +37,7 @@
 #include <coreplugin/ifile.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 
 #include <utils/submiteditorwidget.h>
 #include <find/basetextfind.h>