From ef0e1a64dc2fe293c3ff4d3506cac1923a8352ee Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 6 Oct 2009 16:00:32 +0200 Subject: [PATCH] Show a warning message when using global renaming. --- src/plugins/cppeditor/cppeditor.cpp | 10 ++++++++++ src/plugins/cppeditor/cppeditor.h | 1 + src/plugins/cpptools/cppfindreferences.cpp | 20 +++++++++++++------- src/plugins/find/searchresultwindow.cpp | 12 ++++++++++++ src/plugins/find/searchresultwindow.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index d8ebf6af6a..d048f6dee9 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -869,6 +869,16 @@ void CPPEditor::findUsages() void CPPEditor::renameUsages() { + Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"), + tr("This change cannot be undone."), + tr("Yes, I know what I am doing."), + this, SLOT(renameUsagesNow())); +} + +void CPPEditor::renameUsagesNow() +{ + Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename")); + m_currentRenameSelection = -1; QList selections; diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index dfba054375..b15e7d7555 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -192,6 +192,7 @@ public Q_SLOTS: void renameSymbolUnderCursor(); void renameUsages(); void findUsages(); + void renameUsagesNow(); void moveToPreviousToken(); void moveToNextToken(); diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 8faca99e0f..a5fd9c7eaa 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -58,7 +58,7 @@ #include #include #include - +#include #include using namespace CppTools::Internal; @@ -545,15 +545,20 @@ void CppFindReferences::findUsages(Symbol *symbol) void CppFindReferences::renameUsages(Symbol *symbol) { - Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchAndReplace); + if (Identifier *id = symbol->identifier()) { + const QString textToReplace = QString::fromUtf8(id->chars(), id->size()); - connect(search, SIGNAL(activated(Find::SearchResultItem)), - this, SLOT(openEditor(Find::SearchResultItem))); + Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchAndReplace); + _resultWindow->setTextToReplace(textToReplace); - connect(search, SIGNAL(replaceButtonClicked(QString,QList)), - SLOT(onReplaceButtonClicked(QString,QList))); + connect(search, SIGNAL(activated(Find::SearchResultItem)), + this, SLOT(openEditor(Find::SearchResultItem))); - findAll_helper(symbol); + connect(search, SIGNAL(replaceButtonClicked(QString,QList)), + SLOT(onReplaceButtonClicked(QString,QList))); + + findAll_helper(symbol); + } } void CppFindReferences::findAll_helper(Symbol *symbol) @@ -651,6 +656,7 @@ void CppFindReferences::onReplaceButtonClicked(const QString &text, const QStringList fileNames = changes.keys(); _modelManager->updateSourceFiles(fileNames); + _resultWindow->hide(); } void CppFindReferences::displayResult(int index) diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index 2f846cd89c..a995dfc5b7 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -104,6 +104,17 @@ SearchResultWindow::~SearchResultWindow() m_items.clear(); } +void SearchResultWindow::setTextToReplace(const QString &textToReplace) +{ + m_replaceTextEdit->setText(textToReplace); + m_replaceTextEdit->selectAll(); +} + +QString SearchResultWindow::textToReplace() const +{ + return m_replaceTextEdit->text(); +} + void SearchResultWindow::setShowReplaceUI(bool show) { m_searchResultTreeView->model()->setShowReplaceUI(show); @@ -169,6 +180,7 @@ SearchResult *SearchResultWindow::startNewSearch(SearchMode searchOrSearchAndRep void SearchResultWindow::clearContents() { setReplaceUIEnabled(false); + m_replaceTextEdit->clear(); m_searchResultTreeView->clear(); m_items.clear(); m_widget->setCurrentWidget(m_searchResultTreeView); diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h index 093eb26884..c41ca3424f 100644 --- a/src/plugins/find/searchresultwindow.h +++ b/src/plugins/find/searchresultwindow.h @@ -106,6 +106,9 @@ public: void setShowReplaceUI(bool show); bool isShowingReplaceUI() const; + void setTextToReplace(const QString &textToReplace); + QString textToReplace() const; + // search result object only lives till next startnewsearch call SearchResult *startNewSearch(SearchMode searchOrSearchAndReplace = SearchOnly); -- GitLab