flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the enabled modules in all sub projects

Browse Source 
Most modules were just enabled to add include path for dependent headers
This commit is contained in:
Roland Winklmeier
2018-05-14 16:06:35 +02:00
committed by Klaus Basan
parent 8fad39fdaf
commit 4aaccb44c3
27 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/application.cpp
View File

@@ -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

4
src/blackcore/application.h
View File

@@ -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

1
src/blackcore/db/databasereaderconfig.h
View File

@@ -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"