From 929e2883d08470323cc64745532ce5771a670acf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 29 Mar 2017 02:14:53 +0200 Subject: [PATCH] refs #921, renaming follow ups --- src/blackcore/application.cpp | 6 +++--- src/blackcore/context/contextnetworkimpl.cpp | 2 +- src/blackgui/components/logincomponent.cpp | 2 +- src/blackgui/components/settingscomponent.cpp | 2 +- src/blackgui/components/settingsnetworkserverscomponent.cpp | 2 +- src/blackgui/loginmodebuttons.cpp | 2 +- src/blackmisc/simulation/fscommon/fscommonutil.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index a17c86ad9..d7c1379b1 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -182,7 +182,7 @@ namespace BlackCore { CApplicationInfo::ApplicationMode mode; if (isRunningInDeveloperEnvironment()) { mode |= CApplicationInfo::Developer; } - if (CBuildConfig::isBetaTest()) { mode |= CApplicationInfo::BetaTest; } + if (CBuildConfig::isDevBranch()) { mode |= CApplicationInfo::BetaTest; } return { CApplication::getSwiftApplication(), mode, QCoreApplication::applicationFilePath(), CVersion::version(), CProcessInfo::currentProcess() }; } @@ -218,7 +218,7 @@ namespace BlackCore const QString &CApplication::getApplicationNameVersionBetaDev() const { - static const QString s(QCoreApplication::instance()->applicationName() + " " + this->versionStringDevBetaInfo()); + static const QString s(QCoreApplication::instance()->applicationName() + " " + this->versionStringDetailed()); return s; } @@ -476,7 +476,7 @@ namespace BlackCore { const QString env = QLatin1String("Beta: ") % - boolToYesNo(CBuildConfig::isBetaTest()) % + boolToYesNo(CBuildConfig::isDevBranch()) % QLatin1String(" dev.env,: ") % boolToYesNo(isRunningInDeveloperEnvironment()) % separator % diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index ae0dc8e75..388b11b5b 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -184,7 +184,7 @@ namespace BlackCore this->m_network->presetServer(server); // Fall back to observer mode, if no simulator is available or not simulating - if (CBuildConfig::isShippedVersion() && !this->getIContextSimulator()->isSimulatorSimulating()) + if (CBuildConfig::isStableBranch() && !this->getIContextSimulator()->isSimulatorSimulating()) { CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode"); mode = INetwork::LoginAsObserver; diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 252360b02..27bd13432 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -150,7 +150,7 @@ namespace BlackGui CServerList otherServers(this->m_otherTrafficNetworkServers.getThreadLocal()); // add a testserver when no servers can be loaded - if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CBuildConfig::isBetaTest())) + if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CBuildConfig::isDevBranch())) { otherServers.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers()); CLogMessage(this).info("Added servers for testing"); diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 64ad879bc..0d535405c 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -47,7 +47,7 @@ namespace BlackGui this->tabBar()->setExpanding(false); this->tabBar()->setUsesScrollButtons(true); this->setCurrentIndex(0); // 1st tab - ui->comp_DataLoadOverview->showVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || CBuildConfig::isBetaTest()); + ui->comp_DataLoadOverview->showVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || CBuildConfig::isDevBranch()); ui->comp_DataLoadOverview->showVisibleLoadAllButtons(false, false); connect(ui->comp_SettingsGuiGeneral, &CSettingsGuiComponent::changedWindowsOpacity, this, &CSettingsComponent::changedWindowsOpacity); diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index ae664bc99..4db03b752 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -61,7 +61,7 @@ namespace BlackGui // add swift test servers in case we have no servers: // this is debug/bootstrap feature we can continue to test when something goes wrong - if (serverList.isEmpty() && (CBuildConfig::isBetaTest() || sGui->isRunningInDeveloperEnvironment())) + if (serverList.isEmpty() && (CBuildConfig::isDevBranch() || sGui->isRunningInDeveloperEnvironment())) { serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers()); } diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index 484c5d6e1..20539db16 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -67,7 +67,7 @@ namespace BlackGui void CLoginModeButtons::configureLoginModes() { - if(CBuildConfig::isShippedVersion() && !sGui->getIContextSimulator()->isSimulatorSimulating()) + if(CBuildConfig::isStableBranch() && !sGui->getIContextSimulator()->isSimulatorSimulating()) { // Disable pilot login modes ui->rb_LoginNormal->setEnabled(false); diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index ac5fdf723..89a05801a 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -72,7 +72,7 @@ namespace BlackMisc "C:/Program Files (x86)/Microsoft Games/Microsoft Flight Simulator X", "C:/FSX" }); - if (!CBuildConfig::isShippedVersion()) + if (!CBuildConfig::isStableBranch()) { // developer directories someDefaultDirs.push_back("P:/FSX (MSI)");