Core: Cosmetics

* Remove redundant namespace qualifiers * Qt5-ify some signal/slot connections * Replace some using Core::Internal with explicit namespace scopes Change-Id: Id1aae05e2c6fc2992c2716e1f8f9e985c6e56122 Reviewed-by: hjk <hjk121@nokiamail.com>
author: Orgad Shaneh <orgad.shaneh@audiocodes.com> 2014-11-16 10:52:41 +0200
committer: hjk <hjk121@nokiamail.com> 2014-11-26 13:46:38 +0100
commit: 7f341580412847d325ffa4f7a82d27a763ff598f (patch)
tree: aa1f40058022372d26876d8ed6b7649425ab3f69
parent: 6804c2117915e84dd37a793ae5c99321acbdd85b (diff)
105 files changed, 389 insertions, 378 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 6cf8ba718e..ee22401fcf 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -44,8 +44,8 @@
 
 Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*)
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 /*!
     \class ActionContainer
@@ -565,3 +565,5 @@ bool MenuBarActionContainer::canBeAddedToMenu() const
     return false;
 }
 
+} // namespace Internal
+} // namespace Core
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
index 4434c0b65b..c463994b93 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
@@ -46,7 +46,7 @@ struct Group
     QList<QObject *> items; // Command * or ActionContainer *
 };
 
-class ActionContainerPrivate : public Core::ActionContainer
+class ActionContainerPrivate : public ActionContainer
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 274d14e0f6..58cba9840a 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -492,7 +492,7 @@ Action *ActionManagerPrivate::overridableAction(Id id)
 
 void ActionManagerPrivate::readUserSettings(Id id, Action *cmd)
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String(kKeyboardSettingsKey));
     if (settings->contains(id.toString()))
         cmd->setKeySequence(QKeySequence(settings->value(id.toString()).toString()));
@@ -511,7 +511,7 @@ void ActionManagerPrivate::initialize()
     // settings->contains(QLatin1String(kKeyboardSettingsKey) + QLatin1Char('/')
     //                    + QLatin1String(kKeyboardSettingsTransferredKey))
     // check if settings in old style (pre 3.1) exist
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     if (settings->contains(QLatin1String(kKeyboardSettingsKey) + QLatin1Char('/')
                            + QLatin1String(kKeyboardSettingsTransferredKey))) {
         return;
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
index 25671012c4..fbdbc787fc 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -58,8 +58,8 @@ class ActionManagerPrivate : public QObject
     Q_OBJECT
 
 public:
-    typedef QHash<Core::Id, Action *> IdCmdMap;
-    typedef QHash<Core::Id, ActionContainerPrivate *> IdContainerMap;
+    typedef QHash<Id, Action *> IdCmdMap;
+    typedef QHash<Id, ActionContainerPrivate *> IdContainerMap;
 
     explicit ActionManagerPrivate();
     ~ActionManagerPrivate();
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 1bbe0c6e92..a9dbb4154c 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -194,8 +194,8 @@
     interact with it.
 */
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 /*!
   \class Action
@@ -275,7 +275,7 @@ QString Action::description() const
     return id().toString();
 }
 
-void Action::setCurrentContext(const Core::Context &context)
+void Action::setCurrentContext(const Context &context)
 {
     m_context = context;
 
@@ -309,7 +309,7 @@ static QString msgActionWarning(QAction *newAction, Id id, QAction *oldAction)
     return msg;
 }
 
-void Action::addOverrideAction(QAction *action, const Core::Context &context, bool scriptable)
+void Action::addOverrideAction(QAction *action, const Context &context, bool scriptable)
 {
     if (Utils::HostOsInfo::isMacHost())
         action->setIconVisibleInMenu(false);
@@ -369,7 +369,7 @@ bool Action::isScriptable() const
     return m_scriptableMap.values().contains(true);
 }
 
-bool Action::isScriptable(const Core::Context &context) const
+bool Action::isScriptable(const Context &context) const
 {
     if (context == m_context && m_scriptableMap.contains(m_action->action()))
         return m_scriptableMap.value(m_action->action());
@@ -387,16 +387,16 @@ void Action::setAttribute(CommandAttribute attr)
 {
     m_attributes |= attr;
     switch (attr) {
-    case Core::Command::CA_Hide:
+    case Command::CA_Hide:
         m_action->setAttribute(Utils::ProxyAction::Hide);
         break;
-    case Core::Command::CA_UpdateText:
+    case Command::CA_UpdateText:
         m_action->setAttribute(Utils::ProxyAction::UpdateText);
         break;
-    case Core::Command::CA_UpdateIcon:
+    case Command::CA_UpdateIcon:
         m_action->setAttribute(Utils::ProxyAction::UpdateIcon);
         break;
-    case Core::Command::CA_NonConfigurable:
+    case Command::CA_NonConfigurable:
         break;
     }
 }
@@ -405,16 +405,16 @@ void Action::removeAttribute(CommandAttribute attr)
 {
     m_attributes &= ~attr;
     switch (attr) {
-    case Core::Command::CA_Hide:
+    case Command::CA_Hide:
         m_action->removeAttribute(Utils::ProxyAction::Hide);
         break;
-    case Core::Command::CA_UpdateText:
+    case Command::CA_UpdateText:
         m_action->removeAttribute(Utils::ProxyAction::UpdateText);
         break;
-    case Core::Command::CA_UpdateIcon:
+    case Command::CA_UpdateIcon:
         m_action->removeAttribute(Utils::ProxyAction::UpdateIcon);
         break;
-    case Core::Command::CA_NonConfigurable:
+    case Command::CA_NonConfigurable:
         break;
     }
 }
@@ -424,11 +424,12 @@ bool Action::hasAttribute(Command::CommandAttribute attr) const
     return (m_attributes & attr);
 }
 
+} // namespace Internal
 
 void Command::augmentActionWithShortcutToolTip(QAction *a) const
 {
     a->setToolTip(stringWithAppendedShortcut(a->text()));
-    QObject::connect(this, &Core::Command::keySequenceChanged, a, [this, a]() {
+    QObject::connect(this, &Command::keySequenceChanged, a, [this, a]() {
         a->setToolTip(stringWithAppendedShortcut(a->text()));
     });
     QObject::connect(a, &QAction::changed, this, [this, a]() {
@@ -444,3 +445,5 @@ QToolButton *Command::toolButtonWithAppendedShortcut(QAction *action, Command *c
         cmd->augmentActionWithShortcutToolTip(action);
     return button;
 }
+
+} // namespace Core
diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h
index 3e039f629a..a037099a60 100644
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -47,7 +47,7 @@
 namespace Core {
 namespace Internal {
 
-class Action : public Core::Command
+class Action : public Command
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.h b/src/plugins/coreplugin/actionmanager/commandbutton.h
index d2104cdf34..fd76e3ab3d 100644
--- a/src/plugins/coreplugin/actionmanager/commandbutton.h
+++ b/src/plugins/coreplugin/actionmanager/commandbutton.h
@@ -57,7 +57,7 @@ private slots:
     void updateToolTip();
 
 private:
-    QPointer<Core::Command> m_command;
+    QPointer<Command> m_command;
     QString m_toolTipBase;
 };
 
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h
index 2fc6e0bc9b..395c031d42 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.h
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.h
@@ -47,7 +47,7 @@ namespace Core {
 
 namespace Internal { class CommandMappingsPrivate; }
 
-class CORE_EXPORT CommandMappings : public Core::IOptionsPage
+class CORE_EXPORT CommandMappings : public IOptionsPage
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index cca9ce91e6..2d3afff6f6 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -141,7 +141,7 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items)
         w.writeStartDocument();
         w.writeDTD(QLatin1String("<!DOCTYPE KeyboardMappingScheme>"));
         w.writeComment(QString::fromLatin1(" Written by Qt Creator %1, %2. ").
-                       arg(QLatin1String(Core::Constants::IDE_VERSION_LONG),
+                       arg(QLatin1String(Constants::IDE_VERSION_LONG),
                            QDateTime::currentDateTime().toString(Qt::ISODate)));
         w.writeStartElement(ctx.mappingElement);
         foreach (const ShortcutItem *item, items) {
diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h
index 7dc8b5bcc0..ed24001200 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.h
+++ b/src/plugins/coreplugin/basefilewizardfactory.h
@@ -66,7 +66,7 @@ public:
     Q_DECLARE_FLAGS(DialogParameterFlags, DialogParameterEnum)
 
     explicit WizardDialogParameters(const QString &defaultPath, const WizardPageList &extensionPages,
-                                    const QString &platform, const Core::FeatureSet &requiredFeatures,
+                                    const QString &platform, const FeatureSet &requiredFeatures,
                                     DialogParameterFlags flags,
                                     QVariantMap extraValues)
         : m_defaultPath(defaultPath),
@@ -86,7 +86,7 @@ public:
     QString selectedPlatform() const
     { return m_selectedPlatform; }
 
-    Core::FeatureSet requiredFeatures() const
+    FeatureSet requiredFeatures() const
     { return m_requiredFeatures; }
 
     DialogParameterFlags flags() const
@@ -99,7 +99,7 @@ private:
     QString m_defaultPath;
     WizardPageList m_extensionPages;
     QString m_selectedPlatform;
-    Core::FeatureSet m_requiredFeatures;
+    FeatureSet m_requiredFeatures;
     DialogParameterFlags m_parameterFlags;
     QVariantMap m_extraValues;
 };
diff --git a/src/plugins/coreplugin/corejsextensions.cpp b/src/plugins/coreplugin/corejsextensions.cpp
index afe47ad23d..78269e5e49 100644
--- a/src/plugins/coreplugin/corejsextensions.cpp
+++ b/src/plugins/coreplugin/corejsextensions.cpp
@@ -90,7 +90,7 @@ QString UtilsJsExtension::absoluteFilePath(const QString &in) const
 
 QString UtilsJsExtension::preferredSuffix(const QString &mimetype) const
 {
-    return Core::MimeDatabase::preferredSuffixByType(mimetype);
+    return MimeDatabase::preferredSuffixByType(mimetype);
 }
 
 QString UtilsJsExtension::fileName(const QString &path, const QString &extension) const
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index 49f99650fa..c84e957ede 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -56,7 +56,7 @@ enum {
 
 namespace Internal {
 
-class DesignModeCoreListener : public Core::ICoreListener
+class DesignModeCoreListener : public ICoreListener
 {
 public:
     DesignModeCoreListener(DesignMode* mode);
@@ -93,7 +93,7 @@ public:
 
 public:
     Internal::DesignModeCoreListener *m_coreListener;
-    QPointer<Core::IEditor> m_currentEditor;
+    QPointer<IEditor> m_currentEditor;
     bool m_isActive;
     bool m_isRequired;
     QList<DesignEditorInfo*> m_editors;
@@ -124,11 +124,11 @@ DesignMode::DesignMode()
 
     ExtensionSystem::PluginManager::addObject(d->m_coreListener);
 
-    connect(EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
-            this, SLOT(currentEditorChanged(Core::IEditor*)));
+    connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
+            this, &DesignMode::currentEditorChanged);
 
-    connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
-            this, SLOT(updateContext(Core::IMode*,Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &DesignMode::updateContext);
 }
 
 DesignMode::~DesignMode()
@@ -195,7 +195,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget)
 }
 
 // if editor changes, check if we have valid mimetype registered.
-void DesignMode::currentEditorChanged(Core::IEditor *editor)
+void DesignMode::currentEditorChanged(IEditor *editor)
 {
     if (editor && (d->m_currentEditor.data() == editor))
         return;
@@ -226,7 +226,7 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
     if (!mimeEditorAvailable) {
         setActiveContext(Context());
         if (ModeManager::currentMode() == this)
-            ModeManager::activateMode(Core::Constants::MODE_EDIT);
+            ModeManager::activateMode(Constants::MODE_EDIT);
         setEnabled(false);
         d->m_currentEditor = 0;
         emit actionsUpdated(d->m_currentEditor.data());
@@ -245,7 +245,7 @@ void DesignMode::updateActions()
     emit actionsUpdated(d->m_currentEditor.data());
 }
 
-void DesignMode::updateContext(Core::IMode *newMode, Core::IMode *oldMode)
+void DesignMode::updateContext(IMode *newMode, IMode *oldMode)
 {
     if (newMode == this)
         ICore::addAdditionalContext(d->m_activeContext);
@@ -259,7 +259,7 @@ void DesignMode::setActiveContext(const Context &context)
         return;
 
     if (ModeManager::currentMode() == this)
-        Core::ICore::updateAdditionalContexts(d->m_activeContext, context);
+        ICore::updateAdditionalContexts(d->m_activeContext, context);
 
     d->m_activeContext = context;
 }
diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h
index c5cd79d6dc..c2a80d0c6e 100644
--- a/src/plugins/coreplugin/designmode.h
+++ b/src/plugins/coreplugin/designmode.h
@@ -47,7 +47,7 @@ namespace Internal { class DesignModeCoreListener; }
 
 class DesignModePrivate;
 
-class CORE_EXPORT DesignMode : public Core::IMode
+class CORE_EXPORT DesignMode : public IMode
 {
     Q_OBJECT
 
@@ -71,11 +71,11 @@ signals:
     void actionsUpdated(Core::IEditor *editor);
 
 private slots:
-    void currentEditorChanged(Core::IEditor *editor);
     void updateActions();
-    void updateContext(Core::IMode *newMode, Core::IMode *oldMode);
 
 private:
+    void currentEditorChanged(IEditor *editor);
+    void updateContext(IMode *newMode, IMode *oldMode);
     void setActiveContext(const Context &context);
 
     DesignModePrivate *d;
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 8978f293c1..b902a7da6f 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -90,7 +90,7 @@ class CORE_EXPORT IOptionsPageProvider : public QObject
 public:
     IOptionsPageProvider(QObject *parent = 0) : QObject(parent) {}
 
-    Core::Id category() const { return m_category; }
+    Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
 
@@ -98,11 +98,11 @@ public:
     virtual bool matches(const QString & /* searchKeyWord*/) const = 0;
 
 protected:
-    void setCategory(Core::Id category) { m_category = category; }
+    void setCategory(Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; }
 
-    Core::Id m_category;
+    Id m_category;
     QString m_displayCategory;
     QString m_categoryIcon;
 };
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
index 5b6673f87a..5b655a8e29 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
@@ -54,13 +54,12 @@ class SaveItemsDialog : public QDialog
     Q_OBJECT
 
 public:
-    SaveItemsDialog(QWidget *parent,
-        QList<Core::IDocument *> items);
+    SaveItemsDialog(QWidget *parent, QList<IDocument *> items);
 
     void setMessage(const QString &msg);
     void setAlwaysSaveMessage(const QString &msg);
     bool alwaysSaveChecked();
-    QList<Core::IDocument *> itemsToSave() const;
+    QList<IDocument *> itemsToSave() const;
 
 private slots:
     void collectItemsToSave();
@@ -71,7 +70,7 @@ private:
     void adjustButtonWidths();
 
     Ui::SaveItemsDialog m_ui;
-    QList<Core::IDocument*> m_itemsToSave;
+    QList<IDocument*> m_itemsToSave;
 };
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 22975a9f3e..0250f49d7f 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -293,9 +293,9 @@ bool optionsPageLessThan(const IOptionsPage *p1, const IOptionsPage *p2)
     return p1->id().alphabeticallyBefore(p2->id());
 }
 
