flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 07:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce build config template buildconfig.h.in

Browse Source 
refs #625
This commit is contained in:
Roland Winklmeier
2016-03-31 17:12:01 +02:00
parent 4e9c34b04a
commit d379f14133
45 changed files with 279 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackgui/components/datainfoareacomponent.cpp
View File

@@ -16,6 +16,7 @@
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
#include "blackmisc/buildconfig.h"
using namespace BlackMisc;
using namespace BlackMisc::Network;
@@ -78,7 +79,7 @@ namespace BlackGui
}
// write to disk
bool s = sGui->getWebDataServices()->writeDbDataToDisk(CProject::getSwiftStaticDbFilesDir());
bool s = sGui->getWebDataServices()->writeDbDataToDisk(CBuildConfig::getSwiftStaticDbFilesDir());
if (s)
{
CLogMessage(this).info("Written DB data");
@@ -93,12 +94,12 @@ namespace BlackGui
bool CDataInfoAreaComponent::readDbDataFromResourceDir()
{
bool s = sGui &&
sGui->getWebDataServices()->readDbDataFromDisk(CProject::getSwiftStaticDbFilesDir(), true);
sGui->getWebDataServices()->readDbDataFromDisk(CBuildConfig::getSwiftStaticDbFilesDir(), true);
// info
if (s)
{
CLogMessage(this).info("Read DB data from directory: %1") << CProject::getSwiftStaticDbFilesDir();
CLogMessage(this).info("Read DB data from directory: %1") << CBuildConfig::getSwiftStaticDbFilesDir();
this->ui->comp_DbAircraftIcao->showLoadIndicator();
this->ui->comp_DbAirlineIcao->showLoadIndicator();
this->ui->comp_DbCountries->showLoadIndicator();

1
src/blackgui/components/dbdebugdatabasesetup.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "blackgui/guiapplication.h"
#include "blackmisc/project.h"
#include "dbdebugdatabasesetup.h"
#include "ui_dbdebugdatabasesetup.h"

4
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -16,7 +16,7 @@
#include "blackcore/contextaudio.h"
#include "blackcore/simulator.h"
#include "blackmisc/audio/audioutils.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/icons.h"
#include <QPoint>
@@ -159,7 +159,7 @@ namespace BlackGui
QMenu menuAudio(this);
menuAudio.addAction("Toogle mute");
if (CProject::isRunningOnWindowsNtPlatform())
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
menuAudio.addAction("Mixer");
}

3
src/blackgui/components/logincomponent.cpp
View File

@@ -18,6 +18,7 @@
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/buildconfig.h"
#include <QIntValidator>
using namespace BlackMisc;
@@ -106,7 +107,7 @@ namespace BlackGui
CServerList otherServers(this->m_otherTrafficNetworkServers.get());
// add a testserver when no servers can be loaded
if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CProject::isBetaTest()))
if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CBuildConfig::isBetaTest()))
{
otherServers.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
CLogMessage(this).info("Added servers for testing");

4
src/blackgui/components/settingsnetworkserverscomponent.cpp
View File

@@ -14,7 +14,7 @@
#include "blackcore/setupreader.h"
#include "blackcore/contextapplication.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include <QModelIndex>
using namespace BlackCore;
@@ -53,7 +53,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() && (CProject::isBetaTest() || sGui->isRunningInDeveloperEnvironment()))
if (serverList.isEmpty() && (CBuildConfig::isBetaTest() || sGui->isRunningInDeveloperEnvironment()))
{
serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
this->ui->tvp_Servers->updateContainer(serverList);

8
src/blackgui/guiapplication.cpp
View File

@@ -12,7 +12,7 @@
#include "stylesheetutility.h"
#include "registermetadata.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/verify.h"
#include "blackmisc/metadatautils.h"
#include "blackmisc/settingscache.h"
@@ -215,7 +215,7 @@ namespace BlackGui
void CGuiApplication::cmdLineErrorMessage(const QString &errorMessage) const
{
if (CProject::isRunningOnWindowsNtPlatform())
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
const QString helpText(beautifyHelpMessage(this->m_parser.helpText()));
QMessageBox::warning(nullptr,
@@ -439,7 +439,7 @@ namespace BlackGui
void CGuiApplication::cmdLineHelpMessage()
{
if (CProject::isRunningOnWindowsNtPlatform())
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
QMessageBox::information(nullptr,
QGuiApplication::applicationDisplayName(),
@@ -453,7 +453,7 @@ namespace BlackGui
void CGuiApplication::cmdLineVersionMessage() const
{
if (CProject::isRunningOnWindowsNtPlatform())
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
QMessageBox::information(nullptr,
QGuiApplication::applicationDisplayName(),

1
src/blackgui/guiutility.cpp
View File

@@ -12,7 +12,6 @@
#include "blackcore/cookiemanager.h"
#include "blackmisc/filelogger.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/project.h"
#include "blackmisc/verify.h"
#include <QMainWindow>
#include <QApplication>

3
src/blackgui/views/atcstationview.cpp
View File

@@ -10,6 +10,7 @@
#include "atcstationview.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/testing.h"
#include "blackmisc/buildconfig.h"
#include <QHeaderView>
using namespace BlackMisc;
@@ -41,7 +42,7 @@ namespace BlackGui
void CAtcStationView::customMenu(QMenu &menu) const
{
if (BlackMisc::CProject::isDebugBuild())
if (BlackMisc::CBuildConfig::isDebugBuild())
{
menu.addAction(CIcons::tableSheet16(), "Test: 1k ATC online stations", this, SLOT(ps_testRequest1kAtcOnlineDummies()));
menu.addAction(CIcons::tableSheet16(), "Test: 3k ATC online stations", this, SLOT(ps_testRequest3kAtcOnlineDummies()));

1
src/blackgui/views/atcstationview.h
View File

@@ -15,7 +15,6 @@
#include "blackgui/blackguiexport.h"
#include "viewbase.h"
#include "../models/atcstationlistmodel.h"
#include "blackmisc/project.h"
namespace BlackGui
{

4
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "simulatedaircraftview.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include <QHeaderView>
using namespace BlackMisc;
@@ -41,7 +41,7 @@ namespace BlackGui
void CSimulatedAircraftView::customMenu(QMenu &menu) const
{
if (BlackMisc::CProject::isDebugBuild())
if (BlackMisc::CBuildConfig::isDebugBuild())
{
// tbd
}

4
src/blackgui/views/viewbase.cpp
View File

@@ -9,7 +9,7 @@
#include "viewbase.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include "blackgui/models/allmodels.h"
#include "blackgui/stylesheetutility.h"
#include "blackgui/guiutility.h"
@@ -374,7 +374,7 @@ namespace BlackGui
QString CViewBaseNonTemplate::getDefaultFilename(bool load) const
{
// some logic to find a useful default name
QString dir = CProject::getDocumentationDirectory();
QString dir = CBuildConfig::getDocumentationDirectory();
if (load)
{