From 6ce80bbd8eb46c5a956eafc9ff5dbbf18bc8db54 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 8 Oct 2017 19:31:23 +0200 Subject: [PATCH] Ref T169, formatting --- src/blackcore/data/globalsetup.cpp | 54 +++++++++++++++--------------- src/blackcore/data/globalsetup.h | 6 ++-- src/blackgui/mainwindowaccess.cpp | 21 ++++++------ src/swiftdata/swiftdata.cpp | 10 +++--- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 97ed1e047..481f66bae 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -76,7 +76,7 @@ namespace BlackCore const CUrlList &CGlobalSetup::getSwiftSharedUrls() const { - return this->m_sharedUrls; + return m_sharedUrls; } CUrl CGlobalSetup::getCorrespondingSharedUrl(const CUrl &candidate) const @@ -102,7 +102,7 @@ namespace BlackCore CUrl CGlobalSetup::getHelpPageUrl(const QString &context) const { - const CUrlList urls(this->m_onlineHelpUrls); + const CUrlList urls(m_onlineHelpUrls); // we display in the standard browser, // so the user will realize if the URL does not work @@ -320,23 +320,23 @@ namespace BlackCore const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexDbRootDirectory: return CVariant::fromValue(this->m_dbRootDirectoryUrl); - case IndexDbHttpPort: return CVariant::fromValue(this->m_dbHttpPort); - case IndexDbHttpsPort: return CVariant::fromValue(this->m_dbHttpsPort); + case IndexDbRootDirectory: return CVariant::fromValue(m_dbRootDirectoryUrl); + case IndexDbHttpPort: return CVariant::fromValue(m_dbHttpPort); + case IndexDbHttpsPort: return CVariant::fromValue(m_dbHttpsPort); case IndexDbLoginService: return CVariant::fromValue(this->getDbLoginServiceUrl()); case IndexDbClientPingService: return CVariant::fromValue(this->getDbClientPingServiceUrl()); - case IndexVatsimStatus: return CVariant::fromValue(this->m_vatsimStatusFileUrls); - case IndexVatsimData: return CVariant::fromValue(this->m_vatsimDataFileUrls); - case IndexVatsimBookings: return CVariant::fromValue(this->m_vatsimDataFileUrls); - case IndexVatsimMetars: return CVariant::fromValue(this->m_vatsimMetarsUrls); + case IndexVatsimStatus: return CVariant::fromValue(m_vatsimStatusFileUrls); + case IndexVatsimData: return CVariant::fromValue(m_vatsimDataFileUrls); + case IndexVatsimBookings: return CVariant::fromValue(m_vatsimDataFileUrls); + case IndexVatsimMetars: return CVariant::fromValue(m_vatsimMetarsUrls); case IndexBootstrapFileUrls: return CVariant::fromValue(this->getSwiftBootstrapFileUrls()); case IndexDistributionFileUrls: return CVariant::fromValue(this->getSwiftDistributionFileUrls()); - case IndexSharedUrls: return CVariant::fromValue(this->m_sharedUrls); - case IndexNewsUrls: return CVariant::fromValue(this->m_newsUrls); - case IndexSwiftMapUrls: return CVariant::fromValue(this->m_mapUrls); - case IndexOnlineHelpUrls: return CVariant::fromValue(this->m_onlineHelpUrls); - case IndexCrashReportServerUrl: return CVariant::fromValue(this->m_crashReportServerUrl); - case IndexWasLoaded: return CVariant::fromValue(this->m_wasLoaded); + case IndexSharedUrls: return CVariant::fromValue(m_sharedUrls); + case IndexNewsUrls: return CVariant::fromValue(m_newsUrls); + case IndexSwiftMapUrls: return CVariant::fromValue(m_mapUrls); + case IndexOnlineHelpUrls: return CVariant::fromValue(m_onlineHelpUrls); + case IndexCrashReportServerUrl: return CVariant::fromValue(m_crashReportServerUrl); + case IndexWasLoaded: return CVariant::fromValue(m_wasLoaded); default: return CValueObject::propertyByIndex(index); } } @@ -353,20 +353,20 @@ namespace BlackCore const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexDbRootDirectory: this->m_dbRootDirectoryUrl.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexDbHttpPort: this->m_dbHttpPort = variant.toInt(); break; - case IndexDbHttpsPort: this->m_dbHttpsPort = variant.toInt(); break; + case IndexDbRootDirectory: m_dbRootDirectoryUrl.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexDbHttpPort: m_dbHttpPort = variant.toInt(); break; + case IndexDbHttpsPort: m_dbHttpsPort = variant.toInt(); break; case IndexDbLoginService: break; // cannot be changed case IndexDbClientPingService: break; // cannot be changed - case IndexVatsimData: this->m_vatsimDataFileUrls = variant.value(); break; - case IndexVatsimBookings: this->m_vatsimBookingsUrl.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexVatsimMetars: this->m_vatsimMetarsUrls = variant.value(); break; - case IndexSharedUrls: this->m_sharedUrls = variant.value(); break; - case IndexNewsUrls: this->m_newsUrls = variant.value(); break; - case IndexOnlineHelpUrls: this->m_onlineHelpUrls = variant.value(); break; - case IndexSwiftMapUrls: this->m_mapUrls = variant.value(); break; - case IndexCrashReportServerUrl: this->m_crashReportServerUrl = variant.value(); break; - case IndexWasLoaded: this->m_wasLoaded = variant.toBool(); break; + case IndexVatsimData: m_vatsimDataFileUrls = variant.value(); break; + case IndexVatsimBookings: m_vatsimBookingsUrl.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexVatsimMetars: m_vatsimMetarsUrls = variant.value(); break; + case IndexSharedUrls: m_sharedUrls = variant.value(); break; + case IndexNewsUrls: m_newsUrls = variant.value(); break; + case IndexOnlineHelpUrls: m_onlineHelpUrls = variant.value(); break; + case IndexSwiftMapUrls: m_mapUrls = variant.value(); break; + case IndexCrashReportServerUrl: m_crashReportServerUrl = variant.value(); break; + case IndexWasLoaded: m_wasLoaded = variant.toBool(); break; default: CValueObject::setPropertyByIndex(index, variant); break; } } diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index fbb287179..be22e2a18 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -70,7 +70,7 @@ namespace BlackCore bool wasLoaded() const { return m_wasLoaded; } //! Mark as loaded - void markAsLoaded(bool loaded) { this->m_wasLoaded = loaded; } + void markAsLoaded(bool loaded) { m_wasLoaded = loaded; } //! Http port int getDbHttpPort() const { return m_dbHttpPort; } @@ -147,7 +147,7 @@ namespace BlackCore const BlackMisc::Network::CUrl &getVatsimBookingsUrl() const { return m_vatsimBookingsUrl; } //! VATSIM METAR URL - const BlackMisc::Network::CUrlList &getVatsimMetarsUrls() const { return this->m_vatsimMetarsUrls; } + const BlackMisc::Network::CUrlList &getVatsimMetarsUrls() const { return m_vatsimMetarsUrls; } //! VATSIM status file URLs const BlackMisc::Network::CUrlList &getVatsimStatusFileUrls() const { return m_vatsimStatusFileUrls; } @@ -180,7 +180,7 @@ namespace BlackCore //! \copydoc BlackMisc::Mixin::String::toQString QString convertToQString(bool i18n = false) const; - //! To string + //! To string with separator QString convertToQString(const QString &separator, bool i18n = false) const; //! \copydoc BlackMisc::Mixin::Index::propertyByIndex diff --git a/src/blackgui/mainwindowaccess.cpp b/src/blackgui/mainwindowaccess.cpp index 6dd4e684a..dc3c05b62 100644 --- a/src/blackgui/mainwindowaccess.cpp +++ b/src/blackgui/mainwindowaccess.cpp @@ -12,6 +12,8 @@ #include "blackgui/managedstatusbar.h" #include "blackgui/overlaymessagesframe.h" +using namespace BlackMisc; + namespace BlackGui { IMainWindowAccess::~IMainWindowAccess() @@ -22,26 +24,25 @@ namespace BlackGui bool IMainWindowAccess::displayTextInConsole(const QString &message) { if (message.isEmpty()) { return false; } - if (!this->m_mwaLogComponent) { return false; } - this->m_mwaLogComponent->appendPlainTextToConsole(message); - this->m_mwaLogComponent->displayConsole(true); + if (!m_mwaLogComponent) { return false; } + m_mwaLogComponent->appendPlainTextToConsole(message); + m_mwaLogComponent->displayConsole(true); return true; } - bool IMainWindowAccess::displayInStatusBar(const BlackMisc::CStatusMessage &message) + bool IMainWindowAccess::displayInStatusBar(const CStatusMessage &message) { if (message.isEmpty()) { return false; } - if (!this->m_mwaStatusBar) { return false; } - this->m_mwaStatusBar->displayStatusMessage(message); + if (!m_mwaStatusBar) { return false; } + m_mwaStatusBar->displayStatusMessage(message); return true; } - bool IMainWindowAccess::displayInOverlayWindow(const BlackMisc::CStatusMessage &message, int timeOutMs) + bool IMainWindowAccess::displayInOverlayWindow(const CStatusMessage &message, int timeOutMs) { if (message.isEmpty()) { return false; } - if (!this->m_mwaOverlayFrame) { return false; } - this->m_mwaOverlayFrame->showOverlayMessage(message, timeOutMs); + if (!m_mwaOverlayFrame) { return false; } + m_mwaOverlayFrame->showOverlayMessage(message, timeOutMs); return true; } - } // ns diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index 5f7940c52..ce5b91f71 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -97,9 +97,9 @@ void CSwiftData::init() sGui->initMainApplicationWindow(this); this->initLogDisplay(); - this->m_mwaLogComponent = ui->comp_MainInfoArea->getLogComponent(); - this->m_mwaStatusBar = &this->m_statusBar; - this->m_mwaOverlayFrame = ui->comp_MainInfoArea->getMappingComponent(); + m_mwaLogComponent = ui->comp_MainInfoArea->getLogComponent(); + m_mwaStatusBar = &m_statusBar; + m_mwaOverlayFrame = ui->comp_MainInfoArea->getMappingComponent(); this->initStyleSheet(); connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftData::onStyleSheetsChanged); @@ -118,7 +118,7 @@ void CSwiftData::init() void CSwiftData::initLogDisplay() { - this->m_statusBar.initStatusBar(ui->sb_SwiftData); + m_statusBar.initStatusBar(ui->sb_SwiftData); CLogHandler::instance()->install(true); CLogHandler::instance()->enableConsoleOutput(false); // default disable @@ -147,7 +147,7 @@ void CSwiftData::initMenu() void CSwiftData::performGracefulShutdown() { - if (this->m_updater) + if (m_updater) { m_updater->abandonAndWait(); }