From a7e74ea64a6e1b66ffc1def2f2d34ab252b371cc Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 4 Jan 2016 15:58:27 +0100
Subject: [PATCH] Move DirectPlay log function into directplayerror.h/cpp

refs #564
---
 ...pluginfreefunctions.cpp => directplayerror.cpp} |  7 ++-----
 ...ksimpluginfreefunctions.h => directplayerror.h} | 14 +++++++-------
 src/plugins/simulator/fs9/directplaypeer.cpp       |  2 +-
 src/plugins/simulator/fs9/fs9client.cpp            |  2 +-
 src/plugins/simulator/fs9/fs9host.cpp              |  2 +-
 src/plugins/simulator/fs9/lobbyclient.cpp          |  2 +-
 src/plugins/simulator/fs9/simulatorfs9.cpp         |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)
 rename src/plugins/simulator/fs9/{blacksimpluginfreefunctions.cpp => directplayerror.cpp} (94%)
 rename src/plugins/simulator/fs9/{blacksimpluginfreefunctions.h => directplayerror.h} (79%)

diff --git a/src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp b/src/plugins/simulator/fs9/directplayerror.cpp
similarity index 94%
rename from src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp
rename to src/plugins/simulator/fs9/directplayerror.cpp
index c6d677e0a..19ba13f67 100644
--- a/src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp
+++ b/src/plugins/simulator/fs9/directplayerror.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014
+/* Copyright (C) 2016
  * swift project community / contributors
  *
  * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
@@ -7,10 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blacksimpluginfreefunctions.h"
-#include "fs9host.h"
-#include "fs9client.h"
-#include "blackmisc/math/mathutils.h"
+#include "directplayerror.h"
 #include "blackmisc/logmessage.h"
 
 namespace BlackSimPlugin
diff --git a/src/plugins/simulator/fs9/blacksimpluginfreefunctions.h b/src/plugins/simulator/fs9/directplayerror.h
similarity index 79%
rename from src/plugins/simulator/fs9/blacksimpluginfreefunctions.h
rename to src/plugins/simulator/fs9/directplayerror.h
index 4914dc7b8..f2d2de015 100644
--- a/src/plugins/simulator/fs9/blacksimpluginfreefunctions.h
+++ b/src/plugins/simulator/fs9/directplayerror.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014
+/* Copyright (C) 2016
  * swift project community / contributors
  *
  * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
@@ -9,9 +9,10 @@
 
 //! \file
 
-#ifndef BLACKSIMPLUGIN_FREEFUNCTIONS_H
-#define BLACKSIMPLUGIN_FREEFUNCTIONS_H
+#ifndef BLACKSIMPLUGIN_FS9_DIRECTPLAYERROR_H
+#define BLACKSIMPLUGIN_FS9_DIRECTPLAYERROR_H
 
+#include <dplay8.h>
 
 namespace BlackSimPlugin
 {
@@ -19,8 +20,7 @@ namespace BlackSimPlugin
     {
         //! Print the direct play error
         HRESULT logDirectPlayError(HRESULT error);
+    }
+}
 
-    } // ns
-} // ns
-
-#endif // guard
+#endif
diff --git a/src/plugins/simulator/fs9/directplaypeer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp
index a109eeeda..4eb6ef94f 100644
--- a/src/plugins/simulator/fs9/directplaypeer.cpp
+++ b/src/plugins/simulator/fs9/directplaypeer.cpp
@@ -10,7 +10,7 @@
 #include "directplaypeer.h"
 #include "directplayutils.h"
 #include "multiplayerpacketparser.h"
-#include "blacksimpluginfreefunctions.h"
+#include "directplayerror.h"
 #include "blackmisc/logmessage.h"
 #include <QDebug>
 #include <QTimer>
diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp
index c8dada0db..d90900f04 100644
--- a/src/plugins/simulator/fs9/fs9client.cpp
+++ b/src/plugins/simulator/fs9/fs9client.cpp
@@ -12,7 +12,7 @@
 #include "fs9client.h"
 #include "multiplayerpackets.h"
 #include "multiplayerpacketparser.h"
-#include "blacksimpluginfreefunctions.h"
+#include "directplayerror.h"
 #include "directplayutils.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/geo/coordinategeodetic.h"
diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp
index ba404bd30..e771f2275 100644
--- a/src/plugins/simulator/fs9/fs9host.cpp
+++ b/src/plugins/simulator/fs9/fs9host.cpp
@@ -9,7 +9,7 @@
 
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "blacksimpluginfreefunctions.h"
+#include "directplayerror.h"
 #include "directplayutils.h"
 #include "fs9host.h"
 #include "multiplayerpacketparser.h"
diff --git a/src/plugins/simulator/fs9/lobbyclient.cpp b/src/plugins/simulator/fs9/lobbyclient.cpp
index 35f5f1e08..3fee3f91c 100644
--- a/src/plugins/simulator/fs9/lobbyclient.cpp
+++ b/src/plugins/simulator/fs9/lobbyclient.cpp
@@ -8,7 +8,7 @@
  */
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "blacksimpluginfreefunctions.h"
+#include "directplayerror.h"
 #include "directplayutils.h"
 #include "blackmisc/project.h"
 #include "fs9.h"
diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp
index 1ee872f29..f40e1016c 100644
--- a/src/plugins/simulator/fs9/simulatorfs9.cpp
+++ b/src/plugins/simulator/fs9/simulatorfs9.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "fs9.h"
-#include "blacksimpluginfreefunctions.h"
+#include "directplayerror.h"
 #include "simulatorfs9.h"
 #include "fs9client.h"
 #include "multiplayerpackets.h"