refactor: Remove restricted class for less coupling

swift-project · Nov 9, 2024 · bad3220 · bad3220
1 parent 083f98c
commit bad3220
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 38 deletions.
diff --git 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<CApplication>, 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
@@ -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<CApplication>, QObject *parent = nullptr);
+        CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, QObject *parent = nullptr);
 
         //! Destructor
         virtual ~CWebDataServices() override;

diff --git 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 <QAbstractScrollArea>
 #include <QCoreApplication>
@@ -31,7 +30,7 @@ using namespace BlackMisc;
 
 namespace BlackGui
 {
-    CStyleSheetUtility::CStyleSheetUtility(BlackMisc::Restricted<CGuiApplication>, 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
@@ -8,7 +8,6 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/restricted.h"
 #include "blackmisc/digestsignal.h"
 
 #include <QFileSystemWatcher>
@@ -25,16 +24,14 @@ class QWidget;
 
 namespace BlackGui
 {
-    class CGuiApplication;
-
     //! Reads and provides style sheets
     class BLACKGUI_EXPORT CStyleSheetUtility : public QObject
     {
         Q_OBJECT
 
     public:
         //! Constructor
-        explicit CStyleSheetUtility(BlackMisc::Restricted<CGuiApplication>, 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
@@ -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