refs #510 Remove underscores from all the source file names

src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blacksimplugin_freefunctions.h"
-#include "fs9_host.h"
-#include "fs9_client.h"
+#include "blacksimpluginfreefunctions.h"
+#include "fs9host.h"
+#include "fs9client.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/logmessage.h"
 

src/plugins/simulator/fs9/blacksimpluginfreefunctions.h

@@ -12,7 +12,7 @@
 #ifndef BLACKSIMPLUGIN_FREEFUNCTIONS_H
 #define BLACKSIMPLUGIN_FREEFUNCTIONS_H
 
-#include "multiplayer_packets.h"
+#include "multiplayerpackets.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 
 namespace BlackSimPlugin

src/plugins/simulator/fs9/directplaypeer.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "directplay_peer.h"
-#include "multiplayer_packet_parser.h"
-#include "blacksimplugin_freefunctions.h"
+#include "directplaypeer.h"
+#include "multiplayerpacketparser.h"
+#include "blacksimpluginfreefunctions.h"
 #include "blackmisc/logmessage.h"
 #include <QDebug>
 #include <QTimer>

src/plugins/simulator/fs9/directplaypeer.h

@@ -11,8 +11,8 @@
 #define BLACKSIMPLUGIN_FS9_DIRECTPLAY_PEER_H
 
 #include "fs9.h"
-#include "host_node.h"
-#include "callback_wrapper.h"
+#include "hostnode.h"
+#include "callbackwrapper.h"
 #include "blackmisc/worker.h"
 #include "blackmisc/aviation/callsign.h"
 #include <QObject>

src/plugins/simulator/fs9/fs9client.cpp

@@ -9,10 +9,10 @@
 
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "fs9_client.h"
-#include "multiplayer_packets.h"
-#include "multiplayer_packet_parser.h"
-#include "blacksimplugin_freefunctions.h"
+#include "fs9client.h"
+#include "multiplayerpackets.h"
+#include "multiplayerpacketparser.h"
+#include "blacksimpluginfreefunctions.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/logmessage.h"

src/plugins/simulator/fs9/fs9client.h

@@ -10,7 +10,7 @@
 #ifndef DIRECTPLAY_CLIENT_H
 #define DIRECTPLAY_CLIENT_H
 
-#include "directplay_peer.h"
+#include "directplaypeer.h"
 #include "blackcore/interpolator.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/pq/time.h"

src/plugins/simulator/fs9/fs9host.cpp

@@ -9,10 +9,10 @@
 
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "blacksimplugin_freefunctions.h"
-#include "fs9_host.h"
-#include "multiplayer_packet_parser.h"
-#include "multiplayer_packets.h"
+#include "blacksimpluginfreefunctions.h"
+#include "fs9host.h"
+#include "multiplayerpacketparser.h"
+#include "multiplayerpackets.h"
 #include "blackmisc/project.h"
 #include "blackmisc/logmessage.h"
 #include <QScopedArrayPointer>

src/plugins/simulator/fs9/fs9host.h

@@ -10,7 +10,7 @@
 #ifndef DIRECTPLAY_HOST_H
 #define DIRECTPLAY_HOST_H
 
-#include "directplay_peer.h"
+#include "directplaypeer.h"
 
 //! \file
 

src/plugins/simulator/fs9/hostnode.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "host_node.h"
+#include "hostnode.h"
 
 namespace BlackSimPlugin
 {

src/plugins/simulator/fs9/lobbyclient.cpp

@@ -8,10 +8,10 @@
  */
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "blacksimplugin_freefunctions.h"
+#include "blacksimpluginfreefunctions.h"
 #include "blackmisc/project.h"
 #include "fs9.h"
-#include "lobby_client.h"
+#include "lobbyclient.h"
 #include "blackmisc/logmessage.h"
 #include <QDebug>
 #include <QTimer>

src/plugins/simulator/fs9/lobbyclient.h

@@ -1,5 +1,5 @@
 
-#include "callback_wrapper.h"
+#include "callbackwrapper.h"
 #include <QDebug>
 #include <dplay8.h>
 #include <dplobby8.h>

src/plugins/simulator/fs9/multiplayerpacketparser.cpp

@@ -6,7 +6,7 @@
  * including this file, may be copied, modified, propagated, or distributed except according to the terms
  * contained in the LICENSE file.
  */
-#include "multiplayer_packet_parser.h"
+#include "multiplayerpacketparser.h"
 
 namespace BlackSimPlugin
 {

src/plugins/simulator/fs9/plugin_fs9.pro

@@ -20,6 +20,7 @@ LIBS += -ldxguid -lole32
 
 SOURCES += *.cpp
 HEADERS += *.h
+DISTFILES += simulatorfs9.json
 
 DESTDIR = $$DestRoot/bin/plugins/simulator
 

src/plugins/simulator/fs9/simulatorfs9.cpp

@@ -8,14 +8,13 @@
  */
 
 #include "fs9.h"
-#include "blacksimplugin_freefunctions.h"
-#include "simulator_fs9.h"
-#include "fs9_host.h"
-#include "fs9_client.h"
-#include "multiplayer_packets.h"
-#include "multiplayer_packet_parser.h"
-#include "registermetadata.h"
-#include "blackcore/interpolator_linear.h"
+#include "blacksimpluginfreefunctions.h"
+#include "simulatorfs9.h"
+#include "fs9host.h"
+#include "fs9client.h"
+#include "multiplayerpackets.h"
+#include "multiplayerpacketparser.h"
+#include "blackcore/interpolatorlinear.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/project.h"

src/plugins/simulator/fs9/simulatorfs9.h

@@ -12,10 +12,10 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FS9_H
 #define BLACKSIMPLUGIN_SIMULATOR_FS9_H
 
-#include "fs9_host.h"
-#include "fs9_client.h"
-#include "lobby_client.h"
-#include "../fscommon/simulator_fscommon.h"
+#include "fs9host.h"
+#include "fs9client.h"
+#include "lobbyclient.h"
+#include "../fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
 #include "blackcore/interpolator.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
@@ -141,7 +141,7 @@ namespace BlackSimPlugin
         class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fs9.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorfs9.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public: