Core: Merge Find and Locator into Core plugin

Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/plugins/git/gerrit/gerritplugin.cpp

@@ -51,7 +51,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <locator/commandlocator.h>
+#include <coreplugin/locator/commandlocator.h>
 
 #include <vcsbase/vcsbaseoutputwindow.h>
 
@@ -302,7 +302,7 @@ void GerritPlugin::updateActions(bool hasTopLevel)
     m_pushToGerritPair.first->setEnabled(hasTopLevel);
 }
 
-void GerritPlugin::addToLocator(Locator::CommandLocator *locator)
+void GerritPlugin::addToLocator(Core::CommandLocator *locator)
 {
     locator->appendCommand(m_gerritCommand);
     locator->appendCommand(m_pushToGerritPair.second);

src/plugins/git/gerrit/gerritplugin.h

@@ -42,10 +42,9 @@ QT_END_NAMESPACE
 namespace Core {
 class ActionContainer;
 class Command;
+class CommandLocator;
 }
 
-namespace Locator { class CommandLocator; }
-
 namespace Gerrit {
 namespace Internal {
 
@@ -66,7 +65,7 @@ public:
 
     static QString gitBinary();
     static QString branch(const QString &repository);
-    void addToLocator(Locator::CommandLocator *locator);
+    void addToLocator(Core::CommandLocator *locator);
     void push(const QString &topLevel);
 
 public slots:

src/plugins/git/git.qbs

@@ -8,10 +8,8 @@ QtcPlugin {
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "Find" }
     Depends { name: "VcsBase" }
     Depends { name: "DiffEditor" }
-    Depends { name: "Locator" }
 
     files: [
         "annotationhighlighter.cpp",

src/plugins/git/git_dependencies.pri

@@ -2,7 +2,6 @@ QTC_PLUGIN_NAME = Git
 QTC_LIB_DEPENDS += \
     utils
 QTC_PLUGIN_DEPENDS += \
-    locator \
     texteditor \
     coreplugin \
     vcsbase \

src/plugins/git/gitplugin.cpp

@@ -71,7 +71,7 @@
 #include <vcsbase/basevcssubmiteditorfactory.h>
 #include <vcsbase/vcsbaseoutputwindow.h>
 #include <vcsbase/cleandialog.h>
-#include <locator/commandlocator.h>
+#include <coreplugin/locator/commandlocator.h>
 
 #include <QDebug>
 #include <QDir>
@@ -298,7 +298,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     addAutoReleasedObject(new Gitorious::Internal::GitoriousCloneWizard);
 
     const QString prefix = QLatin1String("git");
-    m_commandLocator = new Locator::CommandLocator("Git", prefix, prefix);
+    m_commandLocator = new Core::CommandLocator("Git", prefix, prefix);
     addAutoReleasedObject(m_commandLocator);
 
     //register actions

src/plugins/git/gitplugin.h

@@ -49,6 +49,7 @@ namespace Core {
 class IEditor;
 class IEditorFactory;
 class Command;
+class CommandLocator;
 class Context;
 class ActionManager;
 class ActionContainer;
@@ -56,9 +57,6 @@ class ActionContainer;
 namespace Utils {
 class ParameterAction;
 }
-namespace Locator {
-    class CommandLocator;
-}
 namespace Gerrit {
 namespace Internal {
 class GerritPlugin;
@@ -206,7 +204,7 @@ private:
     void updateVersionWarning();
 
     static GitPlugin *m_instance;
-    Locator::CommandLocator *m_commandLocator;
+    Core::CommandLocator *m_commandLocator;
 
     QAction *m_submitCurrentAction;
     QAction *m_diffSelectedFilesAction;