-static inline QList<Core::IOptionsPage*> sortedOptionsPages()
+static inline QList<IOptionsPage*> sortedOptionsPages()
 {
-    QList<Core::IOptionsPage*> rc = ExtensionSystem::PluginManager::getObjects<IOptionsPage>();
+    QList<IOptionsPage*> rc = ExtensionSystem::PluginManager::getObjects<IOptionsPage>();
     qStableSort(rc.begin(), rc.end(), optionsPageLessThan);
     return rc;
 }
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 06239fc1a9..aca83b382d 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -49,19 +49,19 @@
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 ShortcutSettings::ShortcutSettings(QObject *parent)
     : CommandMappings(parent), m_initialized(false)
 {
     connect(ActionManager::instance(), SIGNAL(commandListChanged()), this, SLOT(initialize()));
 
-    setId(Core::Constants::SETTINGS_ID_SHORTCUTS);
+    setId(Constants::SETTINGS_ID_SHORTCUTS);
     setDisplayName(tr("Keyboard"));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
+    setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 QWidget *ShortcutSettings::widget()
@@ -411,3 +411,5 @@ void ShortcutSettings::markCollisions(ShortcutItem *item)
     item->m_item->setForeground(2, hasCollision ? Qt::red : commandList()->palette().foreground());
 }
 
+} // namespace Internal
+} // namespace Core
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 41a4eab9c3..9a84028732 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -56,7 +56,7 @@ struct ShortcutItem
 };
 
 
-class ShortcutSettings : public Core::CommandMappings
+class ShortcutSettings : public CommandMappings
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index dbf647afdc..e7ace44aed 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -1189,7 +1189,7 @@ void DocumentManager::saveSettings()
         recentEditorIds.append(file.second.toString());
     }
 
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     s->beginGroup(QLatin1String(settingsGroupC));
     s->setValue(QLatin1String(filesKeyC), recentFiles);
     s->setValue(QLatin1String(editorsKeyC), recentEditorIds);
@@ -1203,7 +1203,7 @@ void DocumentManager::saveSettings()
 
 void readSettings()
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     d->m_recentFiles.clear();
     s->beginGroup(QLatin1String(settingsGroupC));
     QStringList recentFiles = s->value(QLatin1String(filesKeyC)).toStringList();
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 0dbfb62e93..47189e370b 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -44,8 +44,8 @@
 #include <QWidget>
 #include <QIcon>
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 EditMode::EditMode() :
     m_splitter(new MiniSplitter),
@@ -73,7 +73,7 @@ EditMode::EditMode() :
     MiniSplitter *splitter = new MiniSplitter;
     splitter->setOrientation(Qt::Vertical);
     splitter->insertWidget(0, rightPaneSplitter);
-    QWidget *outputPane = new Core::OutputPanePlaceHolder(this, splitter);
+    QWidget *outputPane = new OutputPanePlaceHolder(this, splitter);
     outputPane->setObjectName(QLatin1String("EditModeOutputPanePlaceHolder"));
     splitter->insertWidget(1, outputPane);
     splitter->setStretchFactor(0, 3);
@@ -84,8 +84,8 @@ EditMode::EditMode() :
     m_splitter->setStretchFactor(0, 0);
     m_splitter->setStretchFactor(1, 1);
 
-    connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
-            this, SLOT(grabEditorManager(Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &EditMode::grabEditorManager);
     m_splitter->setFocusProxy(editorPlaceHolder);
 
     IContext *modeContextObject = new IContext(this);
@@ -103,7 +103,7 @@ EditMode::~EditMode()
     delete m_splitter;
 }
 
-void EditMode::grabEditorManager(Core::IMode *mode)
+void EditMode::grabEditorManager(IMode *mode)
 {
     if (mode != this)
         return;
@@ -111,3 +111,6 @@ void EditMode::grabEditorManager(Core::IMode *mode)
     if (EditorManager::currentEditor())
         EditorManager::currentEditor()->widget()->setFocus();
 }
+
+} // namespace Internal
+} // namespace Core
diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h
index 334da27a3e..df963d3aa1 100644
--- a/src/plugins/coreplugin/editmode.h
+++ b/src/plugins/coreplugin/editmode.h
@@ -44,7 +44,7 @@ class EditorManager;
 
 namespace Internal {
 
-class EditMode : public Core::IMode
+class EditMode : public IMode
 {
     Q_OBJECT
 
@@ -52,10 +52,9 @@ public:
     EditMode();
     ~EditMode();
 
-private slots:
-    void grabEditorManager(Core::IMode *mode);
-
 private:
+    void grabEditorManager(IMode *mode);
+
     QSplitter *m_splitter;
     QVBoxLayout *m_rightSplitWidgetLayout;
 };
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 1ff1d26552..013ce279e8 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -51,6 +51,7 @@
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icorelistener.h>
+#include <coreplugin/imode.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/mimedatabase.h>
@@ -127,14 +128,14 @@ using namespace Utils;
 
 //===================EditorManager=====================
 
-EditorManagerPlaceHolder::EditorManagerPlaceHolder(Core::IMode *mode, QWidget *parent)
+EditorManagerPlaceHolder::EditorManagerPlaceHolder(IMode *mode, QWidget *parent)
     : QWidget(parent), m_mode(mode)
 {
     setLayout(new QVBoxLayout);
     layout()->setMargin(0);
     setFocusProxy(EditorManagerPrivate::mainEditorArea());
-    connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
-            this, SLOT(currentModeChanged(Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &EditorManagerPlaceHolder::currentModeChanged);
 
     currentModeChanged(ModeManager::currentMode());
 }
@@ -149,7 +150,7 @@ EditorManagerPlaceHolder::~EditorManagerPlaceHolder()
     }
 }
 
