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:

src/plugins/simulator/fscommon/simulatorfscommon.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "simulator_fscommon.h"
+#include "simulatorfscommon.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h"
 #include "blackmisc/blackmiscfreefunctions.h"

src/plugins/simulator/fscommon/simulatorfscommon.h

@@ -12,7 +12,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_COMMON_H
 #define BLACKSIMPLUGIN_SIMULATOR_COMMON_H
 
-#include "blackcore/simulator_common.h"
+#include "blackcore/simulatorcommon.h"
 #include "blackcore/interpolator.h"
 #include "blackmisc/simulation/aircraftmatcher.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"

src/plugins/simulator/fsx/plugin_fsx.pro

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

src/plugins/simulator/fsx/simconnectdatadefinition.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "simconnect_datadefinition.h"
+#include "simconnectdatadefinition.h"
 #include "blackmisc/logmessage.h"
 
 using namespace BlackMisc;

src/plugins/simulator/fsx/simconnectobject.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simconnect_object.h"
-#include "blackcore/interpolator_linear.h"
+#include "simconnectobject.h"
+#include "blackcore/interpolatorlinear.h"
 
 using namespace BlackCore;
 

src/plugins/simulator/fsx/simulatorfsx.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simulator_fsx.h"
-#include "blackcore/interpolator_linear.h"
+#include "simulatorfsx.h"
+#include "blackcore/interpolatorlinear.h"
 #include "blackcore/registermetadata.h"
 #include "blackmisc/simulation/fscommon/bcdconversions.h"
 #include "blackmisc/simulation/fsx/simconnectutilities.h"

src/plugins/simulator/fsx/simulatorfsx.h

@@ -12,11 +12,11 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_H
 #define BLACKSIMPLUGIN_SIMULATOR_FSX_H
 
-#include "simconnect_datadefinition.h"
-#include "simconnect_object.h"
-#include "../fscommon/simulator_fscommon.h"
+#include "simconnectdatadefinition.h"
+#include "simconnectobject.h"
+#include "../fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
-#include "blackcore/interpolator_linear.h"
+#include "blackcore/interpolatorlinear.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"

src/plugins/simulator/fsx/simulatorfsxfactory.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simulator_fsxfactory.h"
-#include "simulator_fsx.h"
+#include "simulatorfsxfactory.h"
+#include "simulatorfsx.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/project.h"
 #include <QTimer>

src/plugins/simulator/fsx/simulatorfsxfactory.h

@@ -29,7 +29,7 @@ namespace BlackSimPlugin
             public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fsx.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorfsx.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:

src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simulator_fsx.h"
-#include "simconnect_datadefinition.h"
+#include "simulatorfsx.h"
+#include "simconnectdatadefinition.h"
 #include "blackmisc/simulation/fscommon/bcdconversions.h"
 #include "blackmisc/simulation/fsx/simconnectutilities.h"
 #include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"

src/plugins/simulator/fsx_config/plugin_fsx_config.pro

@@ -13,7 +13,7 @@ INCLUDEPATH += . $$SourceRoot/src
 SOURCES += *.cpp
 HEADERS += *.h
 FORMS += *.ui
-DISTFILES += simulator_fsx_config.json
+DISTFILES += simulatorfsxconfig.json
 
 DESTDIR = $$BuildRoot/bin/plugins/simulator
 

src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp

@@ -1,7 +1,7 @@
 #include "simconnectsettingscomponent.h"
 #include "ui_simconnectsettingscomponent.h"
-#include "blackcore/context_application.h"
-#include "blackcore/context_simulator.h"
+#include "blackcore/contextapplication.h"
+#include "blackcore/contextsimulator.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"

src/plugins/simulator/fsx_config/simulatorfsxconfig.h

@@ -23,7 +23,7 @@ namespace BlackSimPlugin
         class CSimulatorFsxConfig :  public QObject, public BlackGui::IPluginConfig
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulator_fsx_config.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorfsxconfig.json")
             Q_INTERFACES(BlackGui::IPluginConfig)
 
         public:

src/plugins/simulator/xplane/plugin_xplane.pro

@@ -13,7 +13,7 @@ INCLUDEPATH += . $$SourceRoot/src
 
 SOURCES += *.cpp
 HEADERS += *.h
-DISTFILES += simulator_xplane.json
+DISTFILES += simulatorxplane.json
 
 DESTDIR = $$DestRoot/bin/plugins/simulator
 

src/plugins/simulator/xplane/simulatorxplane.cpp

@@ -7,11 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "simulator_xplane.h"
-#include "xbus_service_proxy.h"
-#include "xbus_traffic_proxy.h"
-#include "xbus_weather_proxy.h"
-#include "blackcore/dbus_server.h"
+#include "simulatorxplane.h"
+#include "xbusserviceproxy.h"
+#include "xbustrafficproxy.h"
+#include "xbusweatherproxy.h"
+#include "blackcore/dbusserver.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/simulation/modelmappingsprovider.h"

src/plugins/simulator/xplane/simulatorxplane.h

@@ -12,7 +12,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 
-#include "blackcore/simulator_common.h"
+#include "blackcore/simulatorcommon.h"
 #include "blackmisc/simulation/aircraftmatcher.h"
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
@@ -222,7 +222,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_xplane.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorxplane.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:

src/plugins/simulator/xplane/xbusserviceproxy.cpp

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "xbus_service_proxy.h"
-#include "blackcore/dbus_server.h"
+#include "xbusserviceproxy.h"
+#include "blackcore/dbusserver.h"
 #include <QMetaMethod>
 
 #define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus"

src/plugins/simulator/xplane/xbustrafficproxy.cpp

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "xbus_traffic_proxy.h"
-#include "blackcore/dbus_server.h"
+#include "xbustrafficproxy.h"
+#include "blackcore/dbusserver.h"
 #include <QMetaMethod>
 
 #define XBUS_SERVICENAME "org.swift-project.xbus"

src/plugins/simulator/xplane/xbusweatherproxy.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "xbus_weather_proxy.h"
-#include "blackcore/dbus_server.h"
+#include "xbusweatherproxy.h"
+#include "blackcore/dbusserver.h"
 
 #define XBUS_SERVICENAME "org.swift-project.xbus"
 

src/plugins/simulator/xplane_config/plugin_xplane_config.pro

@@ -14,7 +14,7 @@ INCLUDEPATH += . $$SourceRoot/src
 SOURCES += *.cpp
 HEADERS += *.h
 FORMS += *.ui
-DISTFILES += simulator_xplane_config.json
+DISTFILES += simulatorxplaneconfig.json
 
 DESTDIR = $$DestRoot/bin/plugins/simulator
 

src/plugins/simulator/xplane_config/simulatorxplaneconfig.h

@@ -34,7 +34,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneConfig : public QObject, public BlackGui::IPluginConfig
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulator_xplane_config.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
             Q_INTERFACES(BlackGui::IPluginConfig)
 
         public:

src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp

@@ -1,6 +1,6 @@
 #include "simulatorxplaneconfigwindow.h"
 #include "ui_simulatorxplaneconfigwindow.h"
-#include "blackcore/dbus_server.h"
+#include "blackcore/dbusserver.h"
 #include "blackmisc/simulation/xplane/xplaneutil.h"
 #include "blackmisc/fileutils.h"
 #include <QStringBuilder>