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

C++: fix find/rename macro usages.

Browse Source 
The replace button was not connected. Also made the search restarting
slightly more robust.

Change-Id: Iad7aea436749c0bda6ec4f58776e73b598a12a23
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Erik Verbruggen
2013-02-01 11:56:40 +01:00
parent 858cb6e348
commit 87a78cddff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -562,7 +562,7 @@ public:
Document::Ptr doc = snapshot.document(fileName);
QString source;
_Lrestart:
restart_search:
if (future->isPaused())
future->waitForResume();
if (future->isCanceled())
@@ -579,7 +579,8 @@ _Lrestart:
if (macro.fileRevision() > useMacro.fileRevision()) {
// yes, it is outdated, so re-preprocess and start from scratch for this file.
doc = snapshot.preprocessedDocument(source, fileName);
goto _Lrestart;
usages.clear();
goto restart_search;
}
if (macro.name() == useMacro.name()) {
@@ -655,8 +656,8 @@ void CppFindReferences::findMacroUses(const Macro &macro, const QString &replace
QLatin1String("CppEditor"));
search->setTextToReplace(replacement);
connect(search, SIGNAL(replaceButtonClicked(QString,QList<Find::SearchResultItem>)),
SLOT(onReplaceButtonClicked(QString,QList<Find::SearchResultItem>)));
connect(search, SIGNAL(replaceButtonClicked(QString,QList<Find::SearchResultItem>,bool)),
SLOT(onReplaceButtonClicked(QString,QList<Find::SearchResultItem>,bool)));
Find::SearchResultWindow::instance()->popup(Core::IOutputPane::ModeSwitch | Core::IOutputPane::WithFocus);