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

refactor: Clarify CApplication method names

Browse Source
This commit is contained in:
Lars Toenning
2024-02-16 12:37:58 +01:00
parent d977a6214c
commit 2ba2d5bc8e
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/application.cpp
View File

@@ -785,7 +785,7 @@ namespace BlackCore
eventLoop.exec();
}
CStatusMessageList CApplication::useContexts(const CCoreFacadeConfig &coreConfig)
CStatusMessageList CApplication::initContextsAndStartCoreFacade(const CCoreFacadeConfig &coreConfig)
{
Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Call this function after parsing");
@@ -798,17 +798,17 @@ namespace BlackCore
// if not yet initialized, init web data services
if (!m_webDataServices)
{
const CStatusMessageList msgs = this->useWebDataServices(CWebReaderFlags::AllReaders, CDatabaseReaderConfigList::forPilotClient());
const CStatusMessageList msgs = this->initAndStartWebDataServices(CWebReaderFlags::AllReaders, CDatabaseReaderConfigList::forPilotClient());
if (msgs.hasErrorMessages()) { return msgs; }
}
return this->startCoreFacade(); // will do nothing if setup is not yet loaded
}
CStatusMessageList CApplication::useFacadeNoContexts()
CStatusMessageList CApplication::startCoreFacadeWithoutContexts()
{
Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Call this function after parsing");
m_useContexts = true; // otherwise startCoreFacadeAndWebDataServices will early-return
m_useContexts = true; // otherwise startCoreFacade will early-return
m_coreFacadeConfig = CCoreFacadeConfig::allEmpty();
const CStatusMessage msg = this->initLocalSettings();
if (msg.isFailure()) { return msg; }
@@ -816,7 +816,7 @@ namespace BlackCore
return this->startCoreFacade(); // will do nothing if setup is not yet loaded
}
CStatusMessageList CApplication::useWebDataServices(CWebReaderFlags::WebReader webReaders, const CDatabaseReaderConfigList &dbReaderConfig)
CStatusMessageList CApplication::initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig)
{
Q_ASSERT_X(m_webDataServices.isNull(), Q_FUNC_INFO, "Services already started");
BLACK_VERIFY_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "No SSL");
@@ -825,7 +825,7 @@ namespace BlackCore
return CStatusMessage(this).error(u"No SSL supported, can`t be used");
}
m_webReadersUsed = webReaders;
m_webReadersUsed = webReader;
m_dbReaderConfig = dbReaderConfig;
return this->startWebDataServices();
}

8
src/blackcore/application.h
View File

@@ -341,17 +341,17 @@ namespace BlackCore
//! Init the contexts part and start core facade
//! \sa coreFacadeStarted
//! \remark requires setup loaded
BlackMisc::CStatusMessageList useContexts(const CCoreFacadeConfig &coreConfig);
BlackMisc::CStatusMessageList initContextsAndStartCoreFacade(const CCoreFacadeConfig &coreConfig);
//! Init the core facade without any contexts
//! Starts the core facade without any contexts
//! \sa coreFacadeStarted
//! \remark requires setup loaded
BlackMisc::CStatusMessageList useFacadeNoContexts();
BlackMisc::CStatusMessageList startCoreFacadeWithoutContexts();
//! Init web data services and start them
//! \sa webDataServicesStarted
//! \remark requires setup loaded
BlackMisc::CStatusMessageList useWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig);
BlackMisc::CStatusMessageList initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig);
//! Get the facade
CCoreFacade *getCoreFacade() { return m_coreFacade.data(); }

2
src/swiftcore/main.cpp
View File

@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
const QString dBusAddress(a.getCmdDBusAddressValue());
a.useContexts(CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAddress));
a.initContextsAndStartCoreFacade(CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAddress));
if (!a.start())
{
a.gracefulShutdown();

4
src/swiftdata/main.cpp
View File

@@ -26,8 +26,8 @@ int main(int argc, char *argv[])
CGuiApplication a(CApplicationInfo::swiftMappingTool(), CApplicationInfo::MappingTool, CIcons::swiftDatabase48());
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
a.splashScreen(CIcons::swiftDatabase256());
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool());
a.useFacadeNoContexts();
a.initAndStartWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool());
a.startCoreFacadeWithoutContexts();
if (!a.start())
{
a.gracefulShutdown();

2
src/swiftguistandard/swiftguistdapplication.cpp
View File

@@ -69,7 +69,7 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
break;
}
const CStatusMessageList contextMsgs = this->useContexts(runtimeConfig);
const CStatusMessageList contextMsgs = this->initContextsAndStartCoreFacade(runtimeConfig);
msgs.push_back(contextMsgs);
return contextMsgs;
}

4
src/swiftlauncher/main.cpp
View File

@@ -43,12 +43,12 @@ int main(int argc, char *argv[])
const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") };
a.addParserOption(installerOption);
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
a.initAndStartWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
const bool installMode = a.isParserOptionSet(installerOption);
if (installMode) initDbCacheFromResourceFileIfRequired(a);
a.useFacadeNoContexts();
a.startCoreFacadeWithoutContexts();
if (!a.start())
{
a.gracefulShutdown();