From 48bcb105cdd1b180dd88deddadad68d79091fcb3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 23 Apr 2016 14:25:14 +0200
Subject: [PATCH] refs #613, changes as proposed by MS
 https://dev.vatsim-germany.org/issues/613#note-3

---
 src/blackgui/components/dbmappingcomponent.cpp |  3 +--
 src/blackmisc/aviation/livery.cpp              |  2 +-
 src/blackmisc/aviation/livery.h                |  2 +-
 src/blackmisc/blackmisc.pro                    | 10 ++--------
 src/plugins/simulator/xplane/simulatorxplane.h |  2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index 7644ea070..208a2a94c 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -483,8 +483,7 @@ namespace BlackGui
 
         void CDbMappingComponent::ps_tabIndexChanged(int index)
         {
-            TabIndex ti = static_cast<CDbMappingComponent::TabIndex>(index);
-
+            CDbMappingComponent::TabIndex ti = static_cast<CDbMappingComponent::TabIndex>(index);
             switch (ti)
             {
             case CDbMappingComponent::TabOwnModelSet:
diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp
index 092c6c7ca..de6ba52d4 100644
--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -209,7 +209,7 @@ namespace BlackMisc
             return s;
         }
 
-        const QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
+        QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
         {
             QString code(airline.getDesignator());
             return code.isEmpty() ? "" : code.append('.').append(standardLiveryMarker());
diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h
index 17ae96fa6..4c328435c 100644
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -155,7 +155,7 @@ namespace BlackMisc
             static const QString &standardLiveryMarker();
 
             //! Standard code for
-            static const QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
+            static QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
 
             //! Color livery marker
             static const QString &colorLiveryMarker();
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index f9b6b7b5e..c72adceac 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -11,14 +11,8 @@ contains(BLACK_CONFIG, Static) {
 }
 
 buildconfig.input = buildconfig.cpp.in
-CONFIG(debug, debug|release) {
-    buildconfig.output = $$OUT_PWD/debug/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
-}
+buildconfig.output = $$DestRoot/buildconfig_gen.cpp
+GENERATED_SOURCES += $$DestRoot/buildconfig_gen.cpp
 QMAKE_SUBSTITUTES += buildconfig
 
 INCLUDEPATH += ..
diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h
index a230a5533..4e48c367a 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.h
+++ b/src/plugins/simulator/xplane/simulatorxplane.h
@@ -44,7 +44,7 @@ namespace BlackSimPlugin
                              BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider,
                              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 connectTo() override;