From e312718bbb555692e9db52842cad14368186adf3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 30 Sep 2018 23:30:17 +0200
Subject: [PATCH] Ref T379, style

---
 samples/blackmisc/main.cpp                             | 8 ++++----
 src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/samples/blackmisc/main.cpp b/samples/blackmisc/main.cpp
index ecfe2676d..d22517f63 100644
--- a/samples/blackmisc/main.cpp
+++ b/samples/blackmisc/main.cpp
@@ -61,10 +61,10 @@ int main(int argc, char *argv[])
         QString s = qtin.readLine().toLower().trimmed();
 
         if (s.startsWith("1")) { CSamplesJson::samples(); }
-        else if (s.startsWith("2")) { CSamplesChangeObject::samples(); }
+        else if (s.startsWith("2"))  { CSamplesChangeObject::samples(); }
         else if (s.startsWith("3a")) { CSamplesContainer::samples(); }
         else if (s.startsWith("3b")) { CSamplesPerformance::sampleQMapVsQHashByCallsign(qtout); }
-        else if (s.startsWith("4")) { CSamplesMetadata::samples(); }
+        else if (s.startsWith("4"))  { CSamplesMetadata::samples(); }
         else if (s.startsWith("6a")) { CSamplesPerformance::samplesMisc(qtout); }
         else if (s.startsWith("6b")) { CSamplesPerformance::interpolatorScenario(qtout, 40, 20); }
         else if (s.startsWith("6c")) { CSamplesPerformance::samplesJson(qtout); }
@@ -72,8 +72,8 @@ int main(int argc, char *argv[])
         else if (s.startsWith("6e")) { CSamplesPerformance::samplesStringUtilsVsRegEx(qtout); }
         else if (s.startsWith("6f")) { CSamplesPerformance::samplesStringConcat(qtout); }
         else if (s.startsWith("6g")) { CSamplesPerformance::samplesStringLiteralVsConstQString(qtout); }
-        else if (s.startsWith("7")) { CSamplesAlgorithm::samples(); }
-        else if (s.startsWith("x")) { break; }
+        else if (s.startsWith("7"))  { CSamplesAlgorithm::samples(); }
+        else if (s.startsWith("x"))  { break; }
     }
     while (true);
     return 0;
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 637c70a1c..c97b2d9cb 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -847,7 +847,7 @@ namespace BlackSimPlugin
                     break;
                 }
 
-                Q_ASSERT_X(simObject.isPendingAdded(), Q_FUNC_INFO, "already confirmed, this should be the only place");
+                Q_ASSERT_X(simObject.isPendingAdded(), Q_FUNC_INFO, "Already confirmed, this should be the only place");
                 simObject.setConfirmedAdded(true);
 
                 // P3D also has SimConnect_AIReleaseControlEx which also allows to destroy the aircraft
@@ -1501,10 +1501,9 @@ namespace BlackSimPlugin
             {
                 // problem: we try to delete an aircraft just requested to be added
                 // best solution so far, call remove again with a delay
-                CLogMessage(this).warning("'%1' requested to be removed, but pending added (%2) / or pending lights(%3). Object be removed again: %4")
-                        << callsign.asString()
-                        << boolToYesNo(pendingAdded) << boolToYesNo(stillWaitingForLights)
-                        << simObject.toQString();
+                CLogMessage(this).warning("'%1' requested to be removed, but pending added (%2) / or pending lights(%3). Object will be removed again: %4")
+                        << callsign.asString() << boolToYesNo(pendingAdded)
+                        << boolToYesNo(stillWaitingForLights) << simObject.toQString();
                 simObject.setRemovedWhileAdding(true); // next time kill
                 QPointer<CSimulatorFsxCommon> myself(this);
                 QTimer::singleShot(2000, this, [ = ]