From b7df3788681ac7b22d1f420278f8fd5bde0796e5 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 25 Jun 2018 10:58:13 +0200
Subject: [PATCH] Minor fixes include order

---
 src/blackcore/context/contextsimulator.h             | 12 ++++++------
 src/plugins/simulator/fsxcommon/simconnectobject.h   |  2 +-
 .../fsxcommon/simconnectsettingscomponent.cpp        |  7 +++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h
index 4d0581fa6..93676ece0 100644
--- a/src/blackcore/context/contextsimulator.h
+++ b/src/blackcore/context/contextsimulator.h
@@ -29,11 +29,7 @@
 #include "blackcore/corefacade.h"
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/simulator.h"
-#include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/identifier.h"
-#include "blackmisc/pixmap.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/time.h"
+#include "blackmisc/weather/weathergrid.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
@@ -41,7 +37,11 @@
 #include "blackmisc/simulation/simulatorinternals.h"
 #include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/simulation/interpolationrenderingsetup.h"
-#include "blackmisc/weather/weathergrid.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/pixmap.h"
 
 #include <QObject>
 #include <QString>
diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h
index 330232fae..d12bf2886 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.h
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.h
@@ -12,9 +12,9 @@
 #ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
 #define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
 
+#include "simconnectdatadefinition.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/interpolatormulti.h"
-#include "simconnectdatadefinition.h"
 #include <QSharedPointer>
 #include <QStringList>
 #include <QByteArray>
diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
index 49a7c8582..4474335f2 100644
--- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
+++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
@@ -7,14 +7,13 @@
  * contained in the LICENSE file.
  */
 
-#include "SimConnectsettingscomponent.h"
 #include "SimConnectsettingscomponent.h"
 #include "ui_SimConnectsettingscomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/context/contextapplication.h"
 #include "blackcore/context/contextsimulator.h"
-#include "blackmisc/network/networkutils.h"
 #include "blackmisc/simulation/fsx/SimConnectutilities.h"
+#include "blackmisc/network/networkutils.h"
 #include "blackmisc/logmessage.h"
 #include "blackconfig/buildconfig.h"
 #include <QFileInfo>
@@ -138,8 +137,8 @@ namespace BlackSimPlugin
 
         void CSimConnectSettingsComponent::saveSimConnectCfgFile()
         {
-            QString address = ui->le_Address->text().trimmed();
-            QString port = ui->le_Port->text().trimmed();
+            const QString address = ui->le_Address->text().trimmed();
+            const QString port = ui->le_Port->text().trimmed();
 
             if (address.isEmpty() || port.isEmpty())
             {