-void EditorManagerPlaceHolder::currentModeChanged(Core::IMode *mode)
+void EditorManagerPlaceHolder::currentModeChanged(IMode *mode)
 {
     if (m_mode == mode) {
         QWidget *previousFocus = 0;
@@ -216,7 +217,7 @@ static void setFocusToEditorViewAndUnmaximizePanes(EditorView *view)
 /* For something that has a 'QString id' (IEditorFactory
  * or IExternalEditor), find the one matching a id. */
 template <class EditorFactoryLike>
-EditorFactoryLike *findById(Core::Id id)
+EditorFactoryLike *findById(Id id)
 {
     return ExtensionSystem::PluginManager::getObject<EditorFactoryLike>(
         [&id](EditorFactoryLike *efl) {
@@ -286,8 +287,8 @@ EditorManagerPrivate::~EditorManagerPrivate()
 void EditorManagerPrivate::init()
 {
     DocumentModel::init();
-    connect(ICore::instance(), SIGNAL(contextAboutToChange(QList<Core::IContext*>)),
-            this, SLOT(handleContextChange(QList<Core::IContext*>)));
+    connect(ICore::instance(), &ICore::contextAboutToChange,
+            this, &EditorManagerPrivate::handleContextChange);
 
     const Context editManagerContext(Constants::C_EDITORMANAGER);
     // combined context for edit & design modes
@@ -322,7 +323,7 @@ void EditorManagerPrivate::init()
     // Close Action
     cmd = ActionManager::registerAction(m_closeCurrentEditorAction, Constants::CLOSE, editManagerContext, true);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+W")));
-    cmd->setAttribute(Core::Command::CA_UpdateText);
+    cmd->setAttribute(Command::CA_UpdateText);
     cmd->setDescription(m_closeCurrentEditorAction->text());
     mfile->addAction(cmd, Constants::G_FILE_CLOSE);
     connect(m_closeCurrentEditorAction, SIGNAL(triggered()),
@@ -346,7 +347,7 @@ void EditorManagerPrivate::init()
     // Close All Others Action
     cmd = ActionManager::registerAction(m_closeOtherDocumentsAction, Constants::CLOSEOTHERS, editManagerContext, true);
     mfile->addAction(cmd, Constants::G_FILE_CLOSE);
-    cmd->setAttribute(Core::Command::CA_UpdateText);
+    cmd->setAttribute(Command::CA_UpdateText);
     connect(m_closeOtherDocumentsAction, SIGNAL(triggered()), m_instance, SLOT(closeOtherDocuments()));
 
     // Close All Others Except Visible Action
@@ -590,7 +591,7 @@ IEditor *EditorManagerPrivate::openEditorAt(EditorView *view, const QString &fil
     EditorManager::cutForwardNavigationHistory();
     EditorManager::addCurrentPositionToNavigationHistory();
     EditorManager::OpenEditorFlags tempFlags = flags | EditorManager::IgnoreNavigationHistory;
-    Core::IEditor *editor = openEditor(view, fileName, editorId, tempFlags, newEditor);
+    IEditor *editor = openEditor(view, fileName, editorId, tempFlags, newEditor);
     if (editor && line != -1)
         editor->gotoLine(line, column);
     return editor;
@@ -1010,14 +1011,14 @@ IEditor *EditorManagerPrivate::activateEditor(EditorView *view, IEditor *editor,
         if (!(flags & EditorManager::DoNotMakeVisible)) {
             // switch to design mode?
             if (!(flags & EditorManager::DoNotSwitchToDesignMode) && editor->isDesignModePreferred()) {
-                ModeManager::activateMode(Core::Constants::MODE_DESIGN);
+                ModeManager::activateMode(Constants::MODE_DESIGN);
                 ModeManager::setFocusToCurrentMode();
             } else {
                 int index;
                 findEditorArea(view, &index);
                 if (index == 0) // main window --> we might need to switch mode
                     if (!editor->widget()->isVisible())
-                        ModeManager::activateMode(Core::Constants::MODE_EDIT);
+                        ModeManager::activateMode(Constants::MODE_EDIT);
                 editor->widget()->setFocus();
                 ICore::raiseWindow(editor->widget());
             }
@@ -1758,14 +1759,14 @@ void EditorManagerPrivate::showInGraphicalShell()
 {
     if (!d->m_contextMenuEntry || d->m_contextMenuEntry->fileName().isEmpty())
         return;
-    Core::FileUtils::showInGraphicalShell(ICore::mainWindow(), d->m_contextMenuEntry->fileName());
+    FileUtils::showInGraphicalShell(ICore::mainWindow(), d->m_contextMenuEntry->fileName());
 }
 
 void EditorManagerPrivate::openTerminal()
 {
     if (!d->m_contextMenuEntry || d->m_contextMenuEntry->fileName().isEmpty())
         return;
-    Core::FileUtils::openTerminal(QFileInfo(d->m_contextMenuEntry->fileName()).path());
+    FileUtils::openTerminal(QFileInfo(d->m_contextMenuEntry->fileName()).path());
 }
 
 void EditorManagerPrivate::findInDirectory()
@@ -2006,7 +2007,7 @@ void EditorManager::revertToSaved()
     EditorManagerPrivate::revertToSaved(currentDocument());
 }
 
-void EditorManager::closeEditor(Core::IEditor *editor, bool askAboutModifiedEditors)
+void EditorManager::closeEditor(IEditor *editor, bool askAboutModifiedEditors)
 {
     if (!editor)
         return;
@@ -2175,7 +2176,7 @@ void EditorManager::activateEditorForEntry(DocumentModel::Entry *entry, OpenEdit
                                                  entry, flags);
 }
 
-void EditorManager::activateEditor(Core::IEditor *editor, OpenEditorFlags flags)
+void EditorManager::activateEditor(IEditor *editor, OpenEditorFlags flags)
 {
     QTC_ASSERT(editor, return);
     EditorView *view = EditorManagerPrivate::viewForEditor(editor);
@@ -2293,7 +2294,7 @@ bool EditorManager::isAutoSaveFile(const QString &fileName)
     return fileName.endsWith(QLatin1String(".autosave"));
 }
 
-bool EditorManager::openExternalEditor(const QString &fileName, Core::Id editorId)
+bool EditorManager::openExternalEditor(const QString &fileName, Id editorId)
 {
     IExternalEditor *ee = findById<IExternalEditor>(editorId);
     if (!ee)
@@ -2520,7 +2521,7 @@ bool EditorManager::restoreState(const QByteArray &state)
         stream >> fileName;
         QString displayName;
         stream >> displayName;
-        Core::Id id;
+        Id id;
         stream >> id;
 
         if (!fileName.isEmpty() && !displayName.isEmpty()) {
@@ -2571,7 +2572,7 @@ void EditorManager::hideEditorStatusBar(const QString &id)
 
 QTextCodec *EditorManager::defaultTextCodec()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     if (QTextCodec *candidate = QTextCodec::codecForName(
             settings->value(QLatin1String(Constants::SETTINGS_DEFAULTTEXTENCODING)).toByteArray()))
         return candidate;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index e4393c3dc9..62181052e8 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -81,12 +81,13 @@ class CORE_EXPORT EditorManagerPlaceHolder : public QWidget
 {
     Q_OBJECT
 public:
-    explicit EditorManagerPlaceHolder(Core::IMode *mode, QWidget *parent = 0);
+    explicit EditorManagerPlaceHolder(IMode *mode, QWidget *parent = 0);
     ~EditorManagerPlaceHolder();
-private slots:
-    void currentModeChanged(Core::IMode *);
+
 private:
-    Core::IMode *m_mode;
+    void currentModeChanged(IMode *);
+
+    IMode *m_mode;
 };
 
 class CORE_EXPORT EditorManager : public QObject
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 044d72cdfa..d54be3dd3e 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -551,7 +551,7 @@ void EditorView::goForwardInNavigationHistory()
 }
 
 
-SplitterOrView::SplitterOrView(Core::IEditor *editor)
+SplitterOrView::SplitterOrView(IEditor *editor)
 {
     m_layout = new QStackedLayout(this);
     m_layout->setSizeConstraint(QLayout::SetNoConstraint);
@@ -840,8 +840,8 @@ void SplitterOrView::restoreState(const QByteArray &state)
         if (!QFile::exists(fileName))
             return;
         IEditor *e = EditorManagerPrivate::openEditor(view(), fileName, Id::fromString(id),
-                                                      Core::EditorManager::IgnoreNavigationHistory
-                                                      | Core::EditorManager::DoNotChangeCurrentEditor);
+                                                      EditorManager::IgnoreNavigationHistory
+                                                      | EditorManager::DoNotChangeCurrentEditor);
 
         if (!e) {
             DocumentModel::Entry *entry = DocumentModel::firstRestoredEntry();
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 66700bd773..541ceff955 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -173,7 +173,7 @@ class SplitterOrView  : public QWidget
 {
     Q_OBJECT
 public:
-    explicit SplitterOrView(Core::IEditor *editor = 0);
+    explicit SplitterOrView(IEditor *editor = 0);
     explicit SplitterOrView(EditorView *view);
     ~SplitterOrView();
 
@@ -183,9 +183,9 @@ public:
     inline bool isView() const { return m_view != 0; }
     inline bool isSplitter() const { return m_splitter != 0; }
 
-    inline Core::IEditor *editor() const { return m_view ? m_view->currentEditor() : 0; }
-    inline QList<Core::IEditor *> editors() const { return m_view ? m_view->editors() : QList<Core::IEditor*>(); }
-    inline bool hasEditor(Core::IEditor *editor) const { return m_view && m_view->hasEditor(editor); }
+    inline IEditor *editor() const { return m_view ? m_view->currentEditor() : 0; }
+    inline QList<IEditor *> editors() const { return m_view ? m_view->editors() : QList<IEditor*>(); }
+    inline bool hasEditor(IEditor *editor) const { return m_view && m_view->hasEditor(editor); }
     inline bool hasEditors() const { return m_view && m_view->editorCount() != 0; }
     inline EditorView *view() const { return m_view; }
     inline QSplitter *splitter() const { return m_splitter; }
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 7642c222b9..33ee9c11f2 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -74,7 +74,7 @@ OpenEditorsWidget::~OpenEditorsWidget()
 {
 }
 
-void OpenEditorsWidget::updateCurrentItem(Core::IEditor *editor)
+void OpenEditorsWidget::updateCurrentItem(IEditor *editor)
 {
     IDocument *document = editor ? editor->document() : 0;
     QModelIndex index = m_model->index(DocumentModel::indexOfDocument(document), 0);
@@ -138,7 +138,7 @@ OpenEditorsViewFactory::OpenEditorsViewFactory()
 {
     setId("Open Documents");
     setDisplayName(OpenEditorsWidget::tr("Open Documents"));
-    setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+O") : tr("Alt+O")));
+    setActivationSequence(QKeySequence(UseMacShortcuts ? tr("Meta+O") : tr("Alt+O")));
     setPriority(200);
 }
 
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h
index 87b9ddaed4..a8d9e33e8b 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -77,26 +77,24 @@ public:
     OpenEditorsWidget();
     ~OpenEditorsWidget();
 
-private slots:
+private:
     void handleActivated(const QModelIndex &);
-    void updateCurrentItem(Core::IEditor*);
+    void updateCurrentItem(IEditor*);
     void contextMenuRequested(QPoint pos);
-
-private:
     void activateEditor(const QModelIndex &index);
     void closeDocument(const QModelIndex &index);
 
     ProxyModel *m_model;
 };
 
-class OpenEditorsViewFactory : public Core::INavigationWidgetFactory
+class OpenEditorsViewFactory : public INavigationWidgetFactory
 {
     Q_OBJECT
 
 public:
     OpenEditorsViewFactory();
 
-    Core::NavigationView createWidget();
+    NavigationView createWidget();
 };
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 350e9866ad..0a51d68a6d 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -198,7 +198,7 @@ void OpenEditorsWindow::selectEditor(QTreeWidgetItem *item)
         EditorManagerPrivate::activateEditorForDocument(view, document);
     } else {
         if (!EditorManager::openEditor(
-                    item->toolTip(0), item->data(0, Qt::UserRole+2).value<Core::Id>())) {
+                    item->toolTip(0), item->data(0, Qt::UserRole+2).value<Id>())) {
             DocumentModel::removeDocument(item->toolTip(0));
             delete item;
         }
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index e7cb729d8c..b18376abc1 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -304,8 +304,8 @@ void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags)
 {
     d->m_isStandalone = flags & FlagsStandalone;
     if (d->m_isStandalone) {
-        EditorManager *em = EditorManager::instance();
-        connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(updateEditorListSelection(Core::IEditor*)));
+        connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
+                this, &EditorToolBar::updateEditorListSelection);
 
         disconnect(d->m_editorList, SIGNAL(activated(int)), this, SIGNAL(listSelectionActivated(int)));
         connect(d->m_editorList, SIGNAL(activated(int)), this, SLOT(changeActiveEditor(int)));
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index ae0f121a2a..018f53e5a4 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -90,9 +90,6 @@ public:
     void setCloseSplitEnabled(bool enable);
     void setCloseSplitIcon(const QIcon &icon);
 
-public slots:
-    void updateDocumentStatus(Core::IDocument *document);
-
 signals:
     void closeClicked();
     void goBackClicked();
@@ -108,7 +105,6 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event);
 
 private slots:
-    void updateEditorListSelection(Core::IEditor *newSelection);
     void changeActiveEditor(int row);
     void makeEditorWritable();
 
@@ -117,6 +113,8 @@ private slots:
     void updateActionShortcuts();
 
 private:
+    void updateDocumentStatus(IDocument *document);
+    void updateEditorListSelection(IEditor *newSelection);
     void fillListContextMenu(QMenu *menu);
     void updateToolBar(QWidget *toolBar);
 
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 63acf809d0..c3fe3ae4bd 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -702,7 +702,7 @@ ExternalToolManager::ExternalToolManager()
 
     d->m_configureSeparator = new QAction(this);
     d->m_configureSeparator->setSeparator(true);
-    d->m_configureAction = new QAction(Core::ICore::msgShowOptionsDialog(), this);
+    d->m_configureAction = new QAction(ICore::msgShowOptionsDialog(), this);
     connect(d->m_configureAction, SIGNAL(triggered()), this, SLOT(openPreferences()));
 
     // add the external tools menu
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index a411ef7d97..3298f5bbae 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -184,7 +184,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
-    QRect iconRect(0, 0, Core::Constants::TARGET_ICON_SIZE, Core::Constants::TARGET_ICON_SIZE);
+    QRect iconRect(0, 0, Constants::TARGET_ICON_SIZE, Constants::TARGET_ICON_SIZE);
     // draw popup texts
     if (isTitledAction) {
 
diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h
index af89ffdea4..e41ef6206c 100644
--- a/src/plugins/coreplugin/featureprovider.h
+++ b/src/plugins/coreplugin/featureprovider.h
@@ -64,7 +64,7 @@ class CORE_EXPORT FeatureSet : private QSet<Feature>
 public:
     FeatureSet() {}
 
-    FeatureSet(Core::Id id)
+    FeatureSet(Id id)
     {
         if (id.isValid())
             insert(id);
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index ef3c5afc07..2a0d0a7d7b 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -204,7 +204,7 @@ bool FileUtils::renameFile(const QString &orgFilePath, const QString &newFilePat
         result = fileSystemRenameFile(orgFilePath, newFilePath);
     if (result) {
         // yeah we moved, tell the filemanager about it
-        Core::DocumentManager::renamedFile(orgFilePath, newFilePath);
+        DocumentManager::renamedFile(orgFilePath, newFilePath);
     }
     return result;
 }
diff --git a/src/plugins/coreplugin/find/basetextfind.h b/src/plugins/coreplugin/find/basetextfind.h
index f20eb5513f..91ca1aa2f3 100644
--- a/src/plugins/coreplugin/find/basetextfind.h
+++ b/src/plugins/coreplugin/find/basetextfind.h
@@ -67,7 +67,7 @@ public:
     void defineFindScope();
     void clearFindScope();
 
-    void highlightAll(const QString &txt, Core::FindFlags findFlags);
+    void highlightAll(const QString &txt, FindFlags findFlags);
 
 signals:
     void highlightAllRequested(const QString &txt, Core::FindFlags findFlags);
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index f5c9937425..0c74059560 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -193,25 +193,25 @@ void FindPlugin::openFindDialog(IFindFilter *filter)
 
 void FindPlugin::setupMenu()
 {
-    Core::ActionContainer *medit = Core::ActionManager::actionContainer(Core::Constants::M_EDIT);
-    Core::ActionContainer *mfind = Core::ActionManager::createMenu(Constants::M_FIND);
-    medit->addMenu(mfind, Core::Constants::G_EDIT_FIND);
+    ActionContainer *medit = ActionManager::actionContainer(Constants::M_EDIT);
+    ActionContainer *mfind = ActionManager::createMenu(Constants::M_FIND);
+    medit->addMenu(mfind, Constants::G_EDIT_FIND);
     mfind->menu()->setTitle(tr("&Find/Replace"));
     mfind->appendGroup(Constants::G_FIND_CURRENTDOCUMENT);
     mfind->appendGroup(Constants::G_FIND_FILTERS);
     mfind->appendGroup(Constants::G_FIND_FLAGS);
     mfind->appendGroup(Constants::G_FIND_ACTIONS);
-    Core::Context globalcontext(Core::Constants::C_GLOBAL);
-    Core::Command *cmd;
+    Context globalcontext(Constants::C_GLOBAL);
+    Command *cmd;
     mfind->addSeparator(globalcontext, Constants::G_FIND_FLAGS);
     mfind->addSeparator(globalcontext, Constants::G_FIND_ACTIONS);
 
-    Core::ActionContainer *mfindadvanced = Core::ActionManager::createMenu(Constants::M_FIND_ADVANCED);
+    ActionContainer *mfindadvanced = ActionManager::createMenu(Constants::M_FIND_ADVANCED);
     mfindadvanced->menu()->setTitle(tr("Advanced Find"));
     mfind->addMenu(mfindadvanced, Constants::G_FIND_FILTERS);
     d->m_openFindDialog = new QAction(tr("Open Advanced Find..."), this);
     d->m_openFindDialog->setIconText(tr("Advanced..."));
-    cmd = Core::ActionManager::registerAction(d->m_openFindDialog, Constants::ADVANCED_FIND, globalcontext);
+    cmd = ActionManager::registerAction(d->m_openFindDialog, Constants::ADVANCED_FIND, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F")));
     mfindadvanced->addAction(cmd);
     connect(d->m_openFindDialog, SIGNAL(triggered()), this, SLOT(openFindFilter()));
@@ -221,13 +221,13 @@ void FindPlugin::setupFilterMenuItems()
 {
     QList<IFindFilter*> findInterfaces =
         ExtensionSystem::PluginManager::getObjects<IFindFilter>();
-    Core::Command *cmd;
-    Core::Context globalcontext(Core::Constants::C_GLOBAL);
+    Command *cmd;
+    Context globalcontext(Constants::C_GLOBAL);
 
-    Core::ActionContainer *mfindadvanced = Core::ActionManager::actionContainer(Constants::M_FIND_ADVANCED);
+    ActionContainer *mfindadvanced = ActionManager::actionContainer(Constants::M_FIND_ADVANCED);
     d->m_filterActions.clear();
     bool haveEnabledFilters = false;
-    const Core::Id base("FindFilter.");
+    const Id base("FindFilter.");
     foreach (IFindFilter *filter, findInterfaces) {
         QAction *action = new QAction(QLatin1String("    ") + filter->displayName(), this);
         bool isEnabled = filter->isEnabled();
@@ -235,7 +235,7 @@ void FindPlugin::setupFilterMenuItems()
             haveEnabledFilters = true;
         action->setEnabled(isEnabled);
         action->setData(qVariantFromValue(filter));
-        cmd = Core::ActionManager::registerAction(action,
+        cmd = ActionManager::registerAction(action,
             base.withSuffix(filter->id()), globalcontext);
         cmd->setDefaultKeySequence(filter->defaultShortcut());
         mfindadvanced->addAction(cmd);
@@ -297,7 +297,7 @@ bool FindPlugin::hasFindFlag(FindFlag flag)
 
 void FindPlugin::writeSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     settings->setValue(QLatin1String("Backward"), hasFindFlag(FindBackward));
     settings->setValue(QLatin1String("CaseSensitively"), hasFindFlag(FindCaseSensitively));
@@ -314,7 +314,7 @@ void FindPlugin::writeSettings()
 
 void FindPlugin::readSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     bool block = blockSignals(true);
     setBackward(settings->value(QLatin1String("Backward"), false).toBool());
diff --git a/src/plugins/coreplugin/find/findplugin.h b/src/plugins/coreplugin/find/findplugin.h
index 1900966bd5..a711959ea2 100644
--- a/src/plugins/coreplugin/find/findplugin.h
+++ b/src/plugins/coreplugin/find/findplugin.h
@@ -64,8 +64,8 @@ public:
         FindBackwardDirection
     };
 
-    Core::FindFlags findFlags() const;
-    bool hasFindFlag(Core::FindFlag flag);
+    FindFlags findFlags() const;
+    bool hasFindFlag(FindFlag flag);
     void updateFindCompletion(const QString &text);
     void updateReplaceCompletion(const QString &text);
     QStringListModel *findCompletionModel() const;
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 4487bf3c8a..fca380c871 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -62,8 +62,8 @@ Q_DECLARE_METATYPE(Core::IFindFilter*)
 static const int MINIMUM_WIDTH_FOR_COMPLEX_LAYOUT = 150;
 static const int FINDBUTTON_SPACER_WIDTH = 20;
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumentFind)
     : m_plugin(plugin),
@@ -143,21 +143,21 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     QMetaTypeId<QStringList>::qt_metatype_id();
 
     // register actions
-    Core::Context globalcontext(Core::Constants::C_GLOBAL);
-    Core::Context findcontext(Constants::C_FINDTOOLBAR);
-    Core::ActionContainer *mfind = Core::ActionManager::actionContainer(Constants::M_FIND);
-    Core::Command *cmd;
+    Context globalcontext(Constants::C_GLOBAL);
+    Context findcontext(Constants::C_FINDTOOLBAR);
+    ActionContainer *mfind = ActionManager::actionContainer(Constants::M_FIND);
+    Command *cmd;
 
-    m_ui.advancedButton->setDefaultAction(Core::ActionManager::command(Constants::ADVANCED_FIND)->action());
+    m_ui.advancedButton->setDefaultAction(ActionManager::command(Constants::ADVANCED_FIND)->action());
 
     m_goToCurrentFindAction = new QAction(this);
-    Core::ActionManager::registerAction(m_goToCurrentFindAction, Constants::S_RETURNTOEDITOR,
+    ActionManager::registerAction(m_goToCurrentFindAction, Constants::S_RETURNTOEDITOR,
                                         findcontext);
     connect(m_goToCurrentFindAction, SIGNAL(triggered()), this, SLOT(setFocusToCurrentFindSupport()));
 
     QIcon icon = QIcon::fromTheme(QLatin1String("edit-find-replace"));
     m_findInDocumentAction = new QAction(icon, tr("Find/Replace"), this);
-    cmd = Core::ActionManager::registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
+    cmd = ActionManager::registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence::Find);
     mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT);
     connect(m_findInDocumentAction, SIGNAL(triggered()), this, SLOT(openFind()));
@@ -172,7 +172,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
 
     if (QApplication::clipboard()->supportsFindBuffer()) {
         m_enterFindStringAction = new QAction(tr("Enter Find String"), this);
-        cmd = Core::ActionManager::registerAction(m_enterFindStringAction, "Find.EnterFindString", globalcontext);
+        cmd = ActionManager::registerAction(m_enterFindStringAction, "Find.EnterFindString", globalcontext);
         cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E")));
         mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
         connect(m_enterFindStringAction, SIGNAL(triggered()), this, SLOT(putSelectionToFindClipboard()));
@@ -180,7 +180,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     }
 
     m_findNextAction = new QAction(tr("Find Next"), this);
-    cmd = Core::ActionManager::registerAction(m_findNextAction, Constants::FIND_NEXT, globalcontext);
+    cmd = ActionManager::registerAction(m_findNextAction, Constants::FIND_NEXT, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence::FindNext);
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_findNextAction, SIGNAL(triggered()), this, SLOT(invokeGlobalFindNext()));
@@ -191,7 +191,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_ui.findNextButton->setDefaultAction(m_localFindNextAction);
 
     m_findPreviousAction = new QAction(tr("Find Previous"), this);
-    cmd = Core::ActionManager::registerAction(m_findPreviousAction, Constants::FIND_PREVIOUS, globalcontext);
+    cmd = ActionManager::registerAction(m_findPreviousAction, Constants::FIND_PREVIOUS, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence::FindPrevious);
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_findPreviousAction, SIGNAL(triggered()), this, SLOT(invokeGlobalFindPrevious()));
@@ -202,19 +202,19 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_ui.findPreviousButton->setDefaultAction(m_localFindPreviousAction);
 
     m_findNextSelectedAction = new QAction(tr("Find Next (Selected)"), this);
-    cmd = Core::ActionManager::registerAction(m_findNextSelectedAction, Constants::FIND_NEXT_SELECTED, globalcontext);
+    cmd = ActionManager::registerAction(m_findNextSelectedAction, Constants::FIND_NEXT_SELECTED, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F3")));
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_findNextSelectedAction, SIGNAL(triggered()), this, SLOT(findNextSelected()));
 
     m_findPreviousSelectedAction = new QAction(tr("Find Previous (Selected)"), this);
-    cmd = Core::ActionManager::registerAction(m_findPreviousSelectedAction, Constants::FIND_PREV_SELECTED, globalcontext);
+    cmd = ActionManager::registerAction(m_findPreviousSelectedAction, Constants::FIND_PREV_SELECTED, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F3")));
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_findPreviousSelectedAction, SIGNAL(triggered()), this, SLOT(findPreviousSelected()));
 
     m_replaceAction = new QAction(tr("Replace"), this);
-    cmd = Core::ActionManager::registerAction(m_replaceAction, Constants::REPLACE, globalcontext);
+    cmd = ActionManager::registerAction(m_replaceAction, Constants::REPLACE, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence());
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_replaceAction, SIGNAL(triggered()), this, SLOT(invokeGlobalReplace()));
@@ -225,7 +225,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_ui.replaceButton->setDefaultAction(m_localReplaceAction);
 
     m_replaceNextAction = new QAction(tr("Replace && Find"), this);
-    cmd = Core::ActionManager::registerAction(m_replaceNextAction, Constants::REPLACE_NEXT, globalcontext);
+    cmd = ActionManager::registerAction(m_replaceNextAction, Constants::REPLACE_NEXT, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+=")));
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_replaceNextAction, SIGNAL(triggered()), this, SLOT(invokeGlobalReplaceNext()));
@@ -237,7 +237,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_ui.replaceNextButton->setDefaultAction(m_localReplaceNextAction);
 
     m_replacePreviousAction = new QAction(tr("Replace && Find Previous"), this);
-    cmd = Core::ActionManager::registerAction(m_replacePreviousAction, Constants::REPLACE_PREVIOUS, globalcontext);
+    cmd = ActionManager::registerAction(m_replacePreviousAction, Constants::REPLACE_PREVIOUS, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_replacePreviousAction, SIGNAL(triggered()), this, SLOT(invokeGlobalReplacePrevious()));
     m_localReplacePreviousAction = new QAction(m_replacePreviousAction->text(), this);
@@ -246,7 +246,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     connect(m_localReplacePreviousAction, &QAction::triggered, this, &FindToolBar::invokeReplacePrevious);
 
     m_replaceAllAction = new QAction(tr("Replace All"), this);
-    cmd = Core::ActionManager::registerAction(m_replaceAllAction, Constants::REPLACE_ALL, globalcontext);
+    cmd = ActionManager::registerAction(m_replaceAllAction, Constants::REPLACE_ALL, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
     connect(m_replaceAllAction, SIGNAL(triggered()), this, SLOT(invokeGlobalReplaceAll()));
     m_localReplaceAllAction = new QAction(m_replaceAllAction->text(), this);
@@ -259,7 +259,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_caseSensitiveAction->setIcon(QIcon(QLatin1String(":/find/images/casesensitively.png")));
     m_caseSensitiveAction->setCheckable(true);
     m_caseSensitiveAction->setChecked(false);
-    cmd = Core::ActionManager::registerAction(m_caseSensitiveAction, Constants::CASE_SENSITIVE, globalcontext);
+    cmd = ActionManager::registerAction(m_caseSensitiveAction, Constants::CASE_SENSITIVE, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_FLAGS);
     connect(m_caseSensitiveAction, SIGNAL(toggled(bool)), this, SLOT(setCaseSensitive(bool)));
 
@@ -267,7 +267,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_wholeWordAction->setIcon(QIcon(QLatin1String(":/find/images/wholewords.png")));
     m_wholeWordAction->setCheckable(true);
     m_wholeWordAction->setChecked(false);
-    cmd = Core::ActionManager::registerAction(m_wholeWordAction, Constants::WHOLE_WORDS, globalcontext);
+    cmd = ActionManager::registerAction(m_wholeWordAction, Constants::WHOLE_WORDS, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_FLAGS);
     connect(m_wholeWordAction, SIGNAL(toggled(bool)), this, SLOT(setWholeWord(bool)));
 
@@ -275,7 +275,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_regularExpressionAction->setIcon(QIcon(QLatin1String(":/find/images/regexp.png")));
     m_regularExpressionAction->setCheckable(true);
     m_regularExpressionAction->setChecked(false);
-    cmd = Core::ActionManager::registerAction(m_regularExpressionAction, Constants::REGULAR_EXPRESSIONS, globalcontext);
+    cmd = ActionManager::registerAction(m_regularExpressionAction, Constants::REGULAR_EXPRESSIONS, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_FLAGS);
     connect(m_regularExpressionAction, SIGNAL(toggled(bool)), this, SLOT(setRegularExpressions(bool)));
 
@@ -283,7 +283,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_preserveCaseAction->setIcon(QPixmap(QLatin1String(":/find/images/preservecase.png")));
     m_preserveCaseAction->setCheckable(true);
     m_preserveCaseAction->setChecked(false);
-    cmd = Core::ActionManager::registerAction(m_preserveCaseAction, Constants::PRESERVE_CASE, globalcontext);
+    cmd = ActionManager::registerAction(m_preserveCaseAction, Constants::PRESERVE_CASE, globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_FLAGS);
     connect(m_preserveCaseAction, SIGNAL(toggled(bool)), this, SLOT(setPreserveCase(bool)));
 
@@ -363,7 +363,7 @@ bool FindToolBar::eventFilter(QObject *obj, QEvent *event)
 void FindToolBar::adaptToCandidate()
 {
     updateGlobalActions();
-    if (findToolBarPlaceHolder() == Core::FindToolBarPlaceHolder::getCurrent()) {
+    if (findToolBarPlaceHolder() == FindToolBarPlaceHolder::getCurrent()) {
         m_currentDocumentFind->acceptCandidate();
         if (isVisible())
             m_currentDocumentFind->highlightAll(getFindText(), effectiveFindFlags());
@@ -647,7 +647,7 @@ void FindToolBar::updateIcons()
     bool preserveCase = effectiveFlags & FindPreserveCase;
     if (!casesensitive && !wholewords && !regexp && !preserveCase) {
         m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left,
-                                       Utils::StyleHelper::dpiSpecificImageFile(QLatin1Literal(Core::Constants::ICON_MAGNIFIER)));
+                                       Utils::StyleHelper::dpiSpecificImageFile(QLatin1Literal(Constants::ICON_MAGNIFIER)));
     } else {
         m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left,
                                        IFindFilter::pixmapForFindFlags(effectiveFlags));
@@ -706,12 +706,12 @@ void FindToolBar::hideAndResetFocus()
     hide();
 }
 
-Core::FindToolBarPlaceHolder *FindToolBar::findToolBarPlaceHolder() const
+FindToolBarPlaceHolder *FindToolBar::findToolBarPlaceHolder() const
 {
-    QList<Core::FindToolBarPlaceHolder*> placeholders = ExtensionSystem::PluginManager::getObjects<Core::FindToolBarPlaceHolder>();
+    QList<FindToolBarPlaceHolder*> placeholders = ExtensionSystem::PluginManager::getObjects<FindToolBarPlaceHolder>();
     QWidget *candidate = QApplication::focusWidget();
     while (candidate) {
-        foreach (Core::FindToolBarPlaceHolder *ph, placeholders) {
+        foreach (FindToolBarPlaceHolder *ph, placeholders) {
             if (ph->owner() == candidate)
                 return ph;
         }
@@ -778,15 +778,15 @@ void FindToolBar::openFind(bool focus)
 void FindToolBar::openFindToolBar(OpenFlags flags)
 {
     installEventFilters();
-    Core::FindToolBarPlaceHolder *holder = findToolBarPlaceHolder();
+    FindToolBarPlaceHolder *holder = findToolBarPlaceHolder();
     if (!holder)
         return;
-    Core::FindToolBarPlaceHolder *previousHolder = Core::FindToolBarPlaceHolder::getCurrent();
+    FindToolBarPlaceHolder *previousHolder = FindToolBarPlaceHolder::getCurrent();
     if (previousHolder != holder) {
         if (previousHolder)
             previousHolder->setWidget(0);
         holder->setWidget(this);
-        Core::FindToolBarPlaceHolder::setCurrent(holder);
+        FindToolBarPlaceHolder::setCurrent(holder);
     }
     m_currentDocumentFind->acceptCandidate();
     holder->setVisible(true);
@@ -846,7 +846,7 @@ void FindToolBar::resizeEvent(QResizeEvent *event)
 
 void FindToolBar::writeSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     settings->beginGroup(QLatin1String("FindToolBar"));
     settings->setValue(QLatin1String("Backward"), QVariant((m_findFlags & FindBackward) != 0));
@@ -860,7 +860,7 @@ void FindToolBar::writeSettings()
 
 void FindToolBar::readSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     settings->beginGroup(QLatin1String("FindToolBar"));
     FindFlags flags;
@@ -930,8 +930,8 @@ void FindToolBar::setBackward(bool backward)
 
 void FindToolBar::setLightColoredIcon(bool lightColored)
 {
-    m_ui.close->setIcon(lightColored ? QIcon(QLatin1String(Core::Constants::ICON_DARK_CLOSE))
-                                     : QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)));
+    m_ui.close->setIcon(lightColored ? QIcon(QLatin1String(Constants::ICON_DARK_CLOSE))
+                                     : QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
 }
 
 OptionsPopup::OptionsPopup(QWidget *parent)
@@ -999,3 +999,6 @@ QCheckBox *OptionsPopup::createCheckboxForCommand(Id id)
     m_checkboxMap.insert(action, checkbox);
     return checkbox;
 }
+
+} // namespace Internal
+} // namespace Core
diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h
index b01212a5fc..4fc45ba90a 100644
--- a/src/plugins/coreplugin/find/findtoolbar.h
+++ b/src/plugins/coreplugin/find/findtoolbar.h
@@ -148,7 +148,7 @@ private:
     void setFindFlag(FindFlag flag, bool enabled);
     bool hasFindFlag(FindFlag flag);
     FindFlags effectiveFindFlags();
-    Core::FindToolBarPlaceHolder *findToolBarPlaceHolder() const;
+    FindToolBarPlaceHolder *findToolBarPlaceHolder() const;
     bool toolBarHasFocus() const;
     bool canShowAllControls(bool replaceIsVisible) const;
     void acceptCandidateAndMoveToolBar();
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index 6d0415f8af..fc3b682476 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -244,7 +244,7 @@ void FindToolWindow::replace()
 
 void FindToolWindow::writeSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     settings->setValue(QLatin1String("CurrentFilter"), m_currentFilter ?  m_currentFilter->id() : QString());
     foreach (IFindFilter *filter, m_filters)
@@ -254,7 +254,7 @@ void FindToolWindow::writeSettings()
 
 void FindToolWindow::readSettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QSettings *settings = ICore::settings();
     settings->beginGroup(QLatin1String("Find"));
     const QString currentFilter = settings->value(QLatin1String("CurrentFilter")).toString();
     for (int i = 0; i < m_filters.size(); ++i) {
diff --git a/src/plugins/coreplugin/find/itemviewfind.cpp b/src/plugins/coreplugin/find/itemviewfind.cpp
index 03bdfd406b..309012c085 100644
--- a/src/plugins/coreplugin/find/itemviewfind.cpp
+++ b/src/plugins/coreplugin/find/itemviewfind.cpp
@@ -141,7 +141,7 @@ QFrame *ItemViewFind::createSearchableWrapper(QAbstractItemView *treeView, Color
     vbox->setMargin(0);
     vbox->setSpacing(0);
     vbox->addWidget(treeView);
-    auto placeHolder = new Core::FindToolBarPlaceHolder(widget);
+    auto placeHolder = new FindToolBarPlaceHolder(widget);
     placeHolder->setLightColored(lightColored);
     vbox->addWidget(placeHolder);
 
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index 4da40807c3..b7adf10b51 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -205,7 +205,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
 
 SearchResultWidget::~SearchResultWidget()
 {
-    if (m_infoBar.containsInfo(Core::Id(SIZE_WARNING_ID)))
+    if (m_infoBar.containsInfo(Id(SIZE_WARNING_ID)))
         cancelAfterSizeWarning();
 }
 
@@ -240,10 +240,10 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
     updateMatchesFoundLabel();
     if (firstItems) {
         if (!m_dontAskAgainGroup.isEmpty()) {
-            Core::Id undoWarningId = Core::Id("warninglabel/").withSuffix(m_dontAskAgainGroup);
+            Id undoWarningId = Id("warninglabel/").withSuffix(m_dontAskAgainGroup);
             if (m_infoBar.canInfoBeAdded(undoWarningId)) {
-                Core::InfoBarEntry info(undoWarningId, tr("This change cannot be undone."),
-                                        Core::InfoBarEntry::GlobalSuppressionEnabled);
+                InfoBarEntry info(undoWarningId, tr("This change cannot be undone."),
+                                  InfoBarEntry::GlobalSuppressionEnabled);
                 m_infoBar.addInfo(info);
             }
         }
@@ -261,13 +261,13 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
     } else if (m_count <= SEARCHRESULT_WARNING_LIMIT) {
         return;
     } else {
-        Core::Id sizeWarningId(SIZE_WARNING_ID);
+        Id sizeWarningId(SIZE_WARNING_ID);
         if (!m_infoBar.canInfoBeAdded(sizeWarningId))
             return;
         emit paused(true);
-        Core::InfoBarEntry info(sizeWarningId,
-                                tr("The search resulted in more than %n items, do you still want to continue?",
-                                0, SEARCHRESULT_WARNING_LIMIT));
+        InfoBarEntry info(sizeWarningId,
+                          tr("The search resulted in more than %n items, do you still want to continue?",
+                             0, SEARCHRESULT_WARNING_LIMIT));
         info.setCancelButtonInfo(tr("Cancel"), [this]() { cancelAfterSizeWarning(); });
         info.setCustomButtonInfo(tr("Continue"), [this]() { continueAfterSizeWarning(); });
         m_infoBar.addInfo(info);
@@ -402,7 +402,7 @@ void SearchResultWidget::restart()
     m_replaceButton->setEnabled(false);
     m_searchResultTreeView->clear();
     m_count = 0;
-    Core::Id sizeWarningId(SIZE_WARNING_ID);
+    Id sizeWarningId(SIZE_WARNING_ID);
     m_infoBar.removeInfo(sizeWarningId);
     m_infoBar.enableInfo(sizeWarningId);
     m_cancelButton->setVisible(true);
@@ -425,7 +425,7 @@ void SearchResultWidget::setSearchAgainEnabled(bool enabled)
 
 void SearchResultWidget::finishSearch(bool canceled)
 {
-    Core::Id sizeWarningId(SIZE_WARNING_ID);
+    Id sizeWarningId(SIZE_WARNING_ID);
     m_infoBar.removeInfo(sizeWarningId);
     m_infoBar.enableInfo(sizeWarningId);
     m_replaceTextEdit->setEnabled(m_count > 0);
@@ -443,13 +443,13 @@ void SearchResultWidget::sendRequestPopup()
 
 void SearchResultWidget::continueAfterSizeWarning()
 {
-    m_infoBar.suppressInfo(Core::Id(SIZE_WARNING_ID));
+    m_infoBar.suppressInfo(Id(SIZE_WARNING_ID));
     emit paused(false);
 }
 
 void SearchResultWidget::cancelAfterSizeWarning()
 {
-    m_infoBar.suppressInfo(Core::Id(SIZE_WARNING_ID));
+    m_infoBar.suppressInfo(Id(SIZE_WARNING_ID));
     emit cancelled();
     emit paused(false);
 }
@@ -473,7 +473,7 @@ void SearchResultWidget::handleReplaceButton()
 void SearchResultWidget::cancel()
 {
     m_cancelButton->setVisible(false);
-    if (m_infoBar.containsInfo(Core::Id(SIZE_WARNING_ID)))
+    if (m_infoBar.containsInfo(Id(SIZE_WARNING_ID)))
         cancelAfterSizeWarning();
     else
         emit cancelled();
diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h
index d1d58a156c..ad4a617022 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.h
+++ b/src/plugins/coreplugin/find/searchresultwidget.h
@@ -129,8 +129,8 @@ private:
     QString m_dontAskAgainGroup;
     bool m_preserveCaseSupported;
     QFrame *m_messageWidget;
-    Core::InfoBar m_infoBar;
-    Core::InfoBarDisplay m_infoBarDisplay;
+    InfoBar m_infoBar;
+    InfoBarDisplay m_infoBarDisplay;
     bool m_isShowingReplaceUI;
     QLabel *m_replaceLabel;
     QLineEdit *m_replaceTextEdit;
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index dd940a6747..3b39114df7 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -190,10 +190,10 @@ namespace Internal {
         QTC_ASSERT(widget, return);
         int internalIndex = m_searchResultWidgets.indexOf(widget) + 1/*account for "new search" entry*/;
         setCurrentIndex(internalIndex, focus);
-        q->popup(focus ? Core::IOutputPane::ModeSwitch | Core::IOutputPane::WithFocus
-                       : Core::IOutputPane::NoModeSwitch);
+        q->popup(focus ? IOutputPane::ModeSwitch | IOutputPane::WithFocus
+                       : IOutputPane::NoModeSwitch);
     }
-}
+} // namespace Internal
 
 using namespace Core::Internal;
 
@@ -307,10 +307,10 @@ SearchResultWindow::SearchResultWindow(QWidget *newSearchPanel)
     d->m_expandCollapseAction = new QAction(tr("Expand All"), this);
     d->m_expandCollapseAction->setCheckable(true);
     d->m_expandCollapseAction->setIcon(QIcon(QLatin1String(":/find/images/expand.png")));
-    Core::Command *cmd = Core::ActionManager::registerAction(
+    Command *cmd = ActionManager::registerAction(
             d->m_expandCollapseAction, "Find.ExpandAll",
-            Core::Context(Core::Constants::C_GLOBAL));
-    cmd->setAttribute(Core::Command::CA_UpdateText);
+            Context(Constants::C_GLOBAL));
+    cmd->setAttribute(Command::CA_UpdateText);
     d->m_expandCollapseButton->setDefaultAction(cmd->action());
 
     connect(d->m_expandCollapseAction, SIGNAL(toggled(bool)), this, SLOT(handleExpandCollapseToolButton(bool)));
@@ -535,7 +535,7 @@ void SearchResultWindow::handleExpandCollapseToolButton(bool checked)
 */
 void SearchResultWindow::readSettings()
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME));
     d->m_expandCollapseAction->setChecked(s->value(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_initiallyExpand).toBool());
     s->endGroup();
@@ -546,7 +546,7 @@ void SearchResultWindow::readSettings()
 */
 void SearchResultWindow::writeSettings()
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME));
     s->setValue(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_expandCollapseAction->isChecked());
     s->endGroup();
diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h
index fd879e8995..a01f78ebcf 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.h
+++ b/src/plugins/coreplugin/find/searchresultwindow.h
@@ -128,7 +128,7 @@ private:
     QVariant m_userData;
 };
 
-class CORE_EXPORT SearchResultWindow : public Core::IOutputPane
+class CORE_EXPORT SearchResultWindow : public IOutputPane
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 53cde45436..7916c781a5 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -60,11 +60,11 @@ namespace Internal {
 GeneralSettings::GeneralSettings()
     : m_page(0), m_dialog(0)
 {
-    setId(Core::Constants::SETTINGS_ID_ENVIRONMENT);
+    setId(Constants::SETTINGS_ID_ENVIRONMENT);
     setDisplayName(tr("General"));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
+    setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath)
diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp
index 61a6e744de..bed7a41927 100644
--- a/src/plugins/coreplugin/helpmanager.cpp
+++ b/src/plugins/coreplugin/helpmanager.cpp
@@ -109,7 +109,7 @@ QObject *HelpManager::instance()
 
 QString HelpManager::collectionFilePath()
 {
-    return QDir::cleanPath(Core::ICore::userResourcePath()
+    return QDir::cleanPath(ICore::userResourcePath()
         + QLatin1String("/helpcollection.qhc"));
 }
 
@@ -448,7 +448,7 @@ void HelpManager::verifyDocumenation()
 
 QStringList HelpManagerPrivate::documentationFromInstaller()
 {
-    QSettings *installSettings = Core::ICore::settings();
+    QSettings *installSettings = ICore::settings();
     QStringList documentationPaths = installSettings->value(QLatin1String("Help/InstalledDocumentation"))
             .toStringList();
     QStringList documentationFiles;
diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h
index d046b211bf..2bb902a7b6 100644
--- a/src/plugins/coreplugin/idocument.h
+++ b/src/plugins/coreplugin/idocument.h
@@ -78,8 +78,8 @@ public:
     IDocument(QObject *parent = 0);
     virtual ~IDocument();
 
-    void setId(Core::Id id);
-    Core::Id id() const;
+    void setId(Id id);
+    Id id() const;
 
     virtual bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) = 0;
     virtual bool setContents(const QByteArray &contents);
diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp
index 7aa89bf58e..cbe01f1bb3 100644
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -248,7 +248,7 @@ void InfoBarDisplay::update()
 
         if (info.cancelButtonText.isEmpty()) {
             infoWidgetCloseButton->setAutoRaise(true);
-            infoWidgetCloseButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLEAR)));
+            infoWidgetCloseButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLEAR)));
             infoWidgetCloseButton->setToolTip(tr("Close"));
             if (infoWidgetSuppressButton)
                 hbox->addWidget(infoWidgetSuppressButton);
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index 2558801acb..80c43b6e39 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -228,7 +228,7 @@ class CORE_EXPORT TestVersionControl : public IVersionControl
 {
     Q_OBJECT
 public:
-    TestVersionControl(Core::Id id, const QString &name) :
+    TestVersionControl(Id id, const QString &name) :
         m_id(id), m_displayName(name), m_dirCount(0), m_fileCount(0)
     { }
     ~TestVersionControl();
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 5fcb8571f7..7523f42a08 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -193,7 +193,7 @@ bool IWizardFactory::isAvailable(const QString &platformName) const
 {
     FeatureSet availableFeatures = pluginFeatures();
 
-    foreach (const Core::IFeatureProvider *featureManager, s_providerList)
+    foreach (const IFeatureProvider *featureManager, s_providerList)
         availableFeatures |= featureManager->availableFeatures(platformName);
 
     return availableFeatures.contains(requiredFeatures());
@@ -215,7 +215,7 @@ QStringList IWizardFactory::allAvailablePlatforms()
 {
     QStringList platforms;
 
-    foreach (const Core::IFeatureProvider *featureManager, s_providerList)
+    foreach (const IFeatureProvider *featureManager, s_providerList)
         platforms.append(featureManager->availablePlatforms());
 
     return platforms;
@@ -223,7 +223,7 @@ QStringList IWizardFactory::allAvailablePlatforms()
 
 QString IWizardFactory::displayNameForPlatform(const QString &string)
 {
-    foreach (const Core::IFeatureProvider *featureManager, s_providerList) {
+    foreach (const IFeatureProvider *featureManager, s_providerList) {
         QString displayName = featureManager->displayNameForPlatform(string);
         if (!displayName.isEmpty())
             return displayName;
diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h
index dde56d2876..8a92d39536 100644
--- a/src/plugins/coreplugin/iwizardfactory.h
+++ b/src/plugins/coreplugin/iwizardfactory.h
@@ -101,7 +101,7 @@ public:
     static void registerFeatureProvider(IFeatureProvider *provider);
 
 protected:
-    Core::FeatureSet pluginFeatures() const;
+    FeatureSet pluginFeatures() const;
 
 private:
     static void destroyFeatureProvider();
diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp
index efd8c5ea5b..9a3b219fc7 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.cpp
+++ b/src/plugins/coreplugin/locator/basefilefilter.cpp
@@ -45,7 +45,7 @@ BaseFileFilter::BaseFileFilter()
 {
 }
 
-QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &origEntry)
+QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &origEntry)
 {
     QList<LocatorFilterEntry> betterEntries;
     QList<LocatorFilterEntry> goodEntries;
@@ -105,7 +105,7 @@ QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Core::Loca
     return betterEntries;
 }
 
-void BaseFileFilter::accept(Core::LocatorFilterEntry selection) const
+void BaseFileFilter::accept(LocatorFilterEntry selection) const
 {
     EditorManager::openEditor(selection.internalData.toString(), Id(),
                               EditorManager::CanContainLineNumber);
diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h
index cecf27c4d6..4d97fa1142 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.h
+++ b/src/plugins/coreplugin/locator/basefilefilter.h
@@ -37,14 +37,14 @@
 
 namespace Core {
 
-class CORE_EXPORT BaseFileFilter : public Core::ILocatorFilter
+class CORE_EXPORT BaseFileFilter : public ILocatorFilter
 {
     Q_OBJECT
 
 public:
     BaseFileFilter();
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
-    void accept(Core::LocatorFilterEntry selection) const;
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry);
+    void accept(LocatorFilterEntry selection) const;
 
 protected:
     /* Generates the file names from the list of file paths in m_files. */
diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp
index c9533a67a8..b9b3e1d279 100644
--- a/src/plugins/coreplugin/locator/commandlocator.cpp
+++ b/src/plugins/coreplugin/locator/commandlocator.cpp
@@ -40,14 +40,14 @@ namespace Core {
 
 struct CommandLocatorPrivate
 {
-    QList<Core::Command *> commands;
+    QList<Command *> commands;
 };
 
-CommandLocator::CommandLocator(Core::Id id,
+CommandLocator::CommandLocator(Id id,
                                const QString &displayName,
                                const QString &shortCutString,
                                QObject *parent) :
-    Core::ILocatorFilter(parent),
+    ILocatorFilter(parent),
     d(new CommandLocatorPrivate)
 {
     setId(id);
@@ -60,12 +60,12 @@ CommandLocator::~CommandLocator()
     delete d;
 }
 
-void CommandLocator::appendCommand(Core::Command *cmd)
+void CommandLocator::appendCommand(Command *cmd)
 {
     d->commands.push_back(cmd);
 }
 
-QList<Core::LocatorFilterEntry> CommandLocator::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
+QList<LocatorFilterEntry> CommandLocator::matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry)
 {
     QList<LocatorFilterEntry> goodEntries;
     QList<LocatorFilterEntry> betterEntries;
@@ -93,7 +93,7 @@ QList<Core::LocatorFilterEntry> CommandLocator::matchesFor(QFutureInterface<Core
     return betterEntries;
 }
 
-void CommandLocator::accept(Core::LocatorFilterEntry entry) const
+void CommandLocator::accept(LocatorFilterEntry entry) const
 {
     // Retrieve action via index.
     const int index = entry.internalData.toInt();
diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h
index a942b91b12..b02f1e8110 100644
--- a/src/plugins/coreplugin/locator/commandlocator.h
+++ b/src/plugins/coreplugin/locator/commandlocator.h
@@ -40,18 +40,18 @@ namespace Core {
 class Command;
 struct CommandLocatorPrivate;
 
-class CORE_EXPORT CommandLocator : public Core::ILocatorFilter
+class CORE_EXPORT CommandLocator : public ILocatorFilter
 {
     Q_OBJECT
 
 public:
-    CommandLocator(Core::Id id, const QString &displayName,
+    CommandLocator(Id id, const QString &displayName,
                    const QString &shortCutString, QObject *parent = 0);
     ~CommandLocator();
 
-    void appendCommand(Core::Command *cmd);
+    void appendCommand(Command *cmd);
 
-    QList<LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry);
     void accept(LocatorFilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h
index e0b160a908..914c4e678d 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.h
+++ b/src/plugins/coreplugin/locator/directoryfilter.h
@@ -47,7 +47,7 @@ class DirectoryFilter : public BaseFileFilter
     Q_OBJECT
 
 public:
-    DirectoryFilter(Core::Id id);
+    DirectoryFilter(Id id);
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
     bool openConfigDialog(QWidget *parent, bool &needsRefresh);
diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp
index 1d033bdaf5..d2fdb3da24 100644
--- a/src/plugins/coreplugin/locator/executefilter.cpp
+++ b/src/plugins/coreplugin/locator/executefilter.cpp
@@ -57,7 +57,7 @@ ExecuteFilter::ExecuteFilter()
     connect(&m_runTimer, SIGNAL(timeout()), this, SLOT(runHeadCommand()));
 }
 
-QList<LocatorFilterEntry> ExecuteFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
+QList<LocatorFilterEntry> ExecuteFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                              const QString &entry)
 {
     QList<LocatorFilterEntry> value;
diff --git a/src/plugins/coreplugin/locator/executefilter.h b/src/plugins/coreplugin/locator/executefilter.h
index 4635d90288..51e98fd388 100644
--- a/src/plugins/coreplugin/locator/executefilter.h
+++ b/src/plugins/coreplugin/locator/executefilter.h
@@ -55,9 +55,9 @@ class ExecuteFilter : public Core::ILocatorFilter
 
 public:
     ExecuteFilter();
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
-                                           const QString &entry);
-    void accept(Core::LocatorFilterEntry selection) const;
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future,
+                                         const QString &entry);
+    void accept(LocatorFilterEntry selection) const;
     void refresh(QFutureInterface<void> &) {}
 
 private slots:
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 0a2a98efb9..fe55535d1e 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -76,7 +76,8 @@ void FileSystemFilter::prepareSearch(const QString &entry)
     }
 }
 
-QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
+QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future,
+                                                       const QString &entry)
 {
     QList<LocatorFilterEntry> goodEntries;
     QList<LocatorFilterEntry> betterEntries;
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h
index 03b5306ebf..0f769fa1f9 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.h
+++ b/src/plugins/coreplugin/locator/filesystemfilter.h
@@ -44,15 +44,15 @@ namespace Internal {
 
 class LocatorWidget;
 
-class FileSystemFilter : public Core::ILocatorFilter
+class FileSystemFilter : public ILocatorFilter
 {
     Q_OBJECT
 
 public:
     explicit FileSystemFilter(LocatorWidget *locatorWidget);
     void prepareSearch(const QString &entry);
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
-    void accept(Core::LocatorFilterEntry selection) const;
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry);
+    void accept(LocatorFilterEntry selection) const;
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
     bool openConfigDialog(QWidget *parent, bool &needsRefresh);
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index ef8d58e230..6bd9f91169 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -173,7 +173,7 @@ bool ILocatorFilter::isEnabled() const
     return m_enabled;
 }
 
-Core::Id ILocatorFilter::id() const
+Id ILocatorFilter::id() const
 {
     return m_id;
 }
@@ -193,7 +193,7 @@ void ILocatorFilter::setEnabled(bool enabled)
     m_enabled = enabled;
 }
 
-void ILocatorFilter::setId(Core::Id id)
+void ILocatorFilter::setId(Id id)
 {
     m_id = id;
 }
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h
index c7792f6b2d..a2a759d077 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.h
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.h
@@ -90,7 +90,7 @@ public:
     virtual ~ILocatorFilter() {}
 
     /* Internal Id. */
-    Core::Id id() const;
+    Id id() const;
 
     /* Visible name. */
     QString displayName() const;
@@ -108,7 +108,7 @@ public:
 
     /* List of matches for the given user entry. This runs in a separate thread, but only
        a single thread at a time. */
-    virtual QList<LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) = 0;
+    virtual QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry) = 0;
 
     /* User has selected the given entry that belongs to this filter. */
     virtual void accept(LocatorFilterEntry selection) const = 0;
@@ -153,13 +153,13 @@ protected:
     void setShortcutString(const QString &shortcut);
     void setIncludedByDefault(bool includedByDefault);
     void setHidden(bool hidden);
-    void setId(Core::Id id);
+    void setId(Id id);
     void setPriority(Priority priority);
     void setDisplayName(const QString &displayString);
     void setConfigurable(bool configurable);
 
 private:
-    Core::Id m_id;
+    Id m_id;
     QString m_shortcut;
     Priority m_priority;
     QString m_displayName;
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index af8b077e94..54e75abca7 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -97,13 +97,13 @@ void Locator::initialize(CorePlugin *corePlugin, const QStringList &, QString *)
 
     QAction *action = new QAction(m_locatorWidget->windowIcon(), m_locatorWidget->windowTitle(), this);
     Command *cmd = ActionManager::registerAction(action, "QtCreator.Locate",
-                                                             Context(Core::Constants::C_GLOBAL));
+                                                             Context(Constants::C_GLOBAL));
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+K")));
     connect(action, SIGNAL(triggered()), this, SLOT(openLocator()));
     connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updatePlaceholderText()));
     updatePlaceholderText(cmd);
 
-    ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS);
+    ActionContainer *mtools = ActionManager::actionContainer(Constants::M_TOOLS);
     mtools->addAction(cmd);
 
     m_corePlugin->addObject(new LocatorManager(m_locatorWidget));
@@ -252,7 +252,7 @@ void Locator::refresh(QList<ILocatorFilter *> filters)
         filters = m_filters;
     QFuture<void> task = QtConcurrent::run(&ILocatorFilter::refresh, filters);
     FutureProgress *progress =
-        ProgressManager::addTask(task, tr("Updating Locator Caches"), Core::Constants::TASK_INDEX);
+        ProgressManager::addTask(task, tr("Updating Locator Caches"), Constants::TASK_INDEX);
     connect(progress, SIGNAL(finished()), this, SLOT(saveSettings()));
 }
 
diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h
index be3fdbb548..a720316a89 100644
--- a/src/plugins/coreplugin/locator/locator.h
+++ b/src/plugins/coreplugin/locator/locator.h
@@ -115,7 +115,7 @@ void Locator::loadSettingsHelper(S *settings)
     QList<ILocatorFilter *> customFilters;
     const QStringList keys = settings->childKeys();
     int count = 0;
-    Core::Id baseId(Constants::CUSTOM_FILTER_BASEID);
+    Id baseId(Constants::CUSTOM_FILTER_BASEID);
     foreach (const QString &key, keys) {
         ILocatorFilter *filter = new DirectoryFilter(baseId.withSuffix(++count));
         filter->restoreState(settings->value(key).toByteArray());
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index c2c602e959..cdc710bc63 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -43,7 +43,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin,
                                                LocatorWidget *locatorWidget):
     m_plugin(plugin),
     m_locatorWidget(locatorWidget),
-    m_icon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)))
+    m_icon(QIcon(QLatin1String(Constants::ICON_NEXT)))
 {
     setId("FiltersFilter");
     setDisplayName(tr("Available filters"));
@@ -74,7 +74,7 @@ void LocatorFiltersFilter::prepareSearch(const QString &entry)
     }
 }
 
-QList<LocatorFilterEntry> LocatorFiltersFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
+QList<LocatorFilterEntry> LocatorFiltersFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry)
 {
     Q_UNUSED(entry) // search is already done in the GUI thread in prepareSearch
     QList<LocatorFilterEntry> entries;
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
index b113342c40..c3604ddcd1 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
@@ -55,7 +55,7 @@ public:
 
     // ILocatorFilter
     void prepareSearch(const QString &entry);
-    QList<LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry);
     void accept(LocatorFilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
diff --git a/src/plugins/coreplugin/locator/locatorfiltertest.h b/src/plugins/coreplugin/locator/locatorfiltertest.h
index f97595373e..ab71a6a710 100644
--- a/src/plugins/coreplugin/locator/locatorfiltertest.h
+++ b/src/plugins/coreplugin/locator/locatorfiltertest.h
@@ -43,15 +43,15 @@ namespace Tests {
 class CORE_EXPORT BasicLocatorFilterTest
 {
 public:
-    BasicLocatorFilterTest(Core::ILocatorFilter *filter);
+    BasicLocatorFilterTest(ILocatorFilter *filter);
 
-    QList<Core::LocatorFilterEntry> matchesFor(const QString &searchText = QString());
+    QList<LocatorFilterEntry> matchesFor(const QString &searchText = QString());
 
 private:
     virtual void doBeforeLocatorRun() {}
     virtual void doAfterLocatorRun() {}
 
-    Core::ILocatorFilter *m_filter;
+    ILocatorFilter *m_filter;
 };
 
 class CORE_EXPORT ResultData
diff --git a/src/plugins/coreplugin/locator/locatorsearchutils.cpp b/src/plugins/coreplugin/locator/locatorsearchutils.cpp
index 57ad60897e..33fdb1d97b 100644
--- a/src/plugins/coreplugin/locator/locatorsearchutils.cpp
+++ b/src/plugins/coreplugin/locator/locatorsearchutils.cpp
@@ -37,7 +37,7 @@
 
 namespace Core {
 
-uint qHash(const Core::LocatorFilterEntry &entry)
+uint qHash(const LocatorFilterEntry &entry)
 {
     if (entry.internalData.canConvert(QVariant::String))
         return QT_PREPEND_NAMESPACE(qHash)(entry.internalData.toString());
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 2b98a73087..14de7a0427 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -225,7 +225,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     m_completionList(new CompletionList(this)),
     m_filterMenu(new QMenu(this)),
     m_refreshAction(new QAction(tr("Refresh"), this)),
-    m_configureAction(new QAction(Core::ICore::msgShowOptionsDialog(), this)),
+    m_configureAction(new QAction(ICore::msgShowOptionsDialog(), this)),
     m_fileLineEdit(new Utils::FancyLineEdit),
     m_updateRequested(false),
     m_acceptRequested(false),
@@ -249,7 +249,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     layout->addWidget(m_fileLineEdit);
 
     setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png")));
-    const QPixmap image = Utils::StyleHelper::dpiSpecificImageFile(QLatin1String(Core::Constants::ICON_MAGNIFIER));
+    const QPixmap image = Utils::StyleHelper::dpiSpecificImageFile(QLatin1String(Constants::ICON_MAGNIFIER));
     m_fileLineEdit->setFiltering(true);
     m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, image);
     m_fileLineEdit->setButtonToolTip(Utils::FancyLineEdit::Left, tr("Options"));
@@ -314,7 +314,7 @@ void LocatorWidget::updateFilterList()
             // register new action
             action = new QAction(filter->displayName(), this);
             cmd = ActionManager::registerAction(action, locatorId,
-                               Context(Core::Constants::C_GLOBAL));
+                               Context(Constants::C_GLOBAL));
             cmd->setAttribute(Command::CA_UpdateText);
             connect(action, SIGNAL(triggered()), this, SLOT(filterSelected()));
             action->setData(qVariantFromValue(filter));
@@ -425,7 +425,7 @@ bool LocatorWidget::eventFilter(QObject *obj, QEvent *event)
 
 void LocatorWidget::setFocusToCurrentMode()
 {
-    Core::ModeManager::setFocusToCurrentMode();
+    ModeManager::setFocusToCurrentMode();
 }
 
 void LocatorWidget::showCompletionList()
@@ -596,7 +596,7 @@ void LocatorWidget::showEvent(QShowEvent *event)
 
 void LocatorWidget::showConfigureDialog()
 {
-    ICore::showOptionsDialog(Core::Constants::SETTINGS_CATEGORY_CORE, Constants::FILTER_OPTIONS_PAGE);
+    ICore::showOptionsDialog(Constants::SETTINGS_CATEGORY_CORE, Constants::FILTER_OPTIONS_PAGE);
 }
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h
index a3c54b0a91..58743ad932 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.h
+++ b/src/plugins/coreplugin/locator/locatorwidget.h
@@ -94,7 +94,7 @@ private:
     Utils::FancyLineEdit *m_fileLineEdit;
     QTimer *m_showPopupTimer;
     QFutureWatcher<LocatorFilterEntry> *m_entriesWatcher;
-    QMap<Core::Id, QAction *> m_filterActionMap;
+    QMap<Id, QAction *> m_filterActionMap;
     QString m_requestedCompletionText;
     bool m_updateRequested;
     bool m_acceptRequested;
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index 38f174748d..35f1dfb049 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -55,7 +55,7 @@ OpenDocumentsFilter::OpenDocumentsFilter()
             this, SLOT(refreshInternally()));
 }
 
