Cleanup the enabled modules in all sub projects

Most modules were just enabled to add include path for dependent headers
2026-03-22 14:55:36 +08:00 · 2018-05-14 16:06:35 +02:00
parent 8fad39fdaf
commit 4aaccb44c3
27 changed files with 30 additions and 40 deletions
--- a/samples/blackmisc/sampleblackmisc.pro
+++ b/samples/blackmisc/sampleblackmisc.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus network
+QT += core dbus network

 TARGET = sampleblackmisc
 TEMPLATE = app
--- a/samples/blackmiscdbus/sampleblackmiscdbus.pro
+++ b/samples/blackmiscdbus/sampleblackmiscdbus.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus network
+QT += core dbus network

 TARGET = sampleblackmiscdbus
 TEMPLATE = app
--- a/samples/blackmiscsim/sampleblackmiscsim.pro
+++ b/samples/blackmiscsim/sampleblackmiscsim.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus network xml
+QT       += core dbus network

 TARGET = sampleblackmiscsim
 TEMPLATE = app
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -106,7 +106,7 @@ namespace BlackCore
    CApplication::CApplication(const QString &applicationName, CApplicationInfo::Application application, bool init) :
        m_accessManager(new QNetworkAccessManager(this)),
        m_applicationInfo(application),
-        m_cookieManager({}, this), m_applicationName(applicationName), m_coreFacadeConfig(CCoreFacadeConfig::allEmpty())
+        m_applicationName(applicationName), m_coreFacadeConfig(CCoreFacadeConfig::allEmpty())
    {
        Q_ASSERT_X(!sApp, Q_FUNC_INFO, "already initialized");
        Q_ASSERT_X(QCoreApplication::instance(), Q_FUNC_INFO, "no application object");
@@ -157,8 +157,9 @@ namespace BlackCore
            sApp = this;
            Q_ASSERT_X(m_accessManager, Q_FUNC_INFO, "Need QAM");
            m_networkWatchDog.reset(new CNetworkWatchdog(this)); // not yet started
-            m_cookieManager.setParent(m_accessManager);
-            m_accessManager->setCookieJar(&m_cookieManager);
+            m_cookieManager = new CCookieManager({}, this);
+            m_cookieManager->setParent(m_accessManager);
+            m_accessManager->setCookieJar(m_cookieManager);
            connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::changedInternetAccessibility, Qt::QueuedConnection);
            connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::onChangedNetworkAccessibility, Qt::QueuedConnection);
            connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, m_networkWatchDog.data(), &CNetworkWatchdog::onChangedNetworkAccessibility, Qt::QueuedConnection);
@@ -709,7 +710,7 @@ namespace BlackCore

    void CApplication::deleteAllCookies()
    {
-        m_cookieManager.deleteAllCookies();
+        m_cookieManager->deleteAllCookies();
    }

    CNetworkWatchdog *CApplication::getNetworkWatchdog() const
--- a/src/blackcore/application.h
+++ b/src/blackcore/application.h
@@ -13,7 +13,6 @@
 #define BLACKCORE_APPLICATION_H

 #include "blackcore/blackcoreexport.h"
-#include "blackcore/cookiemanager.h"
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/db/databasereaderconfig.h"
 #include "blackcore/data/globalsetup.h"
