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

Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3

Browse Source 
Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp
This commit is contained in:
con
2009-10-05 17:26:13 +02:00
parent 44e2704bc1 fa2ca2dee1
commit ddb7842761
272 changed files with 1240 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@
#include <QtGui/QPushButton>
#include <QtGui/QFileDialog>
using namespace Core::Utils;
using namespace Utils;
using namespace Find;
using namespace TextEditor;
@@ -95,9 +95,9 @@ void BaseFileFind::findAll(const QString &txt, QTextDocument::FindFlags findFlag
connect(result, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
m_resultWindow->popup(true);
if (m_useRegExp)
m_watcher.setFuture(Core::Utils::findInFilesRegExp(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
m_watcher.setFuture(Utils::findInFilesRegExp(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
else
m_watcher.setFuture(Core::Utils::findInFiles(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
m_watcher.setFuture(Utils::findInFiles(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
Core::FutureProgress *progress =
Core::ICore::instance()->progressManager()->addTask(m_watcher.future(),
"Search",
@@ -109,7 +109,7 @@ void BaseFileFind::findAll(const QString &txt, QTextDocument::FindFlags findFlag
}
void BaseFileFind::displayResult(int index) {
Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Utils::FileSearchResult result = m_watcher.future().resultAt(index);
m_resultWindow->addResult(result.fileName,
result.lineNumber,
result.matchingLine,