flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove webservice state/config member from CApplication

Browse Source 
Reduce complexity and state of the CApplication. These members are used
anyway just to initialize the web service.
This commit is contained in:
Lars Toenning
2024-02-17 21:30:05 +01:00
parent eaf0019474
commit 0d62facea7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/application.cpp
View File

@@ -771,9 +771,7 @@ namespace BlackCore
return CStatusMessage(this).error(u"No SSL supported, can`t be used");
}
m_webReadersUsed = webReader;
m_dbReaderConfig = dbReaderConfig;
return this->startWebDataServices();
return this->startWebDataServices(webReader, dbReaderConfig);
}
bool CApplication::isLocalContext() const
@@ -803,7 +801,7 @@ namespace BlackCore
return msgs;
}
CStatusMessageList CApplication::startWebDataServices()
CStatusMessageList CApplication::startWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig)
{
Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Call this function after parsing");
@@ -814,8 +812,7 @@ namespace BlackCore
if (!m_webDataServices)
{
msgs.push_back(CStatusMessage(this).info(u"Will start web data services now"));
m_webDataServices.reset(
new CWebDataServices(m_webReadersUsed, m_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);

4
src/blackcore/application.h
View File

@@ -553,7 +553,7 @@ namespace BlackCore
//! Start the web data services
//! \note does nothing when setup is not yet loaded
BlackMisc::CStatusMessageList startWebDataServices();
BlackMisc::CStatusMessageList startWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig);
//! executable name
static const QString &executable();
@@ -651,8 +651,6 @@ namespace BlackCore
const QString m_applicationName; //!< application name
QReadWriteLock m_accessManagerLock; //!< lock to make access manager access threadsafe
CCoreFacadeConfig m_coreFacadeConfig; //!< Core facade config if any
CWebReaderFlags::WebReader m_webReadersUsed; //!< Readers to be used
Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< Load or used caching?
bool m_useContexts = false; //!< use contexts
bool m_devFlag = false; //!< dev. environment
bool m_saveSettingsOnShutdown = true; //!< saving all settings on shutdown