1 files changed, 18 insertions, 17 deletions

diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index ac0c854785..c50213211d 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -193,41 +193,42 @@ 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()));
+    connect(d->m_openFindDialog, &QAction::triggered,
+            this, &FindPlugin::openFindFilter);
 }
 
 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,13 +236,13 @@ 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);
         d->m_filterActions.insert(filter, action);
-        connect(action, SIGNAL(triggered(bool)), this, SLOT(openFindFilter()));
-        connect(filter, SIGNAL(enabledChanged(bool)), this, SLOT(filterChanged()));
+        connect(action, &QAction::triggered, this, &FindPlugin::openFindFilter);
+        connect(filter, &IFindFilter::enabledChanged, this, &FindPlugin::filterChanged);
     }
     d->m_findDialog->setFindFilters(findInterfaces);
     d->m_openFindDialog->setEnabled(haveEnabledFilters);
@@ -297,7 +298,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 +315,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());