refs #921, renaming follow ups

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 %

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;

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");

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);

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());
             }

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);

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)");