diff options
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 2945301128..b4952f334f 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -86,7 +86,10 @@ FindClassDeclarations::FindClassDeclarations(CppModelManager *modelManager) void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlags findFlags) { - _resultWindow->clearContents(); + Find::SearchResult *search = _resultWindow->startNewSearch(); + connect(search, SIGNAL(activated(Find::SearchResultItem)), + this, SLOT(openEditor(Find::SearchResultItem))); + _resultWindow->popup(true); Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager(); @@ -107,14 +110,11 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag void FindClassDeclarations::displayResult(int index) { Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index); - Find::ResultWindowItem *item = _resultWindow->addResult(result.fileName, - result.lineNumber, - result.matchingLine, - result.matchStart, - result.matchLength); - if (item) - connect(item, SIGNAL(activated(const QString&,int,int)), - this, SLOT(openEditor(const QString&,int,int))); + _resultWindow->addResult(result.fileName, + result.lineNumber, + result.matchingLine, + result.matchStart, + result.matchLength); } void FindClassDeclarations::searchFinished() @@ -122,9 +122,9 @@ void FindClassDeclarations::searchFinished() emit changed(); } -void FindClassDeclarations::openEditor(const QString &fileName, int line, int column) +void FindClassDeclarations::openEditor(const Find::SearchResultItem &item) { - TextEditor::BaseTextEditor::openEditorAt(fileName, line, column); + TextEditor::BaseTextEditor::openEditorAt(item.fileName, item.lineNumber, item.searchTermStart); } ////// @@ -139,7 +139,10 @@ FindFunctionCalls::FindFunctionCalls(CppModelManager *modelManager) void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags findFlags) { - _resultWindow->clearContents(); + Find::SearchResult *search = _resultWindow->startNewSearch(); + connect(search, SIGNAL(activated(Find::SearchResultItem)), + this, SLOT(openEditor(Find::SearchResultItem))); + _resultWindow->popup(true); Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager(); @@ -160,14 +163,11 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi void FindFunctionCalls::displayResult(int index) { Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index); - Find::ResultWindowItem *item = _resultWindow->addResult(result.fileName, - result.lineNumber, - result.matchingLine, - result.matchStart, - result.matchLength); - if (item) - connect(item, SIGNAL(activated(const QString&,int,int)), - this, SLOT(openEditor(const QString&,int,int))); + _resultWindow->addResult(result.fileName, + result.lineNumber, + result.matchingLine, + result.matchStart, + result.matchLength); } void FindFunctionCalls::searchFinished() @@ -175,9 +175,9 @@ void FindFunctionCalls::searchFinished() emit changed(); } -void FindFunctionCalls::openEditor(const QString &fileName, int line, int column) +void FindFunctionCalls::openEditor(const Find::SearchResultItem &item) { - TextEditor::BaseTextEditor::openEditorAt(fileName, line, column); + TextEditor::BaseTextEditor::openEditorAt(item.fileName, item.lineNumber, item.searchTermStart); } |