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>

4 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 6c3c48286f..b92fff54f3 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -8,9 +8,7 @@ QtcPlugin {
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "Find" }
     Depends { name: "VcsBase" }
-    Depends { name: "Locator" }
 
     files: [
         "annotationhighlighter.cpp",
diff --git a/src/plugins/subversion/subversion_dependencies.pri b/src/plugins/subversion/subversion_dependencies.pri
index 297af991b6..87e1a57ad5 100644
--- a/src/plugins/subversion/subversion_dependencies.pri
+++ b/src/plugins/subversion/subversion_dependencies.pri
@@ -2,7 +2,6 @@ QTC_PLUGIN_NAME = Subversion
 QTC_LIB_DEPENDS += \
     utils
 QTC_PLUGIN_DEPENDS += \
-    locator \
     texteditor \
     coreplugin \
     vcsbase
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index cc068dd144..e6faebde04 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -59,7 +59,7 @@
 #include <coreplugin/id.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <locator/commandlocator.h>
+#include <coreplugin/locator/commandlocator.h>
 
 #include <utils/qtcassert.h>
 
@@ -267,7 +267,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     addAutoReleasedObject(new CheckoutWizard);
 
     const QString prefix = QLatin1String("svn");
-    m_commandLocator = new Locator::CommandLocator("Subversion", prefix, prefix);
+    m_commandLocator = new Core::CommandLocator("Subversion", prefix, prefix);
     addAutoReleasedObject(m_commandLocator);
 
     //register actions
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 77a1a6c786..14e818156d 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -42,6 +42,7 @@ class QTextCodec;
 QT_END_NAMESPACE
 
 namespace Core {
+    class CommandLocator;
     class IVersionControl;
     class IEditor;
 }
@@ -53,10 +54,6 @@ namespace VcsBase {
     class VcsBaseSubmitEditor;
 }
 
-namespace Locator {
-    class CommandLocator;
-}
-
 namespace Subversion {
 namespace Internal {
 
@@ -170,7 +167,7 @@ private:
     QString m_commitMessageFileName;
     QString m_commitRepository;
 
-    Locator::CommandLocator *m_commandLocator;
+    Core::CommandLocator *m_commandLocator;
     Utils::ParameterAction *m_addAction;
     Utils::ParameterAction *m_deleteAction;
     Utils::ParameterAction *m_revertAction;