-QList<LocatorFilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry_)
+QList<LocatorFilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry_)
 {
     QList<LocatorFilterEntry> goodEntries;
     QList<LocatorFilterEntry> betterEntries;
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.h b/src/plugins/coreplugin/locator/opendocumentsfilter.h
index d3d0dd5117..1e3aa2c092 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.h
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.h
@@ -43,24 +43,24 @@
 namespace Core {
 namespace Internal {
 
-class OpenDocumentsFilter : public Core::ILocatorFilter
+class OpenDocumentsFilter : public ILocatorFilter
 {
     Q_OBJECT
 
 public:
     OpenDocumentsFilter();
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
-    void accept(Core::LocatorFilterEntry selection) const;
+    QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry);
+    void accept(LocatorFilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 public slots:
     void refreshInternally();
 
 private:
-    QList<Core::DocumentModel::Entry> editors() const;
+    QList<DocumentModel::Entry> editors() const;
 
     mutable QMutex m_mutex;
-    QList<Core::DocumentModel::Entry> m_editors;
+    QList<DocumentModel::Entry> m_editors;
 };
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/locator/settingspage.cpp b/src/plugins/coreplugin/locator/settingspage.cpp
index 5d62c5b3e5..34cf4fea94 100644
--- a/src/plugins/coreplugin/locator/settingspage.cpp
+++ b/src/plugins/coreplugin/locator/settingspage.cpp
@@ -49,10 +49,10 @@ SettingsPage::SettingsPage(Locator *plugin)
     : m_plugin(plugin), m_widget(0)
 {
     setId(Constants::FILTER_OPTIONS_PAGE);
-    setDisplayName(QCoreApplication::translate("Locator", Core::Constants::FILTER_OPTIONS_PAGE));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+    setDisplayName(QCoreApplication::translate("Locator", Constants::FILTER_OPTIONS_PAGE));
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
+    setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 QWidget *SettingsPage::widget()
@@ -182,7 +182,7 @@ void SettingsPage::configureFilter(QListWidgetItem *item)
 void SettingsPage::addCustomFilter()
 {
     ILocatorFilter *filter = new DirectoryFilter(
-                Core::Id(Constants::CUSTOM_FILTER_BASEID).withSuffix(m_customFilters.size() + 1));
+                Id(Constants::CUSTOM_FILTER_BASEID).withSuffix(m_customFilters.size() + 1));
     bool needsRefresh = false;
     if (filter->openConfigDialog(m_widget, needsRefresh)) {
         m_filters.append(filter);
diff --git a/src/plugins/coreplugin/locator/settingspage.h b/src/plugins/coreplugin/locator/settingspage.h
index fc1f9c6e31..1dcb58f128 100644
--- a/src/plugins/coreplugin/locator/settingspage.h
+++ b/src/plugins/coreplugin/locator/settingspage.h
@@ -50,7 +50,7 @@ namespace Internal {
 
 class Locator;
 
-class SettingsPage : public Core::IOptionsPage
+class SettingsPage : public IOptionsPage
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 2db94d27dc..64142837a8 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -157,7 +157,7 @@ MainWindow::MainWindow() :
     if (Utils::HostOsInfo::isLinuxHost())
         QApplication::setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128)));
     QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
-    QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
+    QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG));
     QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR));
     QString baseName = QApplication::style()->objectName();
     // Sometimes we get the standard windows 95 style as a fallback
