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, 18 insertions, 20 deletions

diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 7284d2a3422..0ebd66d2a74 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "QmlJSTools" }
     Depends { name: "QmlJS" }
     Depends { name: "LanguageUtils" }
-    Depends { name: "Find" }
     Depends { name: "QmlEditorWidgets" }
     Depends { name: "CPlusPlus" }
 
diff --git a/src/plugins/qmljseditor/qmljseditor_dependencies.pri b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
index 481638aa2a9..56134f03348 100644
--- a/src/plugins/qmljseditor/qmljseditor_dependencies.pri
+++ b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
@@ -4,7 +4,6 @@ QTC_LIB_DEPENDS += \
     qmleditorwidgets
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
-    find \
     texteditor \
     projectexplorer \
     qmljstools
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index 7dc4179aa2c..f4162da0c7e 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -30,7 +30,7 @@
 #include "qmljsfindreferences.h"
 
 #include <texteditor/basefilefind.h>
-#include <find/searchresultwindow.h>
+#include <coreplugin/find/searchresultwindow.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <coreplugin/progressmanager/progressmanager.h>
@@ -925,20 +925,20 @@ void FindReferences::displayResults(int first, int last)
         const QString label = tr("QML/JS Usages:");
 
         if (replacement.isEmpty()) {
-            m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(
-                        label, QString(), symbolName, Find::SearchResultWindow::SearchOnly);
+            m_currentSearch = Core::SearchResultWindow::instance()->startNewSearch(
+                        label, QString(), symbolName, Core::SearchResultWindow::SearchOnly);
         } else {
-            m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(
-                        label, QString(), symbolName, Find::SearchResultWindow::SearchAndReplace);
+            m_currentSearch = Core::SearchResultWindow::instance()->startNewSearch(
+                        label, QString(), symbolName, Core::SearchResultWindow::SearchAndReplace);
             m_currentSearch->setTextToReplace(replacement);
-            connect(m_currentSearch, SIGNAL(replaceButtonClicked(QString,QList<Find::SearchResultItem>,bool)),
-                    SLOT(onReplaceButtonClicked(QString,QList<Find::SearchResultItem>,bool)));
+            connect(m_currentSearch, SIGNAL(replaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)),
+                    SLOT(onReplaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)));
         }
-        connect(m_currentSearch, SIGNAL(activated(Find::SearchResultItem)),
-                this, SLOT(openEditor(Find::SearchResultItem)));
+        connect(m_currentSearch, SIGNAL(activated(Core::SearchResultItem)),
+                this, SLOT(openEditor(Core::SearchResultItem)));
         connect(m_currentSearch, SIGNAL(cancelled()), this, SLOT(cancel()));
         connect(m_currentSearch, SIGNAL(paused(bool)), this, SLOT(setPaused(bool)));
-        Find::SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch | IOutputPane::WithFocus));
+        Core::SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch | IOutputPane::WithFocus));
 
         FutureProgress *progress = ProgressManager::addTask(
                     m_watcher.future(), tr("Searching"),
@@ -981,7 +981,7 @@ void FindReferences::setPaused(bool paused)
         m_watcher.setPaused(paused);
 }
 
-void FindReferences::openEditor(const Find::SearchResultItem &item)
+void FindReferences::openEditor(const Core::SearchResultItem &item)
 {
     if (item.path.size() > 0) {
         EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()),
@@ -991,7 +991,7 @@ void FindReferences::openEditor(const Find::SearchResultItem &item)
     }
 }
 
-void FindReferences::onReplaceButtonClicked(const QString &text, const QList<Find::SearchResultItem> &items, bool preserveCase)
+void FindReferences::onReplaceButtonClicked(const QString &text, const QList<Core::SearchResultItem> &items, bool preserveCase)
 {
     const QStringList fileNames = TextEditor::BaseFileFind::replaceAll(text, items, preserveCase);
 
@@ -1011,5 +1011,5 @@ void FindReferences::onReplaceButtonClicked(const QString &text, const QList<Fin
     if (!changedUnsavedEditors.isEmpty())
         QmlJS::ModelManagerInterface::instance()->updateSourceFiles(changedUnsavedEditors, false);
 
-    Find::SearchResultWindow::instance()->hide();
+    Core::SearchResultWindow::instance()->hide();
 }
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h
index f4d3dc6c55c..a9fcd38de9a 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.h
+++ b/src/plugins/qmljseditor/qmljsfindreferences.h
@@ -40,10 +40,10 @@
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
-namespace Find {
+namespace Core {
 class SearchResultItem;
 class SearchResult;
-} // namespace Find
+} // namespace Core
 
 namespace QmlJSEditor {
 
@@ -85,11 +85,11 @@ private Q_SLOTS:
     void searchFinished();
     void cancel();
     void setPaused(bool paused);
-    void openEditor(const Find::SearchResultItem &item);
-    void onReplaceButtonClicked(const QString &text, const QList<Find::SearchResultItem> &items, bool preserveCase);
+    void openEditor(const Core::SearchResultItem &item);
+    void onReplaceButtonClicked(const QString &text, const QList<Core::SearchResultItem> &items, bool preserveCase);
 
 private:
-    QPointer<Find::SearchResult> m_currentSearch;
+    QPointer<Core::SearchResult> m_currentSearch;
     QFutureWatcher<Usage> m_watcher;
 };