From 170527ae238eb69dba5cb43624ff7850b9d59daa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 2 Jun 2022 00:50:44 +0200 Subject: [PATCH] CppEditorWidget: Get rid of unused methods Change-Id: Idb3b14089b8eb833530834ffb5583dda0b8917de Reviewed-by: Qt CI Bot Reviewed-by: Christian Kandeler --- src/plugins/cppeditor/cppeditorwidget.cpp | 70 ------------------- src/plugins/cppeditor/cppmodelmanager.h | 1 - .../cppeditor/cppmodelmanagersupport.h | 1 - 3 files changed, 72 deletions(-) diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 1bb5ec7b96d..f6409bdbd1c 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -714,76 +714,6 @@ static QTextDocument *getOpenDocument(const QString &path) return {}; } -static void addSearchResults(Usages usages, SearchResult &search, const QString &text) -{ - std::sort(usages.begin(), usages.end()); - - std::unique_ptr currentDocument; - QString lastPath; - - for (const Usage &usage : usages) { - QTextDocument *document = getOpenDocument(usage.path); - - if (!document) { - if (usage.path != lastPath) { - currentDocument = getCurrentDocument(usage.path); - lastPath = usage.path; - } - document = currentDocument.get(); - } - - const QString lineContent = getDocumentLine(document, usage.line); - - if (!lineContent.isEmpty()) { - Search::TextRange range{Search::TextPosition(usage.line, usage.column - 1), - Search::TextPosition(usage.line, usage.column + text.length() - 1)}; - SearchResultItem item; - item.setFilePath(FilePath::fromString(usage.path)); - item.setLineText(lineContent); - item.setMainRange(range); - item.setUseTextEditorFont(true); - search.addResult(item); - } - } -} - -static void findRenameCallback(CppEditorWidget *widget, - const QTextCursor &baseCursor, - const Usages &usages, - bool rename = false, - const QString &replacement = QString()) -{ - QTextCursor cursor = Utils::Text::wordStartCursor(baseCursor); - cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor); - const QString text = cursor.selectedText(); - SearchResultWindow::SearchMode mode = SearchResultWindow::SearchOnly; - if (rename) - mode = SearchResultWindow::SearchAndReplace; - SearchResult *search = SearchResultWindow::instance()->startNewSearch( - QObject::tr("C++ Usages:"), - QString(), - text, - mode, - SearchResultWindow::PreserveCaseDisabled, - QLatin1String("CppEditor")); - search->setTextToReplace(replacement); - search->setSearchAgainSupported(true); - QObject::connect(search, &SearchResult::replaceButtonClicked, &onReplaceUsagesClicked); - QObject::connect(search, &SearchResult::searchAgainRequested, - [widget, rename, replacement, baseCursor]() { - rename ? widget->renameUsages(replacement, baseCursor) : widget->findUsages(baseCursor); - }); - - addSearchResults(usages, *search, text); - - search->finishSearch(false); - QObject::connect(search, &SearchResult::activated, - [](const Core::SearchResultItem& item) { - Core::EditorManager::openEditorAtSearchResult(item); - }); - search->popup(); -} - void CppEditorWidget::findUsages() { findUsages(textCursor()); diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h index 591fda2a17b..a475c8e4f37 100644 --- a/src/plugins/cppeditor/cppmodelmanager.h +++ b/src/plugins/cppeditor/cppmodelmanager.h @@ -30,7 +30,6 @@ #include "cursorineditor.h" #include "projectinfo.h" #include "projectpart.h" -#include "usages.h" #include #include diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h index 522010c1ad2..44fff4b4f65 100644 --- a/src/plugins/cppeditor/cppmodelmanagersupport.h +++ b/src/plugins/cppeditor/cppmodelmanagersupport.h @@ -27,7 +27,6 @@ #include "cppeditor_global.h" #include "cursorineditor.h" -#include "usages.h" #include