@@ -330,9 +330,9 @@ bool MainWindow::init(QString *errorMessage)
 
     // Add widget to the bottom, we create the view here instead of inside the
     // OutputPaneManager, since the StatusBarManager needs to be initialized before
-    m_outputView = new Core::StatusBarWidget;
+    m_outputView = new StatusBarWidget;
     m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
-    m_outputView->setPosition(Core::StatusBarWidget::Second);
+    m_outputView->setPosition(StatusBarWidget::Second);
     ExtensionSystem::PluginManager::addObject(m_outputView);
     MessageManager::init();
     return true;
@@ -791,7 +791,7 @@ IDocument *MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesF
                 if (!res)
                     res = document;
                 if (flags & ICore::SwitchMode)
-                    ModeManager::activateMode(Id(Core::Constants::MODE_EDIT));
+                    ModeManager::activateMode(Id(Constants::MODE_EDIT));
             }
         } else {
             QFlags<EditorManager::OpenEditorFlag> emFlags;
@@ -1068,7 +1068,7 @@ void MainWindow::aboutToShowRecentFiles()
     if (hasRecentFiles) {
         menu->addSeparator();
         QAction *action = menu->addAction(QCoreApplication::translate(
-                                                     "Core", Core::Constants::TR_CLEAR_MENU));
+                                                     "Core", Constants::TR_CLEAR_MENU));
         connect(action, SIGNAL(triggered()), DocumentManager::instance(), SLOT(clearRecentFiles()));
     }
 }
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 02fb5be7c2..d284dacdfa 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -94,10 +94,10 @@ public:
     void aboutToShutdown();
 
     IContext *contextObject(QWidget *widget);
