diff options
| author | con <qtc-committer@nokia.com> | 2009-10-05 17:26:13 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-05 17:26:13 +0200 |
| commit | ddb78427611dabebadba8ecb401d633ebe986f94 (patch) | |
| tree | b1089cad97a1042b1f27e9f9ada9d947402affee /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 44e2704bc151cfe508b449969a4a47a2b749cbd9 (diff) | |
| parent | fa2ca2dee15084af3dfaec5284fc0757e9de4a10 (diff) | |
| download | qt-creator-ddb78427611dabebadba8ecb401d633ebe986f94.tar.gz | |
Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3
Conflicts:
src/plugins/cpptools/cppfindreferences.cpp
src/plugins/cpptools/cpptoolsplugin.cpp
src/plugins/texteditor/basefilefind.cpp
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index b4952f334f..c3f09a98f1 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -96,7 +96,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag SemanticSearchFactory::Ptr factory(new SearchClassDeclarationsFactory(text, findFlags)); - QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory); + QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory); m_watcher.setFuture(result); @@ -109,7 +109,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag void FindClassDeclarations::displayResult(int index) { - Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index); + Utils::FileSearchResult result = m_watcher.future().resultAt(index); _resultWindow->addResult(result.fileName, result.lineNumber, result.matchingLine, @@ -149,7 +149,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi SemanticSearchFactory::Ptr factory(new SearchFunctionCallFactory(text, findFlags)); - QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory); + QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory); m_watcher.setFuture(result); @@ -162,7 +162,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi void FindFunctionCalls::displayResult(int index) { - Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index); + Utils::FileSearchResult result = m_watcher.future().resultAt(index); _resultWindow->addResult(result.fileName, result.lineNumber, result.matchingLine, |