From f93ad9091f96e5b9aa0c184e5ce04024cd2f2c89 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 4 Jan 2023 12:48:49 +0100 Subject: [PATCH] ExtraCompiler: Get rid of setCompileIssues() This basically reverts 8643877c337e3ab4f3ec57570ba5441c1fa7c619. The setCompileIssues() introduced there wasn't used anywhere. Since the "issues" field is always empty, the updateIssues() is no-op. Change-Id: I7e7e5fc9778343fbaafc717b80188a65ba7adc39 Reviewed-by: Ulf Hermann Reviewed-by: Reviewed-by: Qt CI Bot --- src/plugins/projectexplorer/extracompiler.cpp | 40 ------------------- src/plugins/projectexplorer/extracompiler.h | 2 - 2 files changed, 42 deletions(-) diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index 10672fdfe65..5313275dec3 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -10,9 +10,6 @@ #include #include -#include -#include -#include #include #include @@ -36,7 +33,6 @@ public: const Project *project; FilePath source; FileNameToContentsHash contents; - Tasks issues; QDateTime compileTime; Core::IEditor *lastEditor = nullptr; QMetaObject::Connection activeBuildConfigConnection; @@ -44,7 +40,6 @@ public: bool dirty = false; QTimer timer; - void updateIssues(); FutureSynchronizer m_futureSynchronizer; std::unique_ptr m_taskTree; @@ -226,7 +221,6 @@ void ExtraCompiler::onEditorChanged(Core::IEditor *editor) if (editor && editor->document()->filePath() == d->source) { d->lastEditor = editor; - d->updateIssues(); // Handle new editor connect(d->lastEditor->document(), &Core::IDocument::contentsChanged, @@ -276,40 +270,6 @@ Environment ExtraCompiler::buildEnvironment() const return Environment::systemEnvironment(); } -void ExtraCompiler::setCompileIssues(const Tasks &issues) -{ - d->issues = issues; - d->updateIssues(); -} - -void ExtraCompilerPrivate::updateIssues() -{ - if (!lastEditor) - return; - - auto widget = qobject_cast(lastEditor->widget()); - if (!widget) - return; - - QList selections; - const QTextDocument *document = widget->document(); - for (const Task &issue : std::as_const(issues)) { - QTextEdit::ExtraSelection selection; - QTextCursor cursor(document->findBlockByNumber(issue.line - 1)); - cursor.movePosition(QTextCursor::StartOfLine); - cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor); - selection.cursor = cursor; - - const auto fontSettings = TextEditor::TextEditorSettings::fontSettings(); - selection.format = fontSettings.toTextCharFormat(issue.type == Task::Warning ? - TextEditor::C_WARNING : TextEditor::C_ERROR); - selection.format.setToolTip(issue.description()); - selections.append(selection); - } - - widget->setExtraSelections(TextEditor::TextEditorWidget::CodeWarningsSelection, selections); -} - Utils::FutureSynchronizer *ExtraCompiler::futureSynchronizer() const { return &d->m_futureSynchronizer; diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h index eb3704113b8..7d595b87260 100644 --- a/src/plugins/projectexplorer/extracompiler.h +++ b/src/plugins/projectexplorer/extracompiler.h @@ -5,7 +5,6 @@ #include "projectnodes.h" #include "project.h" -#include "task.h" #include @@ -67,7 +66,6 @@ protected: void setContent(const Utils::FilePath &file, const QByteArray &content); void updateCompileTime(); Utils::Environment buildEnvironment() const; - void setCompileIssues(const Tasks &issues); using ContentProvider = std::function; private: