From 2ba2d5bc8e8787bbaa3534e0d5435936c60614ab Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Fri, 16 Feb 2024 12:37:58 +0100 Subject: [PATCH] refactor: Clarify CApplication method names --- src/blackcore/application.cpp | 12 ++++++------ src/blackcore/application.h | 8 ++++---- src/swiftcore/main.cpp | 2 +- src/swiftdata/main.cpp | 4 ++-- src/swiftguistandard/swiftguistdapplication.cpp | 2 +- src/swiftlauncher/main.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index aaa962bec..e1aeebca3 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -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(); } diff --git a/src/blackcore/application.h b/src/blackcore/application.h index 6ae5d70c8..5ec39e19f 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -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(); } diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp index 93754160c..285e91217 100644 --- a/src/swiftcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -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(); diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp index e95c564b4..98c721ea6 100644 --- a/src/swiftdata/main.cpp +++ b/src/swiftdata/main.cpp @@ -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(); diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp index 129a24286..61c4d58ac 100644 --- a/src/swiftguistandard/swiftguistdapplication.cpp +++ b/src/swiftguistandard/swiftguistdapplication.cpp @@ -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; } diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp index 3cbe421d4..877c6e4e8 100644 --- a/src/swiftlauncher/main.cpp +++ b/src/swiftlauncher/main.cpp @@ -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();