From bcc5d62a596a32199cd158c132fdc90cddff1397 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 9 Nov 2024 15:15:17 +0100 Subject: [PATCH] refactor: Remove restricted class for less coupling --- src/blackcore/application.cpp | 2 +- src/blackcore/webdataservices.cpp | 3 +-- src/blackcore/webdataservices.h | 5 +---- src/blackgui/guiapplication.h | 2 +- src/blackgui/stylesheetutility.cpp | 3 +-- src/blackgui/stylesheetutility.h | 5 +---- src/blackmisc/CMakeLists.txt | 1 - src/blackmisc/restricted.h | 25 ------------------------- 8 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 src/blackmisc/restricted.h diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 35e7c2619..8c3c77f27 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -805,7 +805,7 @@ namespace BlackCore if (!m_webDataServices) { msgs.push_back(CStatusMessage(this).info(u"Will start web data services now")); - m_webDataServices.reset(new CWebDataServices(webReader, dbReaderConfig, {}, this)); + m_webDataServices.reset(new CWebDataServices(webReader, dbReaderConfig, this)); Q_ASSERT_X(m_webDataServices, Q_FUNC_INFO, "Missing web services"); emit this->webDataServicesStarted(true); diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 88a994514..1c5e7416e 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -18,7 +18,6 @@ #include "blackmisc/fileutils.h" #include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" -#include "blackmisc/restricted.h" #include "blackmisc/statusmessage.h" #include "blackmisc/worker.h" #include "blackmisc/threadutils.h" @@ -47,7 +46,7 @@ using namespace BlackMisc::Weather; namespace BlackCore { - CWebDataServices::CWebDataServices(CWebReaderFlags::WebReader readers, const CDatabaseReaderConfigList &dbReaderConfig, BlackMisc::Restricted, QObject *parent) : QObject(parent), m_dbReaderConfig(dbReaderConfig) + CWebDataServices::CWebDataServices(CWebReaderFlags::WebReader readers, const CDatabaseReaderConfigList &dbReaderConfig, QObject *parent) : QObject(parent), m_dbReaderConfig(dbReaderConfig) { if (!sApp) { return; } // shutting down diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index 5c9584d48..038baf50e 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -26,7 +26,6 @@ #include "blackmisc/network/voicecapabilities.h" #include "blackmisc/weather/metarlist.h" #include "blackmisc/weather/metar.h" -#include "blackmisc/restricted.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/countrylist.h" @@ -55,8 +54,6 @@ namespace BlackMisc namespace BlackCore { - class CApplication; - namespace Vatsim { class CVatsimDataFileReader; @@ -88,7 +85,7 @@ namespace BlackCore static const QStringList &getLogCategories(); //! Constructor, only allowed from BlackCore::CApplication - CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, BlackMisc::Restricted, QObject *parent = nullptr); + CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, QObject *parent = nullptr); //! Destructor virtual ~CWebDataServices() override; diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index b6e265b81..28ee9f247 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -325,7 +325,7 @@ namespace BlackGui QCommandLineOption m_cmdWindowMode { "emptyWindowMode" }; //!< window mode (flags: frameless ...) QCommandLineOption m_cmdWindowSizeReset { "emptySizeReset" }; //!< window size reset QCommandLineOption m_cmdWindowScaleSize { "emptyScale" }; //!< window scale size - CStyleSheetUtility m_styleSheetUtility { {}, this }; //!< style sheet utility + CStyleSheetUtility m_styleSheetUtility { this }; //!< style sheet utility bool m_uiSetupCompleted = false; //!< ui setup completed bool m_saveMainWidgetState = true; //!< save/restore main widget's state bool m_frontBack = true; //!< for front/back toggle diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index e2fa234ef..0cef804d0 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -7,7 +7,6 @@ #include "blackmisc/logmessage.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" -#include "blackmisc/restricted.h" #include #include @@ -31,7 +30,7 @@ using namespace BlackMisc; namespace BlackGui { - CStyleSheetUtility::CStyleSheetUtility(BlackMisc::Restricted, QObject *parent) : QObject(parent) + CStyleSheetUtility::CStyleSheetUtility(QObject *parent) : QObject(parent) { this->read(); connect(&m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &CStyleSheetUtility::qssDirectoryChanged); diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index 5378c989a..1271dd2cd 100644 --- a/src/blackgui/stylesheetutility.h +++ b/src/blackgui/stylesheetutility.h @@ -8,7 +8,6 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/logcategories.h" -#include "blackmisc/restricted.h" #include "blackmisc/digestsignal.h" #include @@ -25,8 +24,6 @@ class QWidget; namespace BlackGui { - class CGuiApplication; - //! Reads and provides style sheets class BLACKGUI_EXPORT CStyleSheetUtility : public QObject { @@ -34,7 +31,7 @@ namespace BlackGui public: //! Constructor - explicit CStyleSheetUtility(BlackMisc::Restricted, QObject *parent = nullptr); + explicit CStyleSheetUtility(QObject *parent = nullptr); //! Log cats. static const QStringList &getLogCategories(); diff --git a/src/blackmisc/CMakeLists.txt b/src/blackmisc/CMakeLists.txt index 97cdac4d1..a83f16580 100644 --- a/src/blackmisc/CMakeLists.txt +++ b/src/blackmisc/CMakeLists.txt @@ -298,7 +298,6 @@ add_library(misc SHARED range.h registermetadata.cpp registermetadata.h - restricted.h rgbcolor.cpp rgbcolor.h sequence.cpp diff --git a/src/blackmisc/restricted.h b/src/blackmisc/restricted.h deleted file mode 100644 index ebb4d673a..000000000 --- a/src/blackmisc/restricted.h +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -#ifndef BLACKMISC_RESTRICTED_H -#define BLACKMISC_RESTRICTED_H - -namespace BlackMisc -{ - /*! - * Restricted is just an empty class, that can only be constructed by the class T. - */ - template - class Restricted - { - private: - friend T; - - //! Constructor is only available to the template parameter T. - Restricted() {} - }; -} - -#endif // guard