flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #613, changes as proposed by MS

Browse Source 
https://dev.vatsim-germany.org/issues/613#note-3
This commit is contained in:
Klaus Basan
2016-04-23 14:25:14 +02:00
parent 8da559a186
commit 48bcb105cd
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -483,8 +483,7 @@ namespace BlackGui
void CDbMappingComponent::ps_tabIndexChanged(int index) void CDbMappingComponent::ps_tabIndexChanged(int index)
{ {
TabIndex ti = static_cast<CDbMappingComponent::TabIndex>(index); CDbMappingComponent::TabIndex ti = static_cast<CDbMappingComponent::TabIndex>(index);
switch (ti) switch (ti)
{ {
case CDbMappingComponent::TabOwnModelSet: case CDbMappingComponent::TabOwnModelSet:

2
src/blackmisc/aviation/livery.cpp
View File

@@ -209,7 +209,7 @@ namespace BlackMisc
return s; return s;
} }
const QString CLivery::getStandardCode(const CAirlineIcaoCode &airline) QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
{ {
QString code(airline.getDesignator()); QString code(airline.getDesignator());
return code.isEmpty() ? "" : code.append('.').append(standardLiveryMarker()); return code.isEmpty() ? "" : code.append('.').append(standardLiveryMarker());

2
src/blackmisc/aviation/livery.h
View File

@@ -155,7 +155,7 @@ namespace BlackMisc
static const QString &standardLiveryMarker(); static const QString &standardLiveryMarker();
//! Standard code for //! Standard code for
static const QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline); static QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
//! Color livery marker //! Color livery marker
static const QString &colorLiveryMarker(); static const QString &colorLiveryMarker();

10
src/blackmisc/blackmisc.pro
View File

@@ -11,14 +11,8 @@ contains(BLACK_CONFIG, Static) {
} }
buildconfig.input = buildconfig.cpp.in buildconfig.input = buildconfig.cpp.in
CONFIG(debug, debug|release) { buildconfig.output = $$DestRoot/buildconfig_gen.cpp
buildconfig.output = $$OUT_PWD/debug/buildconfig_gen.cpp GENERATED_SOURCES += $$DestRoot/buildconfig_gen.cpp
GENERATED_SOURCES += $$OUT_PWD/debug/buildconfig_gen.cpp
} else {
buildconfig.output = $$OUT_PWD/release/buildconfig_gen.cpp
GENERATED_SOURCES += $$OUT_PWD/release/buildconfig_gen.cpp
}
QMAKE_SUBSTITUTES += buildconfig QMAKE_SUBSTITUTES += buildconfig
INCLUDEPATH += .. INCLUDEPATH += ..

2
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -44,7 +44,7 @@ namespace BlackSimPlugin
BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider,
QObject *parent = nullptr); QObject *parent = nullptr);
//! ISimulator implementations //! \name ISimulator implementations
//! @{ //! @{
virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature? virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?
virtual bool connectTo() override; virtual bool connectTo() override;