-    void addContextObject(IContext *contex);
-    void removeContextObject(IContext *contex);
+    void addContextObject(IContext *context);
+    void removeContextObject(IContext *context);
 
-    Core::IDocument *openFiles(const QStringList &fileNames, ICore::OpenFilesFlags flags);
+    IDocument *openFiles(const QStringList &fileNames, ICore::OpenFilesFlags flags);
 
     inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; }
     virtual QPrinter *printer() const;
@@ -182,7 +182,7 @@ private:
     FancyTabWidget *m_modeStack;
     NavigationWidget *m_navigationWidget;
     RightPaneWidget *m_rightPaneWidget;
-    Core::StatusBarWidget *m_outputView;
+    StatusBarWidget *m_outputView;
     VersionDialog *m_versionDialog;
     QPointer<NewDialog> m_newDialog;
 
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index 9d2d5c7ff7..ac46e2fcb1 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -85,7 +85,7 @@ void MessageManager::write(const QString &text, PrintToOutputPaneFlags flags)
     } else if (flags & Silent) {
         // Do nothing
     } else {
-        m_messageOutputWindow->popup(Core::IOutputPane::Flag(int(flags)));
+        m_messageOutputWindow->popup(IOutputPane::Flag(int(flags)));
     }
 
     m_messageOutputWindow->append(text + QLatin1Char('\n'));
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 53e62372cd..318d98e750 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -36,11 +36,12 @@
 
 #include <aggregation/aggregate.h>
 
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 MessageOutputWindow::MessageOutputWindow()
 {
-    m_widget = new Core::OutputWindow(Core::Context(Core::Constants::C_GENERAL_OUTPUT_PANE));
+    m_widget = new OutputWindow(Context(Constants::C_GENERAL_OUTPUT_PANE));
     m_widget->setReadOnly(true);
     // Let selected text be colored as if the text edit was editable,
     // otherwise the highlight for searching is too light
@@ -52,7 +53,7 @@ MessageOutputWindow::MessageOutputWindow()
     m_widget->setPalette(p);
     Aggregation::Aggregate *agg = new Aggregation::Aggregate;
     agg->add(m_widget);
-    agg->add(new Core::BaseTextFind(m_widget));
+    agg->add(new BaseTextFind(m_widget));
 }
 
 MessageOutputWindow::~MessageOutputWindow()
