diff --git a/samples/blackmisc/sampleblackmisc.pro b/samples/blackmisc/sampleblackmisc.pro index 9ef934efc..0721b9839 100644 --- 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 diff --git a/samples/blackmiscdbus/sampleblackmiscdbus.pro b/samples/blackmiscdbus/sampleblackmiscdbus.pro index 6e1923cea..9eba1b446 100644 --- 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 diff --git a/samples/blackmiscsim/sampleblackmiscsim.pro b/samples/blackmiscsim/sampleblackmiscsim.pro index 752f6c435..c1a5567be 100644 --- 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 diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 52d95878b..2d2042f6b 100644 --- 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 diff --git a/src/blackcore/application.h b/src/blackcore/application.h index c47907589..949d409c4 100644 --- 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 m_webDataServices; //!< web data services QScopedPointer m_networkWatchDog; //!< checking DB/internet access QScopedPointer m_fileLogger; //!< file logger - CCookieManager m_cookieManager; //!< single cookie manager for our access manager + QPointer 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 diff --git a/src/blackcore/db/databasereaderconfig.h b/src/blackcore/db/databasereaderconfig.h index 7545b4b7b..21b8ecc43 100644 --- 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" diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index 3524da53f..5ea84a6fd 100644 --- 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 diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro index 465f424e8..4f819e83d 100644 --- 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 diff --git a/src/blackinput/macos/keyboardmacos.mm b/src/blackinput/macos/keyboardmacos.mm index 26824b2ec..13792b79d 100644 --- a/src/blackinput/macos/keyboardmacos.mm +++ b/src/blackinput/macos/keyboardmacos.mm @@ -11,7 +11,7 @@ #include "blackmisc/logmessage.h" #include -#include +#include #include #include #include diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp index 24f189a69..208015539 100644 --- 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 { diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index dfb118b64..3e218aebe 100644 --- 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 diff --git a/src/plugins/simulator/fs9/fs9.pro b/src/plugins/simulator/fs9/fs9.pro index 12e74017a..32f72b040 100644 --- 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 diff --git a/src/plugins/simulator/fscommon/fscommon.pro b/src/plugins/simulator/fscommon/fscommon.pro index 6e1ac1d83..118540d58 100644 --- 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 diff --git a/src/plugins/simulator/fsuipc32/fsuipc32.pro b/src/plugins/simulator/fsuipc32/fsuipc32.pro index 1a042b62b..9fe4fe5bf 100644 --- 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 diff --git a/src/plugins/simulator/fsuipc64/fsuipc64.pro b/src/plugins/simulator/fsuipc64/fsuipc64.pro index b934314eb..a81c9d134 100644 --- 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 diff --git a/src/plugins/simulator/fsx/fsx.pro b/src/plugins/simulator/fsx/fsx.pro index 2832e936a..ccc1de17f 100644 --- 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 diff --git a/src/plugins/simulator/fsxcommon/fsxcommon.pro b/src/plugins/simulator/fsxcommon/fsxcommon.pro index fbf0d9d09..af72c3012 100644 --- 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 diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro index f3514ed35..3c5ce2363 100644 --- 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 diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index 310421600..1f8d19d39 100644 --- 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 diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index cdfc81830..b6c6cfb22 100644 --- 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" diff --git a/src/plugins/simulator/p3dconfig/p3dconfig.pro b/src/plugins/simulator/p3dconfig/p3dconfig.pro index d87bc5203..d1cf949b7 100644 --- 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 diff --git a/src/plugins/simulator/xplane/xplane.pro b/src/plugins/simulator/xplane/xplane.pro index f68f0a983..2287b0005 100644 --- 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 diff --git a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro index 32ec9dc95..9797c306b 100644 --- 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 diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro index 1dc85fa66..3811bbc18 100644 --- 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 diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro index 8ffa48f00..7ad073234 100644 --- 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 diff --git a/src/swiftguistandard/swiftguistandard.pro b/src/swiftguistandard/swiftguistandard.pro index 3c7b48251..aa6e3c065 100644 --- 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 diff --git a/src/swiftlauncher/swiftlauncher.pro b/src/swiftlauncher/swiftlauncher.pro index c7e147efc..bb5155813 100644 --- 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