feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Merge Find and Locator into Core plugin

Browse Source 
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>
This commit is contained in:
hjk
2014-01-13 16:17:34 +01:00
committed by Eike Ziller
parent 8b854270a6
commit 4d96fa7aba
239 changed files with 1625 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/findinfiles.cpp
View File

@@ -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);
}