Move DirectPlay log function into directplayerror.h/cpp

refs #564

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

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

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>

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"

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"

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"

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"