From 056d205488237c95c5bcde37ae365c4f5ad54ff9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 28 Feb 2017 05:47:48 +0100 Subject: [PATCH] refs #891, unified "windows.h" Remark: Using the lc version seems to be slightly smarter http://stackoverflow.com/a/15466951/356726 --- src/blackcore/vatsim/voicevatlib.h | 2 +- src/blackmisc/librarypath.cpp | 2 +- src/blackmisc/processctrl.cpp | 3 +-- src/blackmisc/simulation/fsx/simconnectutilities.h | 2 +- src/plugins/simulator/fscommon/fsuipc.cpp | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/blackcore/vatsim/voicevatlib.h b/src/blackcore/vatsim/voicevatlib.h index adce13c68..e7576dad6 100644 --- a/src/blackcore/vatsim/voicevatlib.h +++ b/src/blackcore/vatsim/voicevatlib.h @@ -32,7 +32,7 @@ template class QSharedPointer; #ifndef NOMINMAX #define NOMINMAX #endif -#include +#include #endif namespace BlackCore diff --git a/src/blackmisc/librarypath.cpp b/src/blackmisc/librarypath.cpp index 9605c2a37..1f80affa1 100644 --- a/src/blackmisc/librarypath.cpp +++ b/src/blackmisc/librarypath.cpp @@ -13,7 +13,7 @@ #include #ifdef Q_OS_WIN -#include +#include #endif namespace BlackMisc diff --git a/src/blackmisc/processctrl.cpp b/src/blackmisc/processctrl.cpp index 5766cdfce..2ff8bd707 100644 --- a/src/blackmisc/processctrl.cpp +++ b/src/blackmisc/processctrl.cpp @@ -13,12 +13,11 @@ #include #ifdef Q_OS_WIN -#include +#include #endif namespace BlackMisc { - CProcessCtrl::CProcessCtrl(QObject *parent) : QProcess(parent) { } diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.h b/src/blackmisc/simulation/fsx/simconnectutilities.h index ade5cd37b..1e605816e 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.h +++ b/src/blackmisc/simulation/fsx/simconnectutilities.h @@ -27,7 +27,7 @@ # ifndef NOMINMAX # define NOMINMAX # endif -# include +# include #else using DWORD = unsigned long; //!< Fake Windows DWORD #endif diff --git a/src/plugins/simulator/fscommon/fsuipc.cpp b/src/plugins/simulator/fscommon/fsuipc.cpp index 6f6509903..8c8dc14e4 100644 --- a/src/plugins/simulator/fscommon/fsuipc.cpp +++ b/src/plugins/simulator/fscommon/fsuipc.cpp @@ -12,7 +12,7 @@ #endif #include "fsuipc.h" -#include +#include // bug in FSUIPC_User.h, windows.h not included, so we have to import it first #include "FSUIPC/FSUIPC_User.h" #include "FSUIPC/NewWeather.h" @@ -242,7 +242,6 @@ namespace BlackSimPlugin qint16 numberOfEngines = 0; qint16 engine1CombustionFlag = 0, engine2CombustionFlag = 0, engine3CombustionFlag = 0, engine4CombustionFlag = 0; - // http://www.projectmagenta.com/all-fsuipc-offsets/ // https://www.ivao.aero/softdev/ivap/fsuipc_sdk.asp // http://squawkbox.ca/doc/sdk/fsuipc.php