@@ -62,6 +61,7 @@ namespace crashpad
 namespace BlackCore
 {
    class CCoreFacade;
+    class CCookieManager;
    class CSetupReader;
    class CWebDataServices;
    class ISimulator;
@@ -616,7 +616,7 @@ namespace BlackCore
        QScopedPointer<CWebDataServices>       m_webDataServices;           //!< web data services
        QScopedPointer<Db::CNetworkWatchdog>   m_networkWatchDog;           //!< checking DB/internet access
        QScopedPointer<BlackMisc::CFileLogger> m_fileLogger;                //!< file logger
-        CCookieManager                         m_cookieManager;             //!< single cookie manager for our access manager
+        QPointer<CCookieManager>               m_cookieManager;             //!< single cookie manager for our access manager
        const QString                          m_applicationName;           //!< application name
        QReadWriteLock                         m_accessManagerLock;         //!< lock to make access manager access threadsafe
        CCoreFacadeConfig                      m_coreFacadeConfig;          //!< Core facade config if any
--- a/src/blackcore/db/databasereaderconfig.h
+++ b/src/blackcore/db/databasereaderconfig.h
@@ -15,7 +15,6 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/network/entityflags.h"
-#include "blackmisc/network/url.h"
 #include "blackmisc/db/dbflags.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackgui/blackgui.pro
+++ b/src/blackgui/blackgui.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += network dbus gui svg widgets
+QT       += core dbus gui network svg widgets

 TARGET = blackgui
 TEMPLATE = lib
--- a/src/blackinput/blackinput.pro
+++ b/src/blackinput/blackinput.pro
@@ -1,6 +1,7 @@
 load(common_pre)

-QT       += network dbus gui widgets multimedia
+QT += core dbus
+macx: QT += widgets

 TARGET = blackinput
 TEMPLATE = lib
--- a/src/blackinput/macos/keyboardmacos.mm
+++ b/src/blackinput/macos/keyboardmacos.mm
@@ -11,7 +11,7 @@
 #include "blackmisc/logmessage.h"

 #include <QHash>
-#include <QtWidgets/QMessageBox>
+#include <QMessageBox>
 #include <CoreFoundation/CoreFoundation.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSAlert.h>
--- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
@@ -7,7 +7,6 @@
 * contained in the LICENSE file.
 */

-#include "blackcore/db/databaseutils.h"
 #include "blackmisc/simulation/aircraftmodelutils.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
@@ -37,7 +36,6 @@ using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Simulation::FsCommon;
 using namespace BlackMisc::Network;
-using namespace BlackCore::Db;

 namespace BlackMisc
 {
--- a/src/blacksound/blacksound.pro
+++ b/src/blacksound/blacksound.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += network dbus gui multimedia
+QT       += dbus multimedia

 TARGET = blacksound
 TEMPLATE = lib
--- a/src/plugins/simulator/fs9/fs9.pro
+++ b/src/plugins/simulator/fs9/fs9.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus gui network xml widgets
+QT += core dbus network widgets

 TARGET = simulatorfs9
 TEMPLATE = lib
--- a/src/plugins/simulator/fscommon/fscommon.pro
+++ b/src/plugins/simulator/fscommon/fscommon.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus xml network
+QT += core dbus network

 TARGET = simulatorfscommon
 TEMPLATE = lib
--- a/src/plugins/simulator/fsuipc32/fsuipc32.pro
+++ b/src/plugins/simulator/fsuipc32/fsuipc32.pro
@@ -2,7 +2,7 @@ load(common_pre)

 requires(equals(WORD_SIZE,32))

-QT       += core dbus xml network
+QT += core

 TARGET = fsuipc
 TEMPLATE = lib
--- a/src/plugins/simulator/fsuipc64/fsuipc64.pro
+++ b/src/plugins/simulator/fsuipc64/fsuipc64.pro
@@ -2,7 +2,7 @@ load(common_pre)

 requires(equals(WORD_SIZE,64))

-QT       += core dbus xml network
+QT += core

 TARGET = fsuipc
 TEMPLATE = lib
--- a/src/plugins/simulator/fsx/fsx.pro
+++ b/src/plugins/simulator/fsx/fsx.pro
@@ -2,7 +2,7 @@ load(common_pre)

 REQUIRES += contains(BLACK_CONFIG,FSX)

-QT       += core dbus gui network xml widgets
+QT += core dbus widgets

 TARGET = simulatorfsx
 TEMPLATE = lib
--- a/src/plugins/simulator/fsxcommon/fsxcommon.pro
+++ b/src/plugins/simulator/fsxcommon/fsxcommon.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT += core dbus xml network widgets
+QT += core dbus network widgets

 TARGET = simulatorfsxcommon
 TEMPLATE = lib
--- a/src/plugins/simulator/fsxconfig/fsxconfig.pro
+++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core widgets dbus network
+QT += core dbus network widgets

 TARGET = simulatorfsxconfig
 TEMPLATE = lib
--- a/src/plugins/simulator/p3d/p3d.pro
+++ b/src/plugins/simulator/p3d/p3d.pro
@@ -2,7 +2,7 @@ load(common_pre)

 REQUIRES += contains(BLACK_CONFIG,P3D)

-QT       += core dbus gui network xml widgets
+QT += core dbus widgets

 TARGET = simulatorp3d
 TEMPLATE = lib
--- a/src/plugins/simulator/p3d/simulatorp3d.cpp
+++ b/src/plugins/simulator/p3d/simulatorp3d.cpp
@@ -8,7 +8,6 @@
 */

 #include "simulatorp3d.h"
-#include "blackcore/application.h"
 #include "blackmisc/threadutils.h"
 #include "blackmisc/logmessage.h"
 #include "blackconfig/buildconfig.h"
--- a/src/plugins/simulator/p3dconfig/p3dconfig.pro
+++ b/src/plugins/simulator/p3dconfig/p3dconfig.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT += core widgets dbus network
+QT += core dbus network widgets

 TARGET = simulatorp3dconfig
 TEMPLATE = lib
--- a/src/plugins/simulator/xplane/xplane.pro
+++ b/src/plugins/simulator/xplane/xplane.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus network widgets
+QT += core dbus widgets

 TARGET = simulatorxplane
 TEMPLATE = lib
--- a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
+++ b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
@@ -1,6 +1,6 @@
 load(common_pre)

-QT       += core dbus network widgets
+QT += core dbus network widgets

 TARGET = simulatorxplaneconfig
 TEMPLATE = lib
--- a/src/swiftcore/swiftcore.pro
+++ b/src/swiftcore/swiftcore.pro
@@ -1,8 +1,6 @@
 load(common_pre)

-QT       += core dbus network xml multimedia gui svg
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core dbus network widgets

 TARGET = swiftcore
 TEMPLATE = app
--- a/src/swiftdata/swiftdata.pro
+++ b/src/swiftdata/swiftdata.pro
@@ -1,8 +1,6 @@
 load(common_pre)

-QT       += core dbus network xml multimedia gui svg
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core dbus network widgets

 TARGET = swiftdata
 TEMPLATE = app
--- a/src/swiftguistandard/swiftguistandard.pro
+++ b/src/swiftguistandard/swiftguistandard.pro
@@ -1,8 +1,6 @@
 load(common_pre)

-QT       += core dbus gui svg network xml multimedia
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core dbus network widgets

 TARGET = swiftguistd
 TEMPLATE = app
--- a/src/swiftlauncher/swiftlauncher.pro
+++ b/src/swiftlauncher/swiftlauncher.pro
@@ -1,8 +1,6 @@
 load(common_pre)

-QT       += core dbus gui svg network xml multimedia
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core dbus network widgets

 TARGET = swiftlauncher
 TEMPLATE = app