diff options
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r-- | src/plugins/cppeditor/cppeditordocument.cpp | 31 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditordocument.h | 3 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditorwidget.cpp | 4 |
3 files changed, 13 insertions, 25 deletions
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index 4a1bbc35fb..edd776f537 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -50,6 +50,7 @@ #include <utils/executeondestruction.h> #include <utils/infobar.h> #include <utils/mimeutils.h> +#include <utils/minimizableinfobars.h> #include <utils/qtcassert.h> #include <utils/runextensions.h> @@ -106,7 +107,6 @@ private: }; CppEditorDocument::CppEditorDocument() - : m_minimizableInfoBars(*infoBar()) { setId(CppEditor::Constants::CPPEDITOR_ID); setSyntaxHighlighter(new CppHighlighter); @@ -130,8 +130,8 @@ CppEditorDocument::CppEditorDocument() connect(&m_parseContextModel, &ParseContextModel::preferredParseContextChanged, this, &CppEditorDocument::reparseWithPreferredParseContext); - m_minimizableInfoBars.setSettingsGroup(Constants::CPPEDITOR_SETTINGSGROUP); - m_minimizableInfoBars.setPossibleInfoBarEntries( + minimizableInfoBars()->setSettingsGroup(Constants::CPPEDITOR_SETTINGSGROUP); + minimizableInfoBars()->setPossibleInfoBarEntries( {{NO_PROJECT_CONFIGURATION, tr("<b>Warning</b>: This file is not part of any project. " "The code model might have issues parsing this file properly.")}}); @@ -413,25 +413,20 @@ QFuture<CursorInfo> CppEditorDocument::cursorInfo(const CursorInfoParams ¶ms return processor()->cursorInfo(params); } -const Utils::MinimizableInfoBars &CppEditorDocument::minimizableInfoBars() const -{ - return m_minimizableInfoBars; -} - BaseEditorDocumentProcessor *CppEditorDocument::processor() { if (!m_processor) { m_processor.reset(mm()->createEditorDocumentProcessor(this)); - connect(m_processor.data(), &BaseEditorDocumentProcessor::projectPartInfoUpdated, - [this] (const ProjectPartInfo &info) - { - const bool hasProjectPart = !(info.hints & ProjectPartInfo::IsFallbackMatch); - m_minimizableInfoBars.setInfoVisible(NO_PROJECT_CONFIGURATION, !hasProjectPart); - m_parseContextModel.update(info); - const bool isAmbiguous = info.hints & ProjectPartInfo::IsAmbiguousMatch; - const bool isProjectFile = info.hints & ProjectPartInfo::IsFromProjectMatch; - showHideInfoBarAboutMultipleParseContexts(isAmbiguous && isProjectFile); - }); + connect(m_processor.data(), + &BaseEditorDocumentProcessor::projectPartInfoUpdated, + [this](const ProjectPartInfo &info) { + const bool hasProjectPart = !(info.hints & ProjectPartInfo::IsFallbackMatch); + minimizableInfoBars()->setInfoVisible(NO_PROJECT_CONFIGURATION, !hasProjectPart); + m_parseContextModel.update(info); + const bool isAmbiguous = info.hints & ProjectPartInfo::IsAmbiguousMatch; + const bool isProjectFile = info.hints & ProjectPartInfo::IsFromProjectMatch; + showHideInfoBarAboutMultipleParseContexts(isAmbiguous && isProjectFile); + }); connect(m_processor.data(), &BaseEditorDocumentProcessor::codeWarningsUpdated, [this] (unsigned revision, const QList<QTextEdit::ExtraSelection> selections, diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h index 384f57db86..471ba99c9b 100644 --- a/src/plugins/cppeditor/cppeditordocument.h +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -33,7 +33,6 @@ #include "editordocumenthandle.h" #include <texteditor/textdocument.h> -#include <utils/minimizableinfobars.h> #include <QMutex> #include <QTimer> @@ -65,7 +64,6 @@ public: void scheduleProcessDocument(); - const Utils::MinimizableInfoBars &minimizableInfoBars() const; ParseContextModel &parseContextModel(); QFuture<CursorInfo> cursorInfo(const CursorInfoParams ¶ms); @@ -135,7 +133,6 @@ private: // (Un)Registration in CppModelManager QScopedPointer<CppEditorDocumentHandle> m_editorDocumentHandle; - Utils::MinimizableInfoBars m_minimizableInfoBars; ParseContextModel m_parseContextModel; }; diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 9a73d1f2e8..7c09724eee 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -552,10 +552,6 @@ void CppEditorWidget::finalizeInitialization() insertExtraToolBarWidget(TextEditorWidget::Left, d->m_preprocessorButton); } - // Toolbar: Actions to show minimized info bars - d->m_cppEditorDocument->minimizableInfoBars().createShowInfoBarActions( - [this](QWidget *w) { return this->insertExtraToolBarWidget(TextEditorWidget::Left, w); }); - d->m_outlineTimer.setInterval(5000); d->m_outlineTimer.setSingleShot(true); connect(&d->m_outlineTimer, &QTimer::timeout, this, [this] { |