@@ -129,3 +130,6 @@ bool MessageOutputWindow::canNavigate() const
 {
     return false;
 }
+
+} // namespace Internal
+} // namespace Core
diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h
index d9714296a9..955ac574e6 100644
--- a/src/plugins/coreplugin/messageoutputwindow.h
+++ b/src/plugins/coreplugin/messageoutputwindow.h
@@ -38,7 +38,7 @@ class OutputWindow;
 
 namespace Internal {
 
-class MessageOutputWindow : public Core::IOutputPane
+class MessageOutputWindow : public IOutputPane
 {
     Q_OBJECT
 
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index d26029c05f..3913e258bf 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -1801,7 +1801,7 @@ QList<MimeGlobPattern> MimeDatabasePrivate::toGlobPatterns(const QStringList &pa
 {
     QList<MimeGlobPattern> globPatterns;
     foreach (const QString &pattern, patterns)
-        globPatterns.append(Core::MimeGlobPattern(pattern, weight));
+        globPatterns.append(MimeGlobPattern(pattern, weight));
     return globPatterns;
 }
 
diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp
index 924dbad1ce..9a0720ba5b 100644
--- a/src/plugins/coreplugin/mimetypemagicdialog.cpp
+++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp
@@ -61,7 +61,7 @@ void MimeTypeMagicDialog::validateAccept()
 {
     if (ui.valueLineEdit->text().isEmpty()
             || (ui.byteRadioButton->isChecked()
-                && !Core::MagicByteRule::validateByteSequence(ui.valueLineEdit->text()))) {
+                && !MagicByteRule::validateByteSequence(ui.valueLineEdit->text()))) {
         QMessageBox::critical(0, tr("Error"), tr("Not a valid byte pattern."));
         return;
     }
@@ -71,7 +71,7 @@ void MimeTypeMagicDialog::validateAccept()
 void MimeTypeMagicDialog::setMagicData(const MagicData &data)
 {
     ui.valueLineEdit->setText(data.m_value);
-    if (data.m_type == Core::MagicStringRule::kMatchType)
+    if (data.m_type == MagicStringRule::kMatchType)
         ui.stringRadioButton->setChecked(true);
     else
         ui.byteRadioButton->setChecked(true);
@@ -85,9 +85,9 @@ MagicData MimeTypeMagicDialog::magicData() const
     MagicData data;
     data.m_value = ui.valueLineEdit->text();
     if (ui.stringRadioButton->isChecked())
-        data.m_type = Core::MagicStringRule::kMatchType;
+        data.m_type = MagicStringRule::kMatchType;
     else
-        data.m_type = Core::MagicByteRule::kMatchType;
+        data.m_type = MagicByteRule::kMatchType;
     data.m_start = ui.startRangeSpinBox->value();
     data.m_end = ui.endRangeSpinBox->value();
     data.m_priority = ui.prioritySpinBox->value();
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index 5f33519533..a531db82ec 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -543,12 +543,12 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent)
     : IOptionsPage(parent)
     , d(new MimeTypeSettingsPrivate)
 {
-    setId(Core::Constants::SETTINGS_ID_MIMETYPES);
+    setId(Constants::SETTINGS_ID_MIMETYPES);
     setDisplayName(tr("MIME Types"));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core",
-        Core::Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+        Constants::SETTINGS_TR_CATEGORY_CORE));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 MimeTypeSettings::~MimeTypeSettings()
diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h
index 0cfaa8b94d..f711e2ecc3 100644
--- a/src/plugins/coreplugin/navigationsubwidget.h
+++ b/src/plugins/coreplugin/navigationsubwidget.h
@@ -68,7 +68,7 @@ public:
     void saveSettings();
     void restoreSettings();
 
-    Core::Command *command(const QString &title) const;
+    Command *command(const QString &title) const;
 
 signals:
     void splitMe();
@@ -100,7 +100,7 @@ protected:
     bool event(QEvent *event);
 
 private:
-    virtual const Core::Command *command(const QString &text) const = 0;
+    virtual const Command *command(const QString &text) const = 0;
 };
 
 
@@ -113,7 +113,7 @@ public:
         m_navSubWidget(navSubWidget) {}
 
 private:
-    virtual const Core::Command *command(const QString &text) const
+    virtual const Command *command(const QString &text) const
         { return m_navSubWidget->command(text); }
 
     NavigationSubWidget *m_navSubWidget;
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index d484991ccd..5e54004a18 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -38,6 +38,7 @@
 #include "actionmanager/actionmanager.h"
 #include "actionmanager/command.h"
 #include "id.h"
+#include "imode.h"
 
 #include <QDebug>
 #include <QSettings>
@@ -58,13 +59,13 @@ NavigationWidgetPlaceHolder* NavigationWidgetPlaceHolder::current()
     return m_current;
 }
 
-NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(Core::IMode *mode, QWidget *parent)
+NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(IMode *mode, QWidget *parent)
     :QWidget(parent), m_mode(mode)
 {
     setLayout(new QVBoxLayout);
     layout()->setMargin(0);
-    connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode*)),
-            this, SLOT(currentModeAboutToChange(Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeAboutToChange,
+            this, &NavigationWidgetPlaceHolder::currentModeAboutToChange);
 }
 
 NavigationWidgetPlaceHolder::~NavigationWidgetPlaceHolder()
@@ -107,7 +108,7 @@ void NavigationWidgetPlaceHolder::applyStoredSize(int width)
 // m_current points to the current PlaceHolder, or zero if there
 // is no PlaceHolder in this mode
 // And that the parent of the NavigationWidget gets the correct parent
-void NavigationWidgetPlaceHolder::currentModeAboutToChange(Core::IMode *mode)
+void NavigationWidgetPlaceHolder::currentModeAboutToChange(IMode *mode)
 {
     NavigationWidget *navigationWidget = NavigationWidget::instance();
 
@@ -137,8 +138,8 @@ struct NavigationWidgetPrivate
     ~NavigationWidgetPrivate() { delete m_factoryModel; }
 
     QList<Internal::NavigationSubWidget *> m_subWidgets;
-    QHash<QAction *, Core::Id> m_actionMap;
-    QHash<Core::Id, Core::Command *> m_commandMap;
+    QHash<QAction *, Id> m_actionMap;
+    QHash<Id, Command *> m_commandMap;
     QStandardItemModel *m_factoryModel;
 
     bool m_shown;
@@ -180,7 +181,7 @@ NavigationWidget *NavigationWidget::instance()
 
 void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> &factories)
 {
-    Context navicontext(Core::Constants::C_NAVIGATION_PANE);
+    Context navicontext(Constants::C_NAVIGATION_PANE);
 
     foreach (INavigationWidgetFactory *factory, factories) {
         const Id id = factory->id();
@@ -417,7 +418,7 @@ void NavigationWidget::setSuppressed(bool b)
 int NavigationWidget::factoryIndex(Id id)
 {
     for (int row = 0; row < d->m_factoryModel->rowCount(); ++row) {
-        if (d->m_factoryModel->data(d->m_factoryModel->index(row, 0), FactoryIdRole).value<Core::Id>() == id)
+        if (d->m_factoryModel->data(d->m_factoryModel->index(row, 0), FactoryIdRole).value<Id>() == id)
             return row;
     }
     return -1;
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 93740a38a9..104d708d8d 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -56,16 +56,15 @@ class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget
     friend class Core::NavigationWidget;
 
 public:
-    explicit NavigationWidgetPlaceHolder(Core::IMode *mode, QWidget *parent = 0);
+    explicit NavigationWidgetPlaceHolder(IMode *mode, QWidget *parent = 0);
     virtual ~NavigationWidgetPlaceHolder();
     static NavigationWidgetPlaceHolder* current();
     void applyStoredSize(int width);
 
-private slots:
-    void currentModeAboutToChange(Core::IMode *);
-
 private:
-    Core::IMode *m_mode;
+    void currentModeAboutToChange(IMode *);
+
+    IMode *m_mode;
     static NavigationWidgetPlaceHolder* m_current;
 };
 
@@ -104,7 +103,7 @@ public:
     // Called from the place holders
     void placeHolderChanged(NavigationWidgetPlaceHolder *holder);
 
-    QHash<Id, Core::Command *> commandMap() const;
+    QHash<Id, Command *> commandMap() const;
     QAbstractItemModel *factoryModel() const;
 
 protected:
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 7360d0ff45..7fd7d9404f 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -28,33 +28,33 @@
 **
 ****************************************************************************/
 
+#include "imode.h"
+#include "modemanager.h"
 #include "outputpane.h"
 #include "outputpanemanager.h"
 
-#include "modemanager.h"
-
 #include <QSplitter>
 #include <QVBoxLayout>
 
 namespace Core {
 
 struct OutputPanePlaceHolderPrivate {
-    explicit OutputPanePlaceHolderPrivate(Core::IMode *mode, QSplitter *parent);
+    explicit OutputPanePlaceHolderPrivate(IMode *mode, QSplitter *parent);
 
-    Core::IMode *m_mode;
+    IMode *m_mode;
     QSplitter *m_splitter;
     int m_lastNonMaxSize;
     static OutputPanePlaceHolder* m_current;
 };
 
-OutputPanePlaceHolderPrivate::OutputPanePlaceHolderPrivate(Core::IMode *mode, QSplitter *parent) :
+OutputPanePlaceHolderPrivate::OutputPanePlaceHolderPrivate(IMode *mode, QSplitter *parent) :
     m_mode(mode), m_splitter(parent), m_lastNonMaxSize(0)
 {
 }
 
 OutputPanePlaceHolder *OutputPanePlaceHolderPrivate::m_current = 0;
 
-OutputPanePlaceHolder::OutputPanePlaceHolder(Core::IMode *mode, QSplitter* parent)
+OutputPanePlaceHolder::OutputPanePlaceHolder(IMode *mode, QSplitter* parent)
    : QWidget(parent), d(new OutputPanePlaceHolderPrivate(mode, parent))
 {
     setVisible(false);
@@ -65,8 +65,8 @@ OutputPanePlaceHolder::OutputPanePlaceHolder(Core::IMode *mode, QSplitter* paren
     sp.setHorizontalStretch(0);
     setSizePolicy(sp);
     layout()->setMargin(0);
-    connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
-            this, SLOT(currentModeChanged(Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &OutputPanePlaceHolder::currentModeChanged);
 }
 
 OutputPanePlaceHolder::~OutputPanePlaceHolder()
@@ -80,7 +80,7 @@ OutputPanePlaceHolder::~OutputPanePlaceHolder()
     delete d;
 }
 
-void OutputPanePlaceHolder::currentModeChanged(Core::IMode *mode)
+void OutputPanePlaceHolder::currentModeChanged(IMode *mode)
 {
     if (d->m_current == this) {
         d->m_current = 0;
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 63eb69e0c9..453f0eb761 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -52,7 +52,7 @@ class CORE_EXPORT OutputPanePlaceHolder : public QWidget
     friend class Core::Internal::OutputPaneManager; // needs to set m_visible and thus access m_current
 
 public:
-    explicit OutputPanePlaceHolder(Core::IMode *mode, QSplitter *parent = 0);
+    explicit OutputPanePlaceHolder(IMode *mode, QSplitter *parent = 0);
     ~OutputPanePlaceHolder();
 
     static OutputPanePlaceHolder *getCurrent();
@@ -63,10 +63,8 @@ public:
     void setDefaultHeight(int height);
     void ensureSizeHintAsMinimum();
 
-private slots:
-    void currentModeChanged(Core::IMode *);
-
 private:
+    void currentModeChanged(IMode *);
     bool canMaximizeOrMinimize() const;
     void maximizeOrMinimize(bool maximize);
 
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index c8a60c0c60..94a0faab46 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -175,7 +175,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     toolLayout->addWidget(m_closeButton);
     mainlayout->addWidget(m_toolBar);
     mainlayout->addWidget(m_outputWidgetPane, 10);
-    mainlayout->addWidget(new Core::FindToolBarPlaceHolder(this));
+    mainlayout->addWidget(new FindToolBarPlaceHolder(this));
     setLayout(mainlayout);
 
     m_buttonsWidget = new QWidget;
@@ -313,7 +313,7 @@ void OutputPaneManager::shortcutTriggered()
     QTC_ASSERT(action, return);
     int idx = m_actions.indexOf(action);
     QTC_ASSERT(idx != -1, return);
-    Core::IOutputPane *outputPane = m_panes.at(idx);
+    IOutputPane *outputPane = m_panes.at(idx);
     // Now check the special case, the output window is already visible,
     // we are already on that page but the outputpane doesn't have focus
     // then just give it focus.
@@ -413,7 +413,7 @@ void OutputPaneManager::slotHide()
         QTC_ASSERT(idx >= 0, return);
         m_buttons.at(idx)->setChecked(false);
         m_panes.value(idx)->visibilityChanged(false);
-        if (IEditor *editor = Core::EditorManager::currentEditor()) {
+        if (IEditor *editor = EditorManager::currentEditor()) {
             QWidget *w = editor->widget()->focusWidget();
             if (!w)
                 w = editor->widget();
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index dc762537cb..5f1e8d3347 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -45,7 +45,7 @@ namespace Core {
 
 /*******************/
 
-OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
+OutputWindow::OutputWindow(Context context, QWidget *parent)
     : QPlainTextEdit(parent)
     , m_formatter(0)
     , m_enforceNewline(false)
@@ -60,7 +60,7 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
     setMouseTracking(true);
     setUndoRedoEnabled(false);
 
-    m_outputWindowContext = new Core::IContext;
+    m_outputWindowContext = new IContext;
     m_outputWindowContext->setContext(context);
     m_outputWindowContext->setWidget(this);
     ICore::addContextObject(m_outputWindowContext);
@@ -72,12 +72,12 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
     QAction *pasteAction = new QAction(this);
     QAction *selectAllAction = new QAction(this);
 
-    ActionManager::registerAction(undoAction, Core::Constants::UNDO, context);
-    ActionManager::registerAction(redoAction, Core::Constants::REDO, context);
-    ActionManager::registerAction(cutAction, Core::Constants::CUT, context);
-    ActionManager::registerAction(copyAction, Core::Constants::COPY, context);
-    ActionManager::registerAction(pasteAction, Core::Constants::PASTE, context);
-    ActionManager::registerAction(selectAllAction, Core::Constants::SELECTALL, context);
+    ActionManager::registerAction(undoAction, Constants::UNDO, context);
+    ActionManager::registerAction(redoAction, Constants::REDO, context);
+    ActionManager::registerAction(cutAction, Constants::CUT, context);
+    ActionManager::registerAction(copyAction, Constants::COPY, context);
+    ActionManager::registerAction(pasteAction, Constants::PASTE, context);
+    ActionManager::registerAction(selectAllAction, Constants::SELECTALL, context);
 
     connect(undoAction, SIGNAL(triggered()), this, SLOT(undo()));
     connect(redoAction, SIGNAL(triggered()), this, SLOT(redo()));
@@ -99,7 +99,7 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
 
 OutputWindow::~OutputWindow()
 {
-    Core::ICore::removeContextObject(m_outputWindowContext);
+    ICore::removeContextObject(m_outputWindowContext);
     delete m_outputWindowContext;
 }
 
diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
index 040e458c09..280020bc8a 100644
--- a/src/plugins/coreplugin/outputwindow.h
+++ b/src/plugins/coreplugin/outputwindow.h
@@ -47,7 +47,7 @@ class CORE_EXPORT OutputWindow : public QPlainTextEdit
     Q_OBJECT
 
 public:
-    OutputWindow(Core::Context context, QWidget *parent = 0);
+    OutputWindow(Context context, QWidget *parent = 0);
     ~OutputWindow();
 
     Utils::OutputFormatter* formatter() const;
@@ -83,7 +83,7 @@ private:
     void enableUndoRedo();
     QString doNewlineEnforcement(const QString &out);
 
-    Core::IContext *m_outputWindowContext;
+    IContext *m_outputWindowContext;
     Utils::OutputFormatter *m_formatter;
 
     bool m_enforceNewline;
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp
index 7377c636a9..8625919590 100644
--- a/src/plugins/coreplugin/patchtool.cpp
+++ b/src/plugins/coreplugin/patchtool.cpp
@@ -46,7 +46,7 @@ namespace Core {
 
 static QString readLegacyCommand()
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
 
     s->beginGroup(QLatin1String(legacySettingsGroupC));
     const bool legacyExists = s->contains(QLatin1String(patchCommandKeyC));
@@ -63,7 +63,7 @@ static QString readLegacyCommand()
 
 QString PatchTool::patchCommand()
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
 
     const QString defaultCommand = readLegacyCommand(); // replace it with QLatin1String(patchCommandDefaultC) when dropping legacy stuff
 
@@ -76,7 +76,7 @@ QString PatchTool::patchCommand()
 
 void PatchTool::setPatchCommand(const QString &newCommand)
 {
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     s->beginGroup(QLatin1String(settingsGroupC));
     s->setValue(QLatin1String(patchCommandKeyC), newCommand);
     s->endGroup();
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 14a9600f97..8fe9efc1fe 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -305,7 +305,7 @@ void ProgressManagerPrivate::init()
 {
     readSettings();
 
-    m_statusBarWidgetContainer = new Core::StatusBarWidget;
+    m_statusBarWidgetContainer = new StatusBarWidget;
     m_statusBarWidget = new QWidget;
     QHBoxLayout *layout = new QHBoxLayout(m_statusBarWidget);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -328,7 +328,7 @@ void ProgressManagerPrivate::init()
     ToggleButton *toggleButton = new ToggleButton(m_statusBarWidget);
     layout->addWidget(toggleButton);
     m_statusBarWidgetContainer->setWidget(m_statusBarWidget);
-    m_statusBarWidgetContainer->setPosition(Core::StatusBarWidget::RightCorner);
+    m_statusBarWidgetContainer->setPosition(StatusBarWidget::RightCorner);
     ExtensionSystem::PluginManager::addObject(m_statusBarWidgetContainer);
     m_statusBarWidget->installEventFilter(this);
 
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 0c3d4db281..2e1431359f 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -55,9 +55,9 @@ public:
     static QObject *instance();
 
     static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
-                                   Core::Id type, ProgressFlags flags = 0);
+                                   Id type, ProgressFlags flags = 0);
     static FutureProgress *addTimedTask(const QFutureInterface<void> &fi, const QString &title,
-                                   Core::Id type, int expectedSeconds, ProgressFlags flags = 0);
+                                   Id type, int expectedSeconds, ProgressFlags flags = 0);
     static void setApplicationLabel(const QString &text);
 
 public slots:
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h
index 6ab841aba7..a7b4454f18 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h
@@ -105,7 +105,7 @@ private:
     QList<FutureProgress *> m_taskList;
     QMap<QFutureWatcher<void> *, Id> m_runningTasks;
     QFutureWatcher<void> *m_applicationTask;
-    Core::StatusBarWidget *m_statusBarWidgetContainer;
+    StatusBarWidget *m_statusBarWidgetContainer;
     QWidget *m_statusBarWidget;
     QWidget *m_summaryProgressWidget;
     QHBoxLayout *m_summaryProgressLayout;
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 1130b4070a..8c870142b5 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -30,6 +30,7 @@
 
 #include "rightpane.h"
 
+#include <coreplugin/imode.h>
 #include <coreplugin/modemanager.h>
 
 #include <QSettings>
@@ -49,13 +50,13 @@ RightPanePlaceHolder* RightPanePlaceHolder::current()
     return m_current;
 }
 
-RightPanePlaceHolder::RightPanePlaceHolder(Core::IMode *mode, QWidget *parent)
+RightPanePlaceHolder::RightPanePlaceHolder(IMode *mode, QWidget *parent)
     :QWidget(parent), m_mode(mode)
 {
     setLayout(new QVBoxLayout);
     layout()->setMargin(0);
-    connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
-            this, SLOT(currentModeChanged(Core::IMode*)));
+    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+            this, &RightPanePlaceHolder::currentModeChanged);
 }
 
 RightPanePlaceHolder::~RightPanePlaceHolder()
@@ -96,7 +97,7 @@ void RightPanePlaceHolder::applyStoredSize(int width)
 // m_current points to the current PlaceHolder, or zero if there
 // is no PlaceHolder in this mode
 // And that the parent of the RightPaneWidget gets the correct parent
-void RightPanePlaceHolder::currentModeChanged(Core::IMode *mode)
+void RightPanePlaceHolder::currentModeChanged(IMode *mode)
 {
     if (m_current == this) {
         m_current = 0;
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index a56541ca15..786fe61d25 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/src/plugins/coreplugin/rightpane.h
@@ -51,16 +51,14 @@ class CORE_EXPORT RightPanePlaceHolder : public QWidget
     Q_OBJECT
 
 public:
-    explicit RightPanePlaceHolder(Core::IMode *mode, QWidget *parent = 0);
+    explicit RightPanePlaceHolder(IMode *mode, QWidget *parent = 0);
     ~RightPanePlaceHolder();
     static RightPanePlaceHolder *current();
 
-private slots:
-    void currentModeChanged(Core::IMode *);
-
 private:
+    void currentModeChanged(IMode *);
     void applyStoredSize(int width);
-    Core::IMode *m_mode;
+    IMode *m_mode;
     static RightPanePlaceHolder* m_current;
 };
 
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 953ffc71a7..b2efd1476d 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -334,12 +334,12 @@ void SideBar::activateItem(const QString &id)
     d->m_itemMap.value(id)->widget()->setFocus();
 }
 
-void SideBar::setShortcutMap(const QMap<QString, Core::Command*> &shortcutMap)
+void SideBar::setShortcutMap(const QMap<QString, Command*> &shortcutMap)
 {
     d->m_shortcutMap = shortcutMap;
 }
 
-QMap<QString, Core::Command*> SideBar::shortcutMap() const
+QMap<QString, Command*> SideBar::shortcutMap() const
 {
     return d->m_shortcutMap;
 }
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index d7ad4bc437..8c078b11bc 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -111,8 +111,8 @@ public:
     void closeAllWidgets();
     void activateItem(const QString &id);
 
-    void setShortcutMap(const QMap<QString, Core::Command *> &shortcutMap);
-    QMap<QString, Core::Command *> shortcutMap() const;
+    void setShortcutMap(const QMap<QString, Command *> &shortcutMap);
+    QMap<QString, Command *> shortcutMap() const;
 
 signals:
     void sideBarClosed();
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index 3fac9ddd62..c97615928c 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -53,7 +53,7 @@ public:
     explicit SideBarComboBox(SideBarWidget *sideBarWidget) : m_sideBarWidget(sideBarWidget) {}
 
 private:
-    virtual const Core::Command *command(const QString &text) const
+    virtual const Command *command(const QString &text) const
         { return m_sideBarWidget->command(text); }
 
     SideBarWidget *m_sideBarWidget;
@@ -200,13 +200,13 @@ void SideBarWidget::setCurrentIndex(int)
     emit currentWidgetChanged();
 }
 
-Core::Command *SideBarWidget::command(const QString &title) const
+Command *SideBarWidget::command(const QString &title) const
 {
     const QString id = m_sideBar->idForTitle(title);
     if (id.isEmpty())
         return 0;
-    const QMap<QString, Core::Command*> shortcutMap = m_sideBar->shortcutMap();
-    QMap<QString, Core::Command*>::const_iterator r = shortcutMap.find(id);
+    const QMap<QString, Command*> shortcutMap = m_sideBar->shortcutMap();
+    QMap<QString, Command*>::const_iterator r = shortcutMap.find(id);
     if (r != shortcutMap.end())
         return r.value();
     return 0;
diff --git a/src/plugins/coreplugin/sidebarwidget.h b/src/plugins/coreplugin/sidebarwidget.h
index 88bb6d3149..f916e1cc8f 100644
--- a/src/plugins/coreplugin/sidebarwidget.h
+++ b/src/plugins/coreplugin/sidebarwidget.h
@@ -62,7 +62,7 @@ public:
     void updateAvailableItems();
     void removeCurrentItem();
 
-    Core::Command *command(const QString &title) const;
+    Command *command(const QString &title) const;
 
 signals:
     void splitMe();
diff --git a/src/plugins/coreplugin/themesettings.cpp b/src/plugins/coreplugin/themesettings.cpp
index 2034fb952f..202b0ab447 100644
--- a/src/plugins/coreplugin/themesettings.cpp
+++ b/src/plugins/coreplugin/themesettings.cpp
@@ -40,11 +40,11 @@ namespace Internal {
 ThemeSettings::ThemeSettings() :
     m_widget(0)
 {
-    setId(Core::Constants::SETTINGS_ID_ENVIRONMENT);
+    setId(Constants::SETTINGS_ID_ENVIRONMENT);
     setDisplayName(tr("Theme"));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
+    setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 ThemeSettings::~ThemeSettings()
diff --git a/src/plugins/coreplugin/themesettingswidget.cpp b/src/plugins/coreplugin/themesettingswidget.cpp
index f1eaac7bb9..d83adb4441 100644
--- a/src/plugins/coreplugin/themesettingswidget.cpp
+++ b/src/plugins/coreplugin/themesettingswidget.cpp
@@ -446,8 +446,8 @@ void ThemeSettingsWidget::apply()
         w->update();
 
     // save filename of selected theme in global config
-    QSettings *settings = Core::ICore::settings();
-    settings->setValue(QLatin1String(Core::Constants::SETTINGS_THEME), themeName);
+    QSettings *settings = ICore::settings();
+    settings->setValue(QLatin1String(Constants::SETTINGS_THEME), themeName);
 }
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp
index f64ce1b672..ba6afee6a2 100644
--- a/src/plugins/coreplugin/toolsettings.cpp
+++ b/src/plugins/coreplugin/toolsettings.cpp
@@ -49,11 +49,11 @@ using namespace Core::Internal;
 ToolSettings::ToolSettings(QObject *parent) :
     IOptionsPage(parent)
 {
-    setId(Core::Constants::SETTINGS_ID_TOOLS);
+    setId(Constants::SETTINGS_ID_TOOLS);
     setDisplayName(tr("External Tools"));
-    setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
+    setCategory(Constants::SETTINGS_CATEGORY_CORE);
     setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
-    setCategoryIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
+    setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 9a6f7e81fa..8012354de9 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -330,7 +330,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
                                   .arg(versionControl->displayName()),
                                   InfoBarEntry::GlobalSuppressionEnabled);
                 d->m_unconfiguredVcs = versionControl;
-                info.setCustomButtonInfo(Core::ICore::msgShowOptionsDialog(), []() {
+                info.setCustomButtonInfo(ICore::msgShowOptionsDialog(), []() {
                     QTC_ASSERT(d->m_unconfiguredVcs, return);
                     ICore::showOptionsDialog(Id(VcsBase::Constants::VCS_SETTINGS_CATEGORY),
                                              d->m_unconfiguredVcs->id());
@@ -373,7 +373,7 @@ IVersionControl *VcsManager::checkout(const QString &versionControlType,
 {
     foreach (IVersionControl *versionControl, allVersionControls()) {
         if (versionControl->displayName() == versionControlType
-            && versionControl->supportsOperation(Core::IVersionControl::CheckoutOperation)) {
+            && versionControl->supportsOperation(IVersionControl::CheckoutOperation)) {
             if (versionControl->vcsCheckout(directory, url)) {
                 d->cache(versionControl, directory, directory);
                 return versionControl;
@@ -441,7 +441,7 @@ QStringList VcsManager::additionalToolsPath()
 void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNames)
 {
     IVersionControl *vc = findVersionControlForDirectory(directory);
-    if (!vc || !vc->supportsOperation(Core::IVersionControl::AddOperation))
+    if (!vc || !vc->supportsOperation(IVersionControl::AddOperation))
         return;
 
     QStringList unmanagedFiles;
@@ -453,7 +453,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
     if (unmanagedFiles.isEmpty())
         return;
 
-    Internal::AddToVcsDialog dlg(Core::ICore::mainWindow(), VcsManager::msgAddToVcsTitle(),
+    Internal::AddToVcsDialog dlg(ICore::mainWindow(), VcsManager::msgAddToVcsTitle(),
                                  unmanagedFiles, vc->displayName());
     if (dlg.exec() == QDialog::Accepted) {
         QStringList notAddedToVc;
@@ -463,7 +463,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
         }
 
         if (!notAddedToVc.isEmpty()) {
-            QMessageBox::warning(Core::ICore::mainWindow(), VcsManager::msgAddToVcsFailedTitle(),
+            QMessageBox::warning(ICore::mainWindow(), VcsManager::msgAddToVcsFailedTitle(),
                                  VcsManager::msgToAddToVcsFailed(notAddedToVc, vc));
         }
     }
author	Orgad Shaneh <orgad.shaneh@audiocodes.com>	2014-11-16 10:52:41 +0200
committer	hjk <hjk121@nokiamail.com>	2014-11-26 13:46:38 +0100
commit	7f341580412847d325ffa4f7a82d27a763ff598f (patch)
tree	aa1f40058022372d26876d8ed6b7649425ab3f69
parent	6804c2117915e84dd37a793ae5c99321acbdd85b (diff)