From b0fb2de04e5d87967f1646b06fbad7f5b1ac343c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 4 May 2022 16:19:00 +0200 Subject: [PATCH] MinimizableInfoBars: Move to Utils Change-Id: I6b42948c4bddaa396122b845c5c1e2aa70d8aaad Reviewed-by: Christian Kandeler --- src/libs/utils/CMakeLists.txt | 2 ++ src/libs/utils/infobar.cpp | 5 ++++ src/libs/utils/infobar.h | 1 + .../utils/minimizableinfobars.cpp} | 29 +++++++++---------- .../utils/minimizableinfobars.h} | 16 +++++----- src/libs/utils/utils.qbs | 2 ++ src/plugins/cppeditor/CMakeLists.txt | 1 - src/plugins/cppeditor/cppeditor.qbs | 2 -- src/plugins/cppeditor/cppeditordocument.cpp | 2 +- src/plugins/cppeditor/cppeditordocument.h | 6 ++-- src/plugins/cppeditor/cppeditorwidget.cpp | 1 - 11 files changed, 35 insertions(+), 32 deletions(-) rename src/{plugins/cppeditor/cppminimizableinfobars.cpp => libs/utils/minimizableinfobars.cpp} (89%) rename src/{plugins/cppeditor/cppminimizableinfobars.h => libs/utils/minimizableinfobars.h} (90%) diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index f4bf3cb022d..37579263d0a 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -88,6 +88,8 @@ add_qtc_library(Utils macroexpander.cpp macroexpander.h mapreduce.h mimeutils.h + minimizableinfobars.cpp + minimizableinfobars.h multitextcursor.cpp multitextcursor.h namevaluedictionary.cpp namevaluedictionary.h namevaluedictionary.cpp namevaluedictionary.h diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp index 831ba27e6f2..876ae85df42 100644 --- a/src/libs/utils/infobar.cpp +++ b/src/libs/utils/infobar.cpp @@ -216,6 +216,11 @@ void InfoBar::initialize(QSettings *settings) } } +QSettings *InfoBar::settings() +{ + return m_settings; +} + void InfoBar::clearGloballySuppressed() { globallySuppressed.clear(); diff --git a/src/libs/utils/infobar.h b/src/libs/utils/infobar.h index df015c96883..b437182ab42 100644 --- a/src/libs/utils/infobar.h +++ b/src/libs/utils/infobar.h @@ -124,6 +124,7 @@ public: static bool anyGloballySuppressed(); static void initialize(QSettings *settings); + static QSettings *settings(); signals: void changed(); diff --git a/src/plugins/cppeditor/cppminimizableinfobars.cpp b/src/libs/utils/minimizableinfobars.cpp similarity index 89% rename from src/plugins/cppeditor/cppminimizableinfobars.cpp rename to src/libs/utils/minimizableinfobars.cpp index daef096f208..15c9ad76cbf 100644 --- a/src/plugins/cppeditor/cppminimizableinfobars.cpp +++ b/src/libs/utils/minimizableinfobars.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -23,23 +23,18 @@ ** ****************************************************************************/ -#include "cppminimizableinfobars.h" +#include "minimizableinfobars.h" + +#include "qtcassert.h" +#include "qtcsettings.h" +#include "utilsicons.h" #include -#include -#include -#include -#include - const char SETTINGS_PREFIX[] = "ShowInfoBarFor"; const bool kShowInInfoBarDefault = true; -using namespace Core; -using namespace Utils; - -namespace CppEditor { -namespace Internal { +namespace Utils { MinimizableInfoBars::MinimizableInfoBars(InfoBar &infoBar) : m_infoBar(infoBar) @@ -147,13 +142,15 @@ void MinimizableInfoBars::showInfoBar(const Id &id) bool MinimizableInfoBars::showInInfoBar(const Id &id) const { - return ICore::settings()->value(settingsKey(id), kShowInInfoBarDefault).toBool(); + return InfoBar::settings()->value(settingsKey(id), kShowInInfoBarDefault).toBool(); } void MinimizableInfoBars::setShowInInfoBar(const Id &id, bool show) { - ICore::settings()->setValueWithDefault(settingsKey(id), show, kShowInInfoBarDefault); + QtcSettings::setValueWithDefault(InfoBar::settings(), + settingsKey(id), + show, + kShowInInfoBarDefault); } -} // namespace Internal -} // namespace CppEditor +} // namespace Utils diff --git a/src/plugins/cppeditor/cppminimizableinfobars.h b/src/libs/utils/minimizableinfobars.h similarity index 90% rename from src/plugins/cppeditor/cppminimizableinfobars.h rename to src/libs/utils/minimizableinfobars.h index 2bd6a28a49d..2087343d666 100644 --- a/src/plugins/cppeditor/cppminimizableinfobars.h +++ b/src/libs/utils/minimizableinfobars.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -25,8 +25,10 @@ #pragma once -#include -#include +#include "utils_global.h" + +#include "id.h" +#include "infobar.h" #include #include @@ -34,10 +36,9 @@ #include -namespace CppEditor { -namespace Internal { +namespace Utils { -class MinimizableInfoBars : public QObject +class QTCREATOR_UTILS_EXPORT MinimizableInfoBars : public QObject { Q_OBJECT @@ -73,5 +74,4 @@ private: QHash m_infoEntries; }; -} // namespace Internal -} // namespace CppEditor +} // namespace Utils diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 4f3f00a9358..24143c9d243 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -182,6 +182,8 @@ Project { "macroexpander.h", "mapreduce.h", "mimeutils.h", + "minimizableinfobars.cpp", + "minimizableinfobars.h", "multitextcursor.cpp", "multitextcursor.h", "namevaluedictionary.cpp", diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt index de8b7262689..b25ab9dab3a 100644 --- a/src/plugins/cppeditor/CMakeLists.txt +++ b/src/plugins/cppeditor/CMakeLists.txt @@ -60,7 +60,6 @@ add_qtc_plugin(CppEditor cpplocalsymbols.cpp cpplocalsymbols.h cpplocatordata.cpp cpplocatordata.h cpplocatorfilter.cpp cpplocatorfilter.h - cppminimizableinfobars.cpp cppminimizableinfobars.h cppmodelmanager.cpp cppmodelmanager.h cppmodelmanagersupport.cpp cppmodelmanagersupport.h cppoutline.cpp cppoutline.h diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 43724dda13c..523f81073b0 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -138,8 +138,6 @@ QtcPlugin { "cpplocatordata.h", "cpplocatorfilter.cpp", "cpplocatorfilter.h", - "cppminimizableinfobars.cpp", - "cppminimizableinfobars.h", "cppmodelmanager.cpp", "cppmodelmanager.h", "cppmodelmanagersupport.cpp", diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index 442fd8036d6..4a1bbc35fbf 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -413,7 +413,7 @@ QFuture CppEditorDocument::cursorInfo(const CursorInfoParams ¶ms return processor()->cursorInfo(params); } -const MinimizableInfoBars &CppEditorDocument::minimizableInfoBars() const +const Utils::MinimizableInfoBars &CppEditorDocument::minimizableInfoBars() const { return m_minimizableInfoBars; } diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h index 24f77691c59..384f57db864 100644 --- a/src/plugins/cppeditor/cppeditordocument.h +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -27,13 +27,13 @@ #include "baseeditordocumentprocessor.h" #include "cppcompletionassistprovider.h" -#include "cppminimizableinfobars.h" #include "cppmodelmanager.h" #include "cppparsecontext.h" #include "cppsemanticinfo.h" #include "editordocumenthandle.h" #include +#include #include #include @@ -65,7 +65,7 @@ public: void scheduleProcessDocument(); - const MinimizableInfoBars &minimizableInfoBars() const; + const Utils::MinimizableInfoBars &minimizableInfoBars() const; ParseContextModel &parseContextModel(); QFuture cursorInfo(const CursorInfoParams ¶ms); @@ -135,7 +135,7 @@ private: // (Un)Registration in CppModelManager QScopedPointer m_editorDocumentHandle; - MinimizableInfoBars m_minimizableInfoBars; + Utils::MinimizableInfoBars m_minimizableInfoBars; ParseContextModel m_parseContextModel; }; diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index d900071c3c6..9a73d1f2e83 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -39,7 +39,6 @@ #include "cppfunctiondecldeflink.h" #include "cpphighlighter.h" #include "cpplocalrenaming.h" -#include "cppminimizableinfobars.h" #include "cppmodelmanager.h" #include "cpppreprocessordialog.h" #include "cppsemanticinfo.h"