summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppfindreferences.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-06 16:06:25 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-12 20:10:03 +0200
commita14955d0fb3167436a584eaf318e5da86a4175bb (patch)
treee0a7ead71191f80b96bb4d0e12cdcb663d769471 /src/plugins/cpptools/cppfindreferences.cpp
parentf52e09a965ec42876b401e12a37e6269dd0413c0 (diff)
downloadqt-creator-a14955d0fb3167436a584eaf318e5da86a4175bb.tar.gz
move the "cannot undo" warning to the search result pane
this is where it belongs, rather than into some arbitrary editor. as a nice side effect, now not only the "rename symbol", but also the global search&replace has such a warning.
Diffstat (limited to 'src/plugins/cpptools/cppfindreferences.cpp')
-rw-r--r--src/plugins/cpptools/cppfindreferences.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 9ae54543db..dfc519effd 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -242,7 +242,8 @@ void CppFindReferences::renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus:
const QString textToReplace = replacement.isEmpty()
? QString::fromUtf8(id->chars(), id->size()) : replacement;
- Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchAndReplace);
+ Find::SearchResult *search = _resultWindow->startNewSearch(
+ Find::SearchResultWindow::SearchAndReplace, QLatin1String("CppEditor"));
_resultWindow->setTextToReplace(textToReplace);
connect(search, SIGNAL(activated(Find::SearchResultItem)),
@@ -280,10 +281,6 @@ void CppFindReferences::findAll_helper(Symbol *symbol, const LookupContext &cont
void CppFindReferences::onReplaceButtonClicked(const QString &text,
const QList<Find::SearchResultItem> &items)
{
- // FIXME: abuse
- Core::EditorManager::instance()->currentEditor()->file()->infoBar()->removeInfo(
- QLatin1String("CppEditor.Rename"));
-
const QStringList fileNames = TextEditor::BaseFileFind::replaceAll(text, items);
if (!fileNames.isEmpty()) {
_modelManager->updateSourceFiles(fileNames);