diff options
| author | hjk <hjk121@nokiamail.com> | 2014-01-13 16:17:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-14 07:43:00 +0100 |
| commit | 4d96fa7aba7be35800d61d8bed89d3f6c3ef9329 (patch) | |
| tree | c9b102981cf81023e1488224a24758af18aa064e /src/plugins/texteditor/findinfiles.cpp | |
| parent | 8b854270a6c214479b2cdf302072a3e74fa854da (diff) | |
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>
Diffstat (limited to 'src/plugins/texteditor/findinfiles.cpp')
| -rw-r--r-- | src/plugins/texteditor/findinfiles.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 9fc036e60a..bfc56b7f24 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -30,7 +30,7 @@ #include "findinfiles.h" #include <coreplugin/editormanager/editormanager.h> -#include <find/findplugin.h> +#include <coreplugin/find/findplugin.h> #include <utils/filesearch.h> #include <utils/fileutils.h> #include <utils/qtcassert.h> @@ -44,7 +44,7 @@ #include <QComboBox> #include <QHBoxLayout> -using namespace Find; +using namespace Core; using namespace TextEditor; static FindInFiles *m_instance = 0; @@ -72,7 +72,7 @@ QString FindInFiles::displayName() const return tr("Files on File System"); } -void FindInFiles::findAll(const QString &txt, Find::FindFlags findFlags) +void FindInFiles::findAll(const QString &txt, Core::FindFlags findFlags) { updateComboEntries(m_directory, true); BaseFileFind::findAll(txt, findFlags); @@ -195,5 +195,5 @@ void FindInFiles::findOnFileSystem(const QString &path) const QFileInfo fi(path); const QString folder = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath(); m_instance->setDirectory(folder); - Find::FindPlugin::instance()->openFindDialog(m_instance); + FindPlugin::instance()->openFindDialog(m_instance); } |