diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index 02f1e39df..f32b9fe27 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -9,7 +9,7 @@ #include "blackmisc/registermetadata.h" #include "servicetool.h" -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #include #include #include diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index d2d780d93..f6f9bbc6c 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -10,7 +10,7 @@ #include "servicetool.h" #include "testservice.h" #include "testservice_interface.h" -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #include #include diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index e454cd07a..3a2844ef7 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -12,7 +12,7 @@ #ifndef BLACKMISCTEST_SERVICETOOL_H #define BLACKMISCTEST_SERVICETOOL_H -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/network/clientlist.h" diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index b0d728a9e..775ce5855 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -8,7 +8,7 @@ */ #include "client.h" -#include "blackcore/network_vatlib.h" +#include "blackcore/networkvatlib.h" #include #include diff --git a/samples/cli_client/main.cpp b/samples/cli_client/main.cpp index fa7c6fbd3..d5bb1fa52 100644 --- a/samples/cli_client/main.cpp +++ b/samples/cli_client/main.cpp @@ -3,7 +3,7 @@ * 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 "blackcore/network_vatlib.h" +#include "blackcore/networkvatlib.h" #include "blackmisc/loghandler.h" #include "client.h" #include "reader.h" diff --git a/src/blackcore/actionbind.h b/src/blackcore/actionbind.h index ec4112189..02142b146 100644 --- a/src/blackcore/actionbind.h +++ b/src/blackcore/actionbind.h @@ -12,7 +12,7 @@ #ifndef BLACKCORE_ACTIONBIND_H #define BLACKCORE_ACTIONBIND_H -#include "blackcore/input_manager.h" +#include "blackcore/inputmanager.h" namespace BlackCore { diff --git a/src/blackcore/airspace_analyzer.cpp b/src/blackcore/airspaceanalyzer.cpp similarity index 99% rename from src/blackcore/airspace_analyzer.cpp rename to src/blackcore/airspaceanalyzer.cpp index 457fe11e5..7574b12a1 100644 --- a/src/blackcore/airspace_analyzer.cpp +++ b/src/blackcore/airspaceanalyzer.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackcore/airspace_analyzer.h" +#include "blackcore/airspaceanalyzer.h" #include "blackcore/registermetadata.h" #include "blackmisc/logmessage.h" #include "blackmisc/threadutils.h" diff --git a/src/blackcore/airspace_analyzer.h b/src/blackcore/airspaceanalyzer.h similarity index 100% rename from src/blackcore/airspace_analyzer.h rename to src/blackcore/airspaceanalyzer.h diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspacemonitor.cpp similarity index 99% rename from src/blackcore/airspace_monitor.cpp rename to src/blackcore/airspacemonitor.cpp index 5bf545f03..8be999550 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "airspace_monitor.h" +#include "airspacemonitor.h" #include "blackcore/registermetadata.h" #include "blackcore/webdataservices.h" #include "blackcore/vatsimbookingreader.h" diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspacemonitor.h similarity index 99% rename from src/blackcore/airspace_monitor.h rename to src/blackcore/airspacemonitor.h index 95baff73f..1d859e86a 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspacemonitor.h @@ -15,7 +15,7 @@ #include "blackcore/blackcoreexport.h" #include "blackcore/network.h" #include "blackcore/vatsimmetarreader.h" -#include "airspace_analyzer.h" +#include "airspaceanalyzer.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/ownaircraftprovider.h" #include "blackmisc/simulation/remoteaircraftprovider.h" diff --git a/src/blackcore/audio_device.h b/src/blackcore/audiodevice.h similarity index 100% rename from src/blackcore/audio_device.h rename to src/blackcore/audiodevice.h diff --git a/src/blackcore/audio_device_vatlib.cpp b/src/blackcore/audiodevicevatlib.cpp similarity index 99% rename from src/blackcore/audio_device_vatlib.cpp rename to src/blackcore/audiodevicevatlib.cpp index 7ddb80137..17a95a220 100644 --- a/src/blackcore/audio_device_vatlib.cpp +++ b/src/blackcore/audiodevicevatlib.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audio_device_vatlib.h" +#include "audiodevicevatlib.h" #include "blackmisc/logmessage.h" using namespace BlackMisc; diff --git a/src/blackcore/audio_device_vatlib.h b/src/blackcore/audiodevicevatlib.h similarity index 99% rename from src/blackcore/audio_device_vatlib.h rename to src/blackcore/audiodevicevatlib.h index 8226987a2..4629dec06 100644 --- a/src/blackcore/audio_device_vatlib.h +++ b/src/blackcore/audiodevicevatlib.h @@ -13,7 +13,7 @@ #define BLACKCORE_AUDIODEVICEVATLIB_H #include "blackcoreexport.h" -#include "audio_device.h" +#include "audiodevice.h" #include "blackmisc/audio/audiodeviceinfo.h" #include "blackmisc/audio/audiodeviceinfolist.h" #include "vatlib/vatlib2.h" diff --git a/src/blackcore/audio_mixer.cpp b/src/blackcore/audiomixer.cpp similarity index 95% rename from src/blackcore/audio_mixer.cpp rename to src/blackcore/audiomixer.cpp index 98879c59b..5a40fa2f6 100644 --- a/src/blackcore/audio_mixer.cpp +++ b/src/blackcore/audiomixer.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audio_mixer.h" +#include "audiomixer.h" namespace BlackCore { diff --git a/src/blackcore/audio_mixer.h b/src/blackcore/audiomixer.h similarity index 100% rename from src/blackcore/audio_mixer.h rename to src/blackcore/audiomixer.h diff --git a/src/blackcore/audio_mixer_vatlib.cpp b/src/blackcore/audiomixervatlib.cpp similarity index 97% rename from src/blackcore/audio_mixer_vatlib.cpp rename to src/blackcore/audiomixervatlib.cpp index 81dd491f0..623d3f95b 100644 --- a/src/blackcore/audio_mixer_vatlib.cpp +++ b/src/blackcore/audiomixervatlib.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audio_mixer_vatlib.h" +#include "audiomixervatlib.h" namespace BlackCore { diff --git a/src/blackcore/audio_mixer_vatlib.h b/src/blackcore/audiomixervatlib.h similarity index 98% rename from src/blackcore/audio_mixer_vatlib.h rename to src/blackcore/audiomixervatlib.h index 9b8d2faee..9a76f7fc6 100644 --- a/src/blackcore/audio_mixer_vatlib.h +++ b/src/blackcore/audiomixervatlib.h @@ -11,7 +11,7 @@ #define BLACKCORE_AUDIOMIXERVATLIB_H #include "blackcoreexport.h" -#include "audio_mixer.h" +#include "audiomixer.h" #include "vatlib/vatlib2.h" #include diff --git a/src/blackcore/context.h b/src/blackcore/context.h index e5396b8f3..8f2b02c77 100644 --- a/src/blackcore/context.h +++ b/src/blackcore/context.h @@ -13,8 +13,8 @@ #define BLACKCORE_CONTEXT_H #include "blackcoreexport.h" -#include "blackcore/context_runtime_config.h" -#include "blackcore/context_runtime.h" +#include "blackcore/contextruntimeconfig.h" +#include "blackcore/contextruntime.h" #include "blackmisc/logmessage.h" #include #include diff --git a/src/blackcore/context_all_impl.h b/src/blackcore/context_all_impl.h deleted file mode 100644 index c4f75916f..000000000 --- a/src/blackcore/context_all_impl.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef BLACKCORE_CONTEXT_ALL_IMPL_H -#define BLACKCORE_CONTEXT_ALL_IMPL_H - -#include "context_application_impl.h" -#include "context_audio_impl.h" -#include "context_network_impl.h" -#include "context_ownaircraft_impl.h" -#include "context_simulator_impl.h" - -#endif // guard diff --git a/src/blackcore/context_all_interfaces.h b/src/blackcore/context_all_interfaces.h deleted file mode 100644 index 5e738e6cc..000000000 --- a/src/blackcore/context_all_interfaces.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef BLACKCORE_CONTEXT_ALL_ITERFACES_H -#define BLACKCORE_CONTEXT_ALL_ITERFACES_H - -#include "context_application.h" -#include "context_audio.h" -#include "context_network.h" -#include "context_ownaircraft.h" -#include "context_simulator.h" - -#endif // guard diff --git a/src/blackcore/context_all_proxies.h b/src/blackcore/context_all_proxies.h deleted file mode 100644 index 186d178f6..000000000 --- a/src/blackcore/context_all_proxies.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef BLACKCORE_CONTEXT_ALL_PROXIES_H -#define BLACKCORE_CONTEXT_ALL_PROXIES_H - -#include "context_application_proxy.h" -#include "context_audio_proxy.h" -#include "context_network_proxy.h" -#include "context_ownaircraft_proxy.h" -#include "context_simulator_proxy.h" - -#endif // guard diff --git a/src/blackcore/context_all_empties.h b/src/blackcore/contextallempties.h similarity index 74% rename from src/blackcore/context_all_empties.h rename to src/blackcore/contextallempties.h index f89ad9a88..ddbf67255 100644 --- a/src/blackcore/context_all_empties.h +++ b/src/blackcore/contextallempties.h @@ -10,10 +10,10 @@ #ifndef BLACKCORE_CONTEXT_ALL_EMPTIES_H #define BLACKCORE_CONTEXT_ALL_EMPTIES_H -#include "context_application_empty.h" -#include "context_audio_empty.h" -#include "context_network_empty.h" -#include "context_ownaircraft_empty.h" -#include "context_simulator_empty.h" +#include "contextapplicationempty.h" +#include "contextaudioempty.h" +#include "contextnetworkempty.h" +#include "contextownaircraftempty.h" +#include "contextsimulatorempty.h" #endif // guard diff --git a/src/blackcore/contextallimpl.h b/src/blackcore/contextallimpl.h new file mode 100644 index 000000000..c83befdbc --- /dev/null +++ b/src/blackcore/contextallimpl.h @@ -0,0 +1,10 @@ +#ifndef BLACKCORE_CONTEXT_ALL_IMPL_H +#define BLACKCORE_CONTEXT_ALL_IMPL_H + +#include "contextapplicationimpl.h" +#include "contextaudioimpl.h" +#include "contextnetworkimpl.h" +#include "contextownaircraftimpl.h" +#include "contextsimulatorimpl.h" + +#endif // guard diff --git a/src/blackcore/contextallinterfaces.h b/src/blackcore/contextallinterfaces.h new file mode 100644 index 000000000..4f583729c --- /dev/null +++ b/src/blackcore/contextallinterfaces.h @@ -0,0 +1,10 @@ +#ifndef BLACKCORE_CONTEXT_ALL_ITERFACES_H +#define BLACKCORE_CONTEXT_ALL_ITERFACES_H + +#include "contextapplication.h" +#include "contextaudio.h" +#include "contextnetwork.h" +#include "contextownaircraft.h" +#include "contextsimulator.h" + +#endif // guard diff --git a/src/blackcore/contextallproxies.h b/src/blackcore/contextallproxies.h new file mode 100644 index 000000000..5f319895c --- /dev/null +++ b/src/blackcore/contextallproxies.h @@ -0,0 +1,10 @@ +#ifndef BLACKCORE_CONTEXT_ALL_PROXIES_H +#define BLACKCORE_CONTEXT_ALL_PROXIES_H + +#include "contextapplicationproxy.h" +#include "contextaudioproxy.h" +#include "contextnetworkproxy.h" +#include "contextownaircraftproxy.h" +#include "contextsimulatorproxy.h" + +#endif // guard diff --git a/src/blackcore/context_application.cpp b/src/blackcore/contextapplication.cpp similarity index 96% rename from src/blackcore/context_application.cpp rename to src/blackcore/contextapplication.cpp index 73dbe694f..e8fc76dc0 100644 --- a/src/blackcore/context_application.cpp +++ b/src/blackcore/contextapplication.cpp @@ -7,11 +7,11 @@ * contained in the LICENSE file. */ -#include "blackcore/context_application.h" -#include "blackcore/context_application_impl.h" -#include "blackcore/context_application_proxy.h" -#include "blackcore/context_application_empty.h" -#include "blackcore/input_manager.h" +#include "blackcore/contextapplication.h" +#include "blackcore/contextapplicationimpl.h" +#include "blackcore/contextapplicationproxy.h" +#include "blackcore/contextapplicationempty.h" +#include "blackcore/inputmanager.h" #include "blackcore/settingscache.h" #include "blackmisc/statusmessage.h" #include "blackmisc/loghandler.h" diff --git a/src/blackcore/context_application.h b/src/blackcore/contextapplication.h similarity index 100% rename from src/blackcore/context_application.h rename to src/blackcore/contextapplication.h diff --git a/src/blackcore/context_application_empty.h b/src/blackcore/contextapplicationempty.h similarity index 99% rename from src/blackcore/context_application_empty.h rename to src/blackcore/contextapplicationempty.h index 00dd60967..1851d1ba7 100644 --- a/src/blackcore/context_application_empty.h +++ b/src/blackcore/contextapplicationempty.h @@ -11,8 +11,8 @@ #define BLACKCORE_CONTEXTAPPLICATION_EMPTY_H #include "blackcoreexport.h" -#include "context_application.h" -#include "context_runtime.h" +#include "contextapplication.h" +#include "contextruntime.h" #include "blackmisc/identifierlist.h" namespace BlackCore diff --git a/src/blackcore/context_application_impl.cpp b/src/blackcore/contextapplicationimpl.cpp similarity index 98% rename from src/blackcore/context_application_impl.cpp rename to src/blackcore/contextapplicationimpl.cpp index 176abbd26..9f5eff53e 100644 --- a/src/blackcore/context_application_impl.cpp +++ b/src/blackcore/contextapplicationimpl.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "context_application_impl.h" -#include "context_runtime.h" -#include "input_manager.h" +#include "contextapplicationimpl.h" +#include "contextruntime.h" +#include "inputmanager.h" #include "settingscache.h" #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" diff --git a/src/blackcore/context_application_impl.h b/src/blackcore/contextapplicationimpl.h similarity index 98% rename from src/blackcore/context_application_impl.h rename to src/blackcore/contextapplicationimpl.h index 3c78613c4..a61a07831 100644 --- a/src/blackcore/context_application_impl.h +++ b/src/blackcore/contextapplicationimpl.h @@ -11,9 +11,9 @@ #define BLACKCORE_CONTEXTAPPLICATION_IMPL_H #include "blackcoreexport.h" -#include "context_application.h" -#include "context_runtime.h" -#include "dbus_server.h" +#include "contextapplication.h" +#include "contextruntime.h" +#include "dbusserver.h" #include "blackmisc/identifierlist.h" namespace BlackCore diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/contextapplicationproxy.cpp similarity index 98% rename from src/blackcore/context_application_proxy.cpp rename to src/blackcore/contextapplicationproxy.cpp index c860b8376..cc4992dae 100644 --- a/src/blackcore/context_application_proxy.cpp +++ b/src/blackcore/contextapplicationproxy.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackcore/context_application_proxy.h" -#include "blackcore/input_manager.h" +#include "blackcore/contextapplicationproxy.h" +#include "blackcore/inputmanager.h" #include "blackcore/settingscache.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/loghandler.h" diff --git a/src/blackcore/context_application_proxy.h b/src/blackcore/contextapplicationproxy.h similarity index 99% rename from src/blackcore/context_application_proxy.h rename to src/blackcore/contextapplicationproxy.h index 78b97f500..820579272 100644 --- a/src/blackcore/context_application_proxy.h +++ b/src/blackcore/contextapplicationproxy.h @@ -7,7 +7,7 @@ #define BLACKCORE_CONTEXTAPPLICATION_PROXY_H #include "blackcoreexport.h" -#include "context_application.h" +#include "contextapplication.h" #include "blackmisc/genericdbusinterface.h" namespace BlackCore diff --git a/src/blackcore/context_audio.cpp b/src/blackcore/contextaudio.cpp similarity index 89% rename from src/blackcore/context_audio.cpp rename to src/blackcore/contextaudio.cpp index 4c79ef2fd..ceb643bab 100644 --- a/src/blackcore/context_audio.cpp +++ b/src/blackcore/contextaudio.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "context_audio.h" -#include "context_audio_impl.h" -#include "context_audio_proxy.h" -#include "context_audio_empty.h" +#include "contextaudio.h" +#include "contextaudioimpl.h" +#include "contextaudioproxy.h" +#include "contextaudioempty.h" namespace BlackCore { diff --git a/src/blackcore/context_audio.h b/src/blackcore/contextaudio.h similarity index 100% rename from src/blackcore/context_audio.h rename to src/blackcore/contextaudio.h diff --git a/src/blackcore/context_audio_empty.h b/src/blackcore/contextaudioempty.h similarity index 99% rename from src/blackcore/context_audio_empty.h rename to src/blackcore/contextaudioempty.h index 4bfc58910..5653a701e 100644 --- a/src/blackcore/context_audio_empty.h +++ b/src/blackcore/contextaudioempty.h @@ -13,8 +13,8 @@ #define BLACKCORE_CONTEXTAUDIO_EMPTY_H #include "blackcoreexport.h" -#include "context_audio.h" -#include "dbus_server.h" +#include "contextaudio.h" +#include "dbusserver.h" #include "voice.h" namespace BlackCore diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/contextaudioimpl.cpp similarity index 99% rename from src/blackcore/context_audio_impl.cpp rename to src/blackcore/contextaudioimpl.cpp index d62237035..dfd4c6ce0 100644 --- a/src/blackcore/context_audio_impl.cpp +++ b/src/blackcore/contextaudioimpl.cpp @@ -7,12 +7,12 @@ * contained in the LICENSE file. */ -#include "context_audio_impl.h" -#include "context_network.h" -#include "context_ownaircraft.h" -#include "context_application.h" -#include "voice_channel.h" -#include "voice_vatlib.h" +#include "contextaudioimpl.h" +#include "contextnetwork.h" +#include "contextownaircraft.h" +#include "contextapplication.h" +#include "voicechannel.h" +#include "voicevatlib.h" #include "blacksound/soundgenerator.h" #include "blackmisc/audio/notificationsounds.h" diff --git a/src/blackcore/context_audio_impl.h b/src/blackcore/contextaudioimpl.h similarity index 96% rename from src/blackcore/context_audio_impl.h rename to src/blackcore/contextaudioimpl.h index 749c604c6..4119587b3 100644 --- a/src/blackcore/context_audio_impl.h +++ b/src/blackcore/contextaudioimpl.h @@ -13,13 +13,13 @@ #define BLACKCORE_CONTEXTAUDIO_IMPL_H #include "blackcore/blackcoreexport.h" -#include "blackcore/context_audio.h" -#include "blackcore/context_runtime.h" -#include "blackcore/dbus_server.h" +#include "blackcore/contextaudio.h" +#include "blackcore/contextruntime.h" +#include "blackcore/dbusserver.h" #include "blackcore/voice.h" -#include "blackcore/voice_channel.h" -#include "blackcore/audio_device.h" -#include "blackcore/audio_mixer.h" +#include "blackcore/voicechannel.h" +#include "blackcore/audiodevice.h" +#include "blackcore/audiomixer.h" #include "blackcore/actionbind.h" #include "blackinput/keyboard.h" #include "blackcore/settings/audio.h" diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/contextaudioproxy.cpp similarity index 99% rename from src/blackcore/context_audio_proxy.cpp rename to src/blackcore/contextaudioproxy.cpp index 53813322e..54529ae0b 100644 --- a/src/blackcore/context_audio_proxy.cpp +++ b/src/blackcore/contextaudioproxy.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "context_audio_proxy.h" +#include "contextaudioproxy.h" #include using namespace BlackMisc::Audio; diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/contextaudioproxy.h similarity index 99% rename from src/blackcore/context_audio_proxy.h rename to src/blackcore/contextaudioproxy.h index a2045e5fc..5e0f9cd3c 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/contextaudioproxy.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTVOICE_PROXY_H #include "blackcoreexport.h" -#include "context_audio.h" +#include "contextaudio.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/audiodeviceinfolist.h" diff --git a/src/blackcore/context_network.cpp b/src/blackcore/contextnetwork.cpp similarity index 89% rename from src/blackcore/context_network.cpp rename to src/blackcore/contextnetwork.cpp index 1c2b14f32..2be8deba8 100644 --- a/src/blackcore/context_network.cpp +++ b/src/blackcore/contextnetwork.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "context_network.h" -#include "context_network_impl.h" -#include "context_network_proxy.h" -#include "context_network_empty.h" +#include "contextnetwork.h" +#include "contextnetworkimpl.h" +#include "contextnetworkproxy.h" +#include "contextnetworkempty.h" namespace BlackCore { diff --git a/src/blackcore/context_network.h b/src/blackcore/contextnetwork.h similarity index 100% rename from src/blackcore/context_network.h rename to src/blackcore/contextnetwork.h diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/contextnetworkempty.h similarity index 99% rename from src/blackcore/context_network_empty.h rename to src/blackcore/contextnetworkempty.h index 5318464d9..2bdd533ec 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/contextnetworkempty.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTNETWORK_EMPTY_H #include "blackcoreexport.h" -#include "context_network.h" +#include "contextnetwork.h" #include "blackmisc/logmessage.h" namespace BlackCore diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/contextnetworkimpl.cpp similarity index 99% rename from src/blackcore/context_network_impl.cpp rename to src/blackcore/contextnetworkimpl.cpp index b648f1a35..61abf1fd4 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/contextnetworkimpl.cpp @@ -7,14 +7,14 @@ * contained in the LICENSE file. */ -#include "context_network_impl.h" -#include "context_runtime.h" -#include "context_application.h" -#include "context_simulator.h" -#include "context_ownaircraft_impl.h" -#include "network_vatlib.h" +#include "contextnetworkimpl.h" +#include "contextruntime.h" +#include "contextapplication.h" +#include "contextsimulator.h" +#include "contextownaircraftimpl.h" +#include "networkvatlib.h" #include "vatsimmetarreader.h" -#include "airspace_monitor.h" +#include "airspacemonitor.h" #include "webdataservices.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/aviation/atcstationlist.h" diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/contextnetworkimpl.h similarity index 99% rename from src/blackcore/context_network_impl.h rename to src/blackcore/contextnetworkimpl.h index 0ec114b8a..ce9697974 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/contextnetworkimpl.h @@ -13,9 +13,9 @@ #define BLACKCORE_CONTEXTNETWORK_IMPL_H #include "blackcoreexport.h" -#include "blackcore/context_network.h" -#include "blackcore/context_runtime.h" -#include "blackcore/dbus_server.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextruntime.h" +#include "blackcore/dbusserver.h" #include "blackcore/network.h" #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/aviation/atcstationlist.h" diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/contextnetworkproxy.cpp similarity index 99% rename from src/blackcore/context_network_proxy.cpp rename to src/blackcore/contextnetworkproxy.cpp index dde961aab..648d2c18b 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/contextnetworkproxy.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackcore/context_network_proxy.h" +#include "blackcore/contextnetworkproxy.h" #include "blackmisc/audio/voiceroomlist.h" #include #include diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/contextnetworkproxy.h similarity index 99% rename from src/blackcore/context_network_proxy.h rename to src/blackcore/contextnetworkproxy.h index 1cf3677c6..a11187a99 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/contextnetworkproxy.h @@ -13,8 +13,8 @@ #define BLACKCORE_CONTEXTNETWORK_PROXY_H #include "blackcoreexport.h" -#include "context_network.h" -#include "network_vatlib.h" +#include "contextnetwork.h" +#include "networkvatlib.h" #include "blackmisc/aviation/aviation.h" #include "blackmisc/statusmessage.h" diff --git a/src/blackcore/context_ownaircraft.cpp b/src/blackcore/contextownaircraft.cpp similarity index 88% rename from src/blackcore/context_ownaircraft.cpp rename to src/blackcore/contextownaircraft.cpp index b0130cc92..61e51990a 100644 --- a/src/blackcore/context_ownaircraft.cpp +++ b/src/blackcore/contextownaircraft.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "context_ownaircraft.h" -#include "context_ownaircraft_impl.h" -#include "context_ownaircraft_proxy.h" -#include "context_ownaircraft_empty.h" +#include "contextownaircraft.h" +#include "contextownaircraftimpl.h" +#include "contextownaircraftproxy.h" +#include "contextownaircraftempty.h" namespace BlackCore { diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/contextownaircraft.h similarity index 100% rename from src/blackcore/context_ownaircraft.h rename to src/blackcore/contextownaircraft.h diff --git a/src/blackcore/context_ownaircraft_empty.h b/src/blackcore/contextownaircraftempty.h similarity index 99% rename from src/blackcore/context_ownaircraft_empty.h rename to src/blackcore/contextownaircraftempty.h index 41bd1da76..63e0c30dd 100644 --- a/src/blackcore/context_ownaircraft_empty.h +++ b/src/blackcore/contextownaircraftempty.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTOWNAIRCRAFT_EMPTY_H #include "blackcoreexport.h" -#include "context_ownaircraft.h" +#include "contextownaircraft.h" #include "blackmisc/logmessage.h" namespace BlackCore diff --git a/src/blackcore/context_ownaircraft_impl.cpp b/src/blackcore/contextownaircraftimpl.cpp similarity index 98% rename from src/blackcore/context_ownaircraft_impl.cpp rename to src/blackcore/contextownaircraftimpl.cpp index 8401d84c4..5f89c4ffe 100644 --- a/src/blackcore/context_ownaircraft_impl.cpp +++ b/src/blackcore/contextownaircraftimpl.cpp @@ -7,12 +7,12 @@ * contained in the LICENSE file. */ -#include "context_ownaircraft_impl.h" -#include "context_simulator.h" -#include "context_network.h" -#include "context_audio.h" -#include "context_application.h" -#include "context_runtime.h" +#include "contextownaircraftimpl.h" +#include "contextsimulator.h" +#include "contextnetwork.h" +#include "contextaudio.h" +#include "contextapplication.h" +#include "contextruntime.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/contextownaircraftimpl.h similarity index 98% rename from src/blackcore/context_ownaircraft_impl.h rename to src/blackcore/contextownaircraftimpl.h index 3cfeeb22c..97fd7eb83 100644 --- a/src/blackcore/context_ownaircraft_impl.h +++ b/src/blackcore/contextownaircraftimpl.h @@ -13,9 +13,9 @@ #define BLACKCORE_CONTEXTOWNAIRCRAFT_IMPL_H #include "blackcoreexport.h" -#include "blackcore/context_ownaircraft.h" -#include "blackcore/context_runtime.h" -#include "blackcore/dbus_server.h" +#include "blackcore/contextownaircraft.h" +#include "blackcore/contextruntime.h" +#include "blackcore/dbusserver.h" #include "blackcore/settings/network.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/simulation/ownaircraftprovider.h" diff --git a/src/blackcore/context_ownaircraft_proxy.cpp b/src/blackcore/contextownaircraftproxy.cpp similarity index 98% rename from src/blackcore/context_ownaircraft_proxy.cpp rename to src/blackcore/contextownaircraftproxy.cpp index 64615ebdc..7f0f692f4 100644 --- a/src/blackcore/context_ownaircraft_proxy.cpp +++ b/src/blackcore/contextownaircraftproxy.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackcore/context_ownaircraft_proxy.h" +#include "blackcore/contextownaircraftproxy.h" #include #include #include diff --git a/src/blackcore/context_ownaircraft_proxy.h b/src/blackcore/contextownaircraftproxy.h similarity index 98% rename from src/blackcore/context_ownaircraft_proxy.h rename to src/blackcore/contextownaircraftproxy.h index 2313a9954..4c9ae3ad8 100644 --- a/src/blackcore/context_ownaircraft_proxy.h +++ b/src/blackcore/contextownaircraftproxy.h @@ -13,7 +13,7 @@ #define BLACKCORE_OWNAIRCRAFT_PROXY_H #include "blackcoreexport.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextownaircraft.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/simulation/simulatedaircraft.h" diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/contextruntime.cpp similarity index 99% rename from src/blackcore/context_runtime.cpp rename to src/blackcore/contextruntime.cpp index 6cd696632..76e2f9be6 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/contextruntime.cpp @@ -7,10 +7,9 @@ * contained in the LICENSE file. */ -#include "blackcore/context_runtime.h" -#include "blackcore/context_all_impl.h" -#include "blackcore/context_all_proxies.h" -#include "blackcore/context_all_empties.h" +#include "blackcore/contextallimpl.h" +#include "blackcore/contextallproxies.h" +#include "blackcore/contextallempties.h" #include "blackcore/registermetadata.h" #include "blackmisc/network/server.h" #include "blackmisc/statusmessagelist.h" diff --git a/src/blackcore/context_runtime.h b/src/blackcore/contextruntime.h similarity index 99% rename from src/blackcore/context_runtime.h rename to src/blackcore/contextruntime.h index b42f91006..6590abf55 100644 --- a/src/blackcore/context_runtime.h +++ b/src/blackcore/contextruntime.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXT_RUNTIME_H #include "blackcoreexport.h" -#include "blackcore/context_runtime_config.h" +#include "blackcore/contextruntimeconfig.h" #include "blackcore/settings/network.h" #include "blackmisc/identifier.h" #include "blackmisc/statusmessagelist.h" diff --git a/src/blackcore/context_runtime_config.h b/src/blackcore/contextruntimeconfig.h similarity index 100% rename from src/blackcore/context_runtime_config.h rename to src/blackcore/contextruntimeconfig.h diff --git a/src/blackcore/context_simulator.cpp b/src/blackcore/contextsimulator.cpp similarity index 92% rename from src/blackcore/context_simulator.cpp rename to src/blackcore/contextsimulator.cpp index 5cd5794fb..c1843c20e 100644 --- a/src/blackcore/context_simulator.cpp +++ b/src/blackcore/contextsimulator.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "context_simulator.h" -#include "context_simulator_impl.h" -#include "context_simulator_proxy.h" -#include "context_simulator_empty.h" +#include "contextsimulator.h" +#include "contextsimulatorimpl.h" +#include "contextsimulatorproxy.h" +#include "contextsimulatorempty.h" using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackcore/context_simulator.h b/src/blackcore/contextsimulator.h similarity index 99% rename from src/blackcore/context_simulator.h rename to src/blackcore/contextsimulator.h index b71b20dc9..d4a5fd6eb 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/contextsimulator.h @@ -26,8 +26,8 @@ #include "blackcoreexport.h" #include "context.h" #include "blackcore/simulator.h" -#include "blackcore/dbus_server.h" -#include "blackcore/context_runtime.h" +#include "blackcore/dbusserver.h" +#include "blackcore/contextruntime.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorsetup.h" diff --git a/src/blackcore/context_simulator_empty.h b/src/blackcore/contextsimulatorempty.h similarity index 99% rename from src/blackcore/context_simulator_empty.h rename to src/blackcore/contextsimulatorempty.h index effef2bf9..d231df80b 100644 --- a/src/blackcore/context_simulator_empty.h +++ b/src/blackcore/contextsimulatorempty.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTSIMULATOR_EMPTY_H #include "blackcoreexport.h" -#include "context_simulator.h" +#include "contextsimulator.h" #include "blackmisc/logmessage.h" namespace BlackCore diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/contextsimulatorimpl.cpp similarity index 98% rename from src/blackcore/context_simulator_impl.cpp rename to src/blackcore/contextsimulatorimpl.cpp index b23159cfd..8d84512d3 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/contextsimulatorimpl.cpp @@ -7,13 +7,13 @@ * contained in the LICENSE file. */ -#include "context_simulator_impl.h" -#include "context_ownaircraft_impl.h" -#include "context_ownaircraft.h" -#include "context_application.h" -#include "context_network_impl.h" -#include "plugin_manager_simulator.h" -#include "context_runtime.h" +#include "contextsimulatorimpl.h" +#include "contextownaircraftimpl.h" +#include "contextownaircraft.h" +#include "contextapplication.h" +#include "contextnetworkimpl.h" +#include "pluginmanagersimulator.h" +#include "contextruntime.h" #include "blackcore/registermetadata.h" #include "blackmisc/propertyindexvariantmap.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/contextsimulatorimpl.h similarity index 99% rename from src/blackcore/context_simulator_impl.h rename to src/blackcore/contextsimulatorimpl.h index e0387f6c5..84160bee6 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/contextsimulatorimpl.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTSIMULATOR_IMPL_H #include "blackcoreexport.h" -#include "blackcore/context_simulator.h" +#include "blackcore/contextsimulator.h" #include "blackcore/simulator.h" #include "blackmisc/simulation/simulatorplugininfolist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" diff --git a/src/blackcore/context_simulator_proxy.cpp b/src/blackcore/contextsimulatorproxy.cpp similarity index 99% rename from src/blackcore/context_simulator_proxy.cpp rename to src/blackcore/contextsimulatorproxy.cpp index 548eaf5dc..e998a51e8 100644 --- a/src/blackcore/context_simulator_proxy.cpp +++ b/src/blackcore/contextsimulatorproxy.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackcore/context_simulator_proxy.h" +#include "blackcore/contextsimulatorproxy.h" #include #include #include diff --git a/src/blackcore/context_simulator_proxy.h b/src/blackcore/contextsimulatorproxy.h similarity index 99% rename from src/blackcore/context_simulator_proxy.h rename to src/blackcore/contextsimulatorproxy.h index bb0b0860f..da1825e2d 100644 --- a/src/blackcore/context_simulator_proxy.h +++ b/src/blackcore/contextsimulatorproxy.h @@ -13,7 +13,7 @@ #define BLACKCORE_CONTEXTSIMULATOR_PROXY_H #include "blackcoreexport.h" -#include "blackcore/context_simulator.h" +#include "blackcore/contextsimulator.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/pixmap.h" diff --git a/src/blackcore/dbus_server.cpp b/src/blackcore/dbusserver.cpp similarity index 99% rename from src/blackcore/dbus_server.cpp rename to src/blackcore/dbusserver.cpp index 2f6c94f47..1acb7b3bb 100644 --- a/src/blackcore/dbus_server.cpp +++ b/src/blackcore/dbusserver.cpp @@ -9,7 +9,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/network/networkutils.h" -#include "dbus_server.h" +#include "dbusserver.h" #include #include diff --git a/src/blackcore/dbus_server.h b/src/blackcore/dbusserver.h similarity index 100% rename from src/blackcore/dbus_server.h rename to src/blackcore/dbusserver.h diff --git a/src/blackcore/input_manager.cpp b/src/blackcore/inputmanager.cpp similarity index 99% rename from src/blackcore/input_manager.cpp rename to src/blackcore/inputmanager.cpp index 3184b647b..9e503e033 100644 --- a/src/blackcore/input_manager.cpp +++ b/src/blackcore/inputmanager.cpp @@ -3,7 +3,7 @@ * 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 "input_manager.h" +#include "inputmanager.h" #include "blackmisc/input/keyboardkeylist.h" using namespace BlackInput; diff --git a/src/blackcore/input_manager.h b/src/blackcore/inputmanager.h similarity index 100% rename from src/blackcore/input_manager.h rename to src/blackcore/inputmanager.h diff --git a/src/blackcore/interpolator_linear.cpp b/src/blackcore/interpolatorlinear.cpp similarity index 99% rename from src/blackcore/interpolator_linear.cpp rename to src/blackcore/interpolatorlinear.cpp index 02360a270..1afdc2470 100644 --- a/src/blackcore/interpolator_linear.cpp +++ b/src/blackcore/interpolatorlinear.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "interpolator_linear.h" +#include "interpolatorlinear.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackcore/interpolator_linear.h b/src/blackcore/interpolatorlinear.h similarity index 100% rename from src/blackcore/interpolator_linear.h rename to src/blackcore/interpolatorlinear.h diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/networkvatlib.cpp similarity index 99% rename from src/blackcore/network_vatlib.cpp rename to src/blackcore/networkvatlib.cpp index 402d51b39..8dc9d8588 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/networkvatlib.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "network_vatlib.h" +#include "networkvatlib.h" #include "blackmisc/project.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/networkvatlib.h similarity index 99% rename from src/blackcore/network_vatlib.h rename to src/blackcore/networkvatlib.h index 96d7232c5..f045c1214 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/networkvatlib.h @@ -16,7 +16,7 @@ #include "network.h" #include "settings/network.h" #include "blackmisc/simulation/ownaircraftprovider.h" -#include "token_bucket.h" +#include "tokenbucket.h" #include #include #include diff --git a/src/blackcore/plugin_manager.cpp b/src/blackcore/pluginmanager.cpp similarity index 99% rename from src/blackcore/plugin_manager.cpp rename to src/blackcore/pluginmanager.cpp index 36bc4d186..a0d1a4fd5 100644 --- a/src/blackcore/plugin_manager.cpp +++ b/src/blackcore/pluginmanager.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "plugin_manager.h" +#include "pluginmanager.h" #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" #include diff --git a/src/blackcore/plugin_manager.h b/src/blackcore/pluginmanager.h similarity index 100% rename from src/blackcore/plugin_manager.h rename to src/blackcore/pluginmanager.h diff --git a/src/blackcore/plugin_manager_simulator.cpp b/src/blackcore/pluginmanagersimulator.cpp similarity index 98% rename from src/blackcore/plugin_manager_simulator.cpp rename to src/blackcore/pluginmanagersimulator.cpp index ac3e38e3a..43d2df3ec 100644 --- a/src/blackcore/plugin_manager_simulator.cpp +++ b/src/blackcore/pluginmanagersimulator.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "plugin_manager_simulator.h" +#include "pluginmanagersimulator.h" #include "simulator.h" #include diff --git a/src/blackcore/plugin_manager_simulator.h b/src/blackcore/pluginmanagersimulator.h similarity index 99% rename from src/blackcore/plugin_manager_simulator.h rename to src/blackcore/pluginmanagersimulator.h index 550731afd..17aa9a7a8 100644 --- a/src/blackcore/plugin_manager_simulator.h +++ b/src/blackcore/pluginmanagersimulator.h @@ -13,7 +13,7 @@ #define BLACKCORE_PLUGIN_MANAGER_SIMULATOR_H #include "blackcoreexport.h" -#include "plugin_manager.h" +#include "pluginmanager.h" #include "blackmisc/pluginstorageprovider.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfolist.h" diff --git a/src/blackcore/registermetadata.cpp b/src/blackcore/registermetadata.cpp index 83d664f7f..d0de96317 100644 --- a/src/blackcore/registermetadata.cpp +++ b/src/blackcore/registermetadata.cpp @@ -4,12 +4,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "registermetadata.h" -#include "blackcore/context_application.h" +#include "blackcore/contextapplication.h" #include "blackcore/webreaderflags.h" #include "blackcore/data/globalsetup.h" #include "blackcore/data/updateinfo.h" - -#include "voice_channel.h" +#include "voicechannel.h" #include "network.h" #include "setupreader.h" diff --git a/src/blackcore/simulator_common.cpp b/src/blackcore/simulatorcommon.cpp similarity index 99% rename from src/blackcore/simulator_common.cpp rename to src/blackcore/simulatorcommon.cpp index 385678fac..cd6abbadc 100644 --- a/src/blackcore/simulator_common.cpp +++ b/src/blackcore/simulatorcommon.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "simulator_common.h" +#include "simulatorcommon.h" #include "blackcore/interpolator.h" #include "blackcore/registermetadata.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/simulator_common.h b/src/blackcore/simulatorcommon.h similarity index 100% rename from src/blackcore/simulator_common.h rename to src/blackcore/simulatorcommon.h diff --git a/src/blackcore/token_bucket.cpp b/src/blackcore/tokenbucket.cpp similarity index 98% rename from src/blackcore/token_bucket.cpp rename to src/blackcore/tokenbucket.cpp index 559a3ed35..b3d02582c 100644 --- a/src/blackcore/token_bucket.cpp +++ b/src/blackcore/tokenbucket.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "token_bucket.h" +#include "tokenbucket.h" namespace BlackCore { diff --git a/src/blackcore/token_bucket.h b/src/blackcore/tokenbucket.h similarity index 100% rename from src/blackcore/token_bucket.h rename to src/blackcore/tokenbucket.h diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index 36de203d7..cce83f252 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -7,9 +7,9 @@ #define BLACKCORE_VOICE_H #include "blackcoreexport.h" -#include "audio_device.h" -#include "voice_channel.h" -#include "audio_mixer.h" +#include "audiodevice.h" +#include "voicechannel.h" +#include "audiomixer.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/selcal.h" diff --git a/src/blackcore/voice_channel.h b/src/blackcore/voicechannel.h similarity index 100% rename from src/blackcore/voice_channel.h rename to src/blackcore/voicechannel.h diff --git a/src/blackcore/voice_channel_vatlib.cpp b/src/blackcore/voicechannelvatlib.cpp similarity index 99% rename from src/blackcore/voice_channel_vatlib.cpp rename to src/blackcore/voicechannelvatlib.cpp index 540c8f49f..a9a9323d9 100644 --- a/src/blackcore/voice_channel_vatlib.cpp +++ b/src/blackcore/voicechannelvatlib.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "voice_channel_vatlib.h" +#include "voicechannelvatlib.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackcore/voice_channel_vatlib.h b/src/blackcore/voicechannelvatlib.h similarity index 98% rename from src/blackcore/voice_channel_vatlib.h rename to src/blackcore/voicechannelvatlib.h index edc9eab7e..b04ec994d 100644 --- a/src/blackcore/voice_channel_vatlib.h +++ b/src/blackcore/voicechannelvatlib.h @@ -11,8 +11,8 @@ #define BLACKCORE_VOICE_CHANNEL_VATLIB_H #include "blackcoreexport.h" -#include "voice_channel.h" -#include "voice_vatlib.h" +#include "voicechannel.h" +#include "voicevatlib.h" #include "blackmisc/statusmessage.h" #include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/aviation/callsignset.h" diff --git a/src/blackcore/voice_vatlib.cpp b/src/blackcore/voicevatlib.cpp similarity index 97% rename from src/blackcore/voice_vatlib.cpp rename to src/blackcore/voicevatlib.cpp index 3a34023a4..3196434de 100644 --- a/src/blackcore/voice_vatlib.cpp +++ b/src/blackcore/voicevatlib.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "voice_vatlib.h" -#include "voice_channel_vatlib.h" -#include "audio_device_vatlib.h" -#include "audio_mixer_vatlib.h" +#include "voicevatlib.h" +#include "voicechannelvatlib.h" +#include "audiodevicevatlib.h" +#include "audiomixervatlib.h" #include "blackmisc/logmessage.h" #include "blackmisc/blackmiscfreefunctions.h" #include diff --git a/src/blackcore/voice_vatlib.h b/src/blackcore/voicevatlib.h similarity index 100% rename from src/blackcore/voice_vatlib.h rename to src/blackcore/voicevatlib.h diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp index d677a9ac8..c6c5ac239 100644 --- a/src/blackgui/components/aircraftcomponent.cpp +++ b/src/blackgui/components/aircraftcomponent.cpp @@ -11,8 +11,8 @@ #include "ui_aircraftcomponent.h" #include "enablefordockwidgetinfoarea.h" #include "../guiutility.h" -#include "blackcore/context_network.h" -#include "blackcore/context_simulator.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextsimulator.h" #include "blackcore/network.h" using namespace BlackGui; diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 96e2c7fba..a69f6ad35 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -13,8 +13,8 @@ #include "blackmisc/aviation/informationmessage.h" #include "blackmisc/logmessage.h" #include "blackmisc/weather/metar.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" using namespace BlackGui; using namespace BlackGui::Models; diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp index 15a925758..31e52957a 100644 --- a/src/blackgui/components/audiosetupcomponent.cpp +++ b/src/blackgui/components/audiosetupcomponent.cpp @@ -9,7 +9,7 @@ #include "audiosetupcomponent.h" #include "ui_audiosetupcomponent.h" -#include "blackcore/context_audio.h" +#include "blackcore/contextaudio.h" #include "blackmisc/logmessage.h" using namespace BlackCore; diff --git a/src/blackgui/components/audiovolumecomponent.cpp b/src/blackgui/components/audiovolumecomponent.cpp index 2a82dd730..cef13f1a1 100644 --- a/src/blackgui/components/audiovolumecomponent.cpp +++ b/src/blackgui/components/audiovolumecomponent.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackcore/context_audio.h" +#include "blackcore/contextaudio.h" #include "audiovolumecomponent.h" #include "ui_audiovolumecomponent.h" diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index c710be729..3d876b0f4 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -10,9 +10,9 @@ #include "cockpitcomcomponent.h" #include "ui_cockpitcomcomponent.h" #include "../stylesheetutility.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" -#include "blackcore/context_audio.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" +#include "blackcore/contextaudio.h" #include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/logmessage.h" diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp index 7205005e0..1760eaecc 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp @@ -8,7 +8,7 @@ */ #include "cockpittranspondermodeledscomponent.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextownaircraft.h" #include #include diff --git a/src/blackgui/components/enableforruntime.cpp b/src/blackgui/components/enableforruntime.cpp index 820604a74..62c65e5e7 100644 --- a/src/blackgui/components/enableforruntime.cpp +++ b/src/blackgui/components/enableforruntime.cpp @@ -8,7 +8,7 @@ */ #include "enableforruntime.h" -#include "blackcore/context_all_interfaces.h" +#include "blackcore/contextallinterfaces.h" #include using namespace BlackMisc::Audio; diff --git a/src/blackgui/components/enableforruntime.h b/src/blackgui/components/enableforruntime.h index e12041348..d1145d3c1 100644 --- a/src/blackgui/components/enableforruntime.h +++ b/src/blackgui/components/enableforruntime.h @@ -13,7 +13,7 @@ #define BLACKGUI_ENABLEFORRUNTIME_H #include "blackgui/blackguiexport.h" -#include "blackcore/context_runtime.h" +#include "blackcore/contextruntime.h" #include "blackmisc/audio/notificationsounds.h" #include diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 879915030..70c3c0029 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -11,8 +11,8 @@ #include "../stylesheetutility.h" #include "ui_flightplancomponent.h" #include "blackmisc/logmessage.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index 7f111b8a5..0caea19c4 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -9,10 +9,10 @@ #include "infobarstatuscomponent.h" #include "ui_infobarstatuscomponent.h" -#include "blackcore/context_simulator.h" -#include "blackcore/context_network.h" -#include "blackcore/context_application.h" -#include "blackcore/context_audio.h" +#include "blackcore/contextsimulator.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextapplication.h" +#include "blackcore/contextaudio.h" #include "blackcore/simulator.h" #include "blackmisc/project.h" #include "blackmisc/icons.h" diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 0da769a23..ec6db58f2 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/src/blackgui/components/internalscomponent.cpp @@ -9,7 +9,7 @@ #include "internalscomponent.h" #include "ui_internalscomponent.h" -#include "blackcore/context_all_interfaces.h" +#include "blackcore/contextallinterfaces.h" #include using namespace BlackMisc; diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 9ea76296b..cbdd8210b 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -9,10 +9,10 @@ #include "logincomponent.h" #include "ui_logincomponent.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" -#include "blackcore/context_audio.h" -#include "blackcore/context_simulator.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" +#include "blackcore/contextaudio.h" +#include "blackcore/contextsimulator.h" #include "blackcore/network.h" #include "blackcore/simulator.h" #include "blackcore/setupreader.h" diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index be681a3bc..1127ff668 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -9,9 +9,9 @@ #include "mainkeypadareacomponent.h" #include "ui_mainkeypadareacomponent.h" -#include "blackcore/context_audio.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextaudio.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 72b773c00..2ddd6a508 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackcore/context_simulator.h" -#include "blackcore/context_network.h" +#include "blackcore/contextsimulator.h" +#include "blackcore/contextnetwork.h" #include "blackcore/network.h" #include "blackgui/views/aircraftmodelview.h" #include "blackgui/filters/aircraftmodelfilterdialog.h" diff --git a/src/blackgui/components/registercomponent.cpp b/src/blackgui/components/registercomponent.cpp index ea7bb7ddd..b2f00189a 100644 --- a/src/blackgui/components/registercomponent.cpp +++ b/src/blackgui/components/registercomponent.cpp @@ -9,7 +9,7 @@ #include "registercomponent.h" #include "ui_registercomponent.h" -#include "blackcore/context_application.h" +#include "blackcore/contextapplication.h" using namespace BlackCore; diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/blackgui/components/remoteaircraftselector.cpp index 77a308c19..125a8a3d0 100644 --- a/src/blackgui/components/remoteaircraftselector.cpp +++ b/src/blackgui/components/remoteaircraftselector.cpp @@ -9,7 +9,7 @@ #include "remoteaircraftselector.h" #include "ui_remoteaircraftselector.h" -#include "blackcore/context_network.h" +#include "blackcore/contextnetwork.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 7613231ad..b81383763 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -11,9 +11,9 @@ #include "ui_settingscomponent.h" #include "blackgui/models/atcstationlistmodel.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/dbus_server.h" -#include "blackcore/context_network.h" -#include "blackcore/context_audio.h" +#include "blackcore/dbusserver.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextaudio.h" #include "blackmisc/input/keyboardkeylist.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp index 31cf26aa1..ff7d6cb14 100644 --- a/src/blackgui/components/settingshotkeycomponent.cpp +++ b/src/blackgui/components/settingshotkeycomponent.cpp @@ -10,7 +10,7 @@ #include "settingshotkeycomponent.h" #include "ui_settingshotkeycomponent.h" #include "blackgui/hotkeydialog.h" -#include "blackcore/context_application.h" +#include "blackcore/contextapplication.h" #include using namespace BlackMisc; diff --git a/src/blackgui/components/settingsnetworkcomponent.cpp b/src/blackgui/components/settingsnetworkcomponent.cpp index b82c36ff8..213fbfbb2 100644 --- a/src/blackgui/components/settingsnetworkcomponent.cpp +++ b/src/blackgui/components/settingsnetworkcomponent.cpp @@ -9,7 +9,7 @@ #include "settingsnetworkcomponent.h" #include "ui_settingsnetworkcomponent.h" -#include "blackcore/context_network.h" +#include "blackcore/contextnetwork.h" using namespace BlackCore; diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index 7044c507e..455d391b7 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -9,7 +9,7 @@ #include "settingsnetworkserverscomponent.h" #include "ui_settingsnetworkserverscomponent.h" -#include "blackcore/context_network.h" +#include "blackcore/contextnetwork.h" #include "blackcore/setupreader.h" #include "blackmisc/logmessage.h" #include "blackmisc/project.h" diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index 6d05aaade..9447c41f2 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -1,8 +1,8 @@ #include "settingssimulatorcomponent.h" #include "ui_settingssimulatorcomponent.h" -#include "blackcore/context_simulator.h" -#include "blackcore/context_network.h" +#include "blackcore/contextsimulator.h" +#include "blackcore/contextnetwork.h" #include "blackgui/pluginconfig.h" #include "blackgui/pluginconfigwindow.h" #include "blackgui/plugindetailswindow.h" diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h index 1a711af82..260e58ecb 100644 --- a/src/blackgui/components/settingssimulatorcomponent.h +++ b/src/blackgui/components/settingssimulatorcomponent.h @@ -10,7 +10,7 @@ #ifndef BLACKGUI_SETTINGSSIMULATORCOMPONENT_H #define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H -#include "blackcore/plugin_manager_simulator.h" +#include "blackcore/pluginmanagersimulator.h" #include "blackgui/blackguiexport.h" #include "blackmisc/simulation/simulatorplugininfolist.h" #include "enableforruntime.h" diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 8fe0f48ac..66a24c62a 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -9,8 +9,8 @@ #include "simulatorcomponent.h" #include "ui_simulatorcomponent.h" -#include "blackcore/context_simulator.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextsimulator.h" +#include "blackcore/contextownaircraft.h" #include "blackcore/simulator.h" #include "blackmisc/iconlist.h" diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 1ba1e7f6f..7057d89df 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -9,7 +9,7 @@ #include "textmessagecomponent.h" #include "ui_textmessagecomponent.h" -#include "blackcore/context_audio.h" +#include "blackcore/contextaudio.h" #include "blackmisc/network/user.h" #include "blackmisc/audio/notificationsounds.h" #include "blackmisc/logmessage.h" diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index d09d4bfea..470072f27 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -19,8 +19,8 @@ #include "blackmisc/identifier.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/network/textmessagelist.h" -#include "blackcore/context_network.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" #include #include #include diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index 91de7f16d..716072caf 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -11,7 +11,7 @@ #include "ui_usercomponent.h" #include "../guiutility.h" #include "blackmisc/network/userlist.h" -#include "blackcore/context_network.h" +#include "blackcore/contextnetwork.h" #include "blackcore/network.h" using namespace BlackGui; diff --git a/src/blackgui/components/voiceroomscomponent.cpp b/src/blackgui/components/voiceroomscomponent.cpp index 1d8fc7b1b..ad2364632 100644 --- a/src/blackgui/components/voiceroomscomponent.cpp +++ b/src/blackgui/components/voiceroomscomponent.cpp @@ -9,8 +9,8 @@ #include "voiceroomscomponent.h" #include "ui_voiceroomscomponent.h" -#include "blackcore/context_audio.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/contextaudio.h" +#include "blackcore/contextownaircraft.h" #include "blackmisc/audio/notificationsounds.h" using namespace BlackCore; diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index c17c5b656..46627a863 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -8,7 +8,7 @@ */ #include "guiutility.h" -#include "blackcore/context_runtime.h" +#include "blackcore/contextruntime.h" #include "blackcore/cookiemanager.h" #include "blackmisc/filelogger.h" #include "blackmisc/logmessage.h" diff --git a/src/blackgui/hotkeydialog.h b/src/blackgui/hotkeydialog.h index a9d89a7aa..9e2d620d2 100644 --- a/src/blackgui/hotkeydialog.h +++ b/src/blackgui/hotkeydialog.h @@ -13,7 +13,7 @@ #define BLACKGUI_HOTKEYDIALOG_H #include "blackgui/models/actionmodel.h" -#include "blackcore/input_manager.h" +#include "blackcore/inputmanager.h" #include "blackmisc/input/hotkeycombination.h" #include "blackmisc/input/actionhotkeylist.h" #include "blackmisc/identifierlist.h" diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp index 3e032fcd9..b3d091a49 100644 --- a/src/blackgui/models/actionmodel.cpp +++ b/src/blackgui/models/actionmodel.cpp @@ -9,7 +9,7 @@ #include "actionmodel.h" #include "actionitem.h" -#include "blackcore/input_manager.h" +#include "blackcore/inputmanager.h" namespace BlackGui { diff --git a/src/blackgui/win/windowfinder_win.cpp b/src/blackgui/win/windowfinderwindows.cpp similarity index 97% rename from src/blackgui/win/windowfinder_win.cpp rename to src/blackgui/win/windowfinderwindows.cpp index 7802d94af..464d54864 100644 --- a/src/blackgui/win/windowfinder_win.cpp +++ b/src/blackgui/win/windowfinderwindows.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "windowfinder_win.h" +#include "windowfinderwindows.h" #include #include diff --git a/src/blackgui/win/windowfinder_win.h b/src/blackgui/win/windowfinderwindows.h similarity index 100% rename from src/blackgui/win/windowfinder_win.h rename to src/blackgui/win/windowfinderwindows.h diff --git a/src/blackinput/joystick.cpp b/src/blackinput/joystick.cpp index 07609de63..73251875c 100644 --- a/src/blackinput/joystick.cpp +++ b/src/blackinput/joystick.cpp @@ -12,7 +12,7 @@ #if defined(Q_OS_WIN) #include "win/joystick_windows.h" #elif defined(Q_OS_LINUX) - #include "linux/joystick_linux.h" + #include "linux/joysticklinux.h" #elif defined(Q_OS_OSX) #include "osx/joystick_mac.h" #else diff --git a/src/blackinput/keyboard.cpp b/src/blackinput/keyboard.cpp index 54c49c1dd..5ba81664c 100644 --- a/src/blackinput/keyboard.cpp +++ b/src/blackinput/keyboard.cpp @@ -8,7 +8,7 @@ #if defined(Q_OS_WIN) #include "win/keyboard_windows.h" #elif defined(Q_OS_LINUX) - #include "linux/keyboard_linux.h" + #include "linux/keyboardlinux.h" #elif defined(Q_OS_OSX) #include "osx/keyboard_mac.h" #else diff --git a/src/blackinput/linux/joystick_linux.cpp b/src/blackinput/linux/joysticklinux.cpp similarity index 99% rename from src/blackinput/linux/joystick_linux.cpp rename to src/blackinput/linux/joysticklinux.cpp index 13e35a5d7..e4065e2ee 100644 --- a/src/blackinput/linux/joystick_linux.cpp +++ b/src/blackinput/linux/joysticklinux.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/logmessage.h" -#include "joystick_linux.h" +#include "joysticklinux.h" #include #include #include diff --git a/src/blackinput/linux/joystick_linux.h b/src/blackinput/linux/joysticklinux.h similarity index 100% rename from src/blackinput/linux/joystick_linux.h rename to src/blackinput/linux/joysticklinux.h diff --git a/src/blackinput/linux/keyboard_linux.cpp b/src/blackinput/linux/keyboardlinux.cpp similarity index 99% rename from src/blackinput/linux/keyboard_linux.cpp rename to src/blackinput/linux/keyboardlinux.cpp index 6f5b06fff..e30216e6a 100644 --- a/src/blackinput/linux/keyboard_linux.cpp +++ b/src/blackinput/linux/keyboardlinux.cpp @@ -3,7 +3,7 @@ * 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 "keyboard_linux.h" +#include "keyboardlinux.h" #include "blackmisc/logmessage.h" #include #include diff --git a/src/blackinput/linux/keyboard_linux.h b/src/blackinput/linux/keyboardlinux.h similarity index 100% rename from src/blackinput/linux/keyboard_linux.h rename to src/blackinput/linux/keyboardlinux.h diff --git a/src/blackinput/osx/joystick_mac.cpp b/src/blackinput/osx/joystickmac.cpp similarity index 96% rename from src/blackinput/osx/joystick_mac.cpp rename to src/blackinput/osx/joystickmac.cpp index 63d8618cc..8c3aa5fc8 100644 --- a/src/blackinput/osx/joystick_mac.cpp +++ b/src/blackinput/osx/joystickmac.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "joystick_mac.h" +#include "joystickmac.h" using namespace BlackMisc::Input; diff --git a/src/blackinput/osx/joystick_mac.h b/src/blackinput/osx/joystickmac.h similarity index 100% rename from src/blackinput/osx/joystick_mac.h rename to src/blackinput/osx/joystickmac.h diff --git a/src/blackinput/osx/keyboard_mac.h b/src/blackinput/osx/keyboardmac.h similarity index 100% rename from src/blackinput/osx/keyboard_mac.h rename to src/blackinput/osx/keyboardmac.h diff --git a/src/blackinput/osx/keyboard_mac.mm b/src/blackinput/osx/keyboardmac.mm similarity index 99% rename from src/blackinput/osx/keyboard_mac.mm rename to src/blackinput/osx/keyboardmac.mm index 397165d2d..53f91bf1b 100644 --- a/src/blackinput/osx/keyboard_mac.mm +++ b/src/blackinput/osx/keyboardmac.mm @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "keyboard_mac.h" +#include "keyboardmac.h" #include #include #include diff --git a/src/blackinput/win/joystick_windows.cpp b/src/blackinput/win/joystickwindows.cpp similarity index 99% rename from src/blackinput/win/joystick_windows.cpp rename to src/blackinput/win/joystickwindows.cpp index f9f626765..0b1e8168e 100644 --- a/src/blackinput/win/joystick_windows.cpp +++ b/src/blackinput/win/joystickwindows.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "joystick_windows.h" +#include "joystickwindows.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackinput/win/joystick_windows.h b/src/blackinput/win/joystickwindows.h similarity index 100% rename from src/blackinput/win/joystick_windows.h rename to src/blackinput/win/joystickwindows.h diff --git a/src/blackinput/win/keyboard_windows.cpp b/src/blackinput/win/keyboardwindows.cpp similarity index 99% rename from src/blackinput/win/keyboard_windows.cpp rename to src/blackinput/win/keyboardwindows.cpp index b1c613bc2..2ae33dbda 100644 --- a/src/blackinput/win/keyboard_windows.cpp +++ b/src/blackinput/win/keyboardwindows.cpp @@ -3,7 +3,7 @@ * 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 "keyboard_windows.h" +#include "keyboardwindows.h" using namespace BlackMisc::Input; diff --git a/src/blackinput/win/keyboard_windows.h b/src/blackinput/win/keyboardwindows.h similarity index 100% rename from src/blackinput/win/keyboard_windows.h rename to src/blackinput/win/keyboardwindows.h diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 1062f724a..311f09360 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -14,7 +14,7 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/tuple.h" -#include "blackmisc/inheritance_traits.h" +#include "blackmisc/inheritancetraits.h" #include // for Q_INIT_RESOURCE #include #include diff --git a/src/blackmisc/compare.h b/src/blackmisc/compare.h index 6aebf64a7..b93565edd 100644 --- a/src/blackmisc/compare.h +++ b/src/blackmisc/compare.h @@ -13,7 +13,7 @@ #define BLACKMISC_COMPARE_H #include "blackmisc/tuple.h" -#include "blackmisc/inheritance_traits.h" +#include "blackmisc/inheritancetraits.h" namespace BlackMisc { diff --git a/src/blackmisc/dbus.h b/src/blackmisc/dbus.h index d3f823535..fd757eb56 100644 --- a/src/blackmisc/dbus.h +++ b/src/blackmisc/dbus.h @@ -13,7 +13,7 @@ #define BLACKMISC_DBUS_H #include "blackmisc/tuple.h" -#include "blackmisc/inheritance_traits.h" +#include "blackmisc/inheritancetraits.h" #include #include diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index d243cc6dc..53d45cf36 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -16,7 +16,7 @@ #include "icons.h" #include "variant.h" #include "tuple.h" -#include "inheritance_traits.h" +#include "inheritancetraits.h" #include namespace BlackMisc diff --git a/src/blackmisc/index_sequence.h b/src/blackmisc/indexsequence.h similarity index 100% rename from src/blackmisc/index_sequence.h rename to src/blackmisc/indexsequence.h diff --git a/src/blackmisc/inheritance_traits.h b/src/blackmisc/inheritancetraits.h similarity index 100% rename from src/blackmisc/inheritance_traits.h rename to src/blackmisc/inheritancetraits.h diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h index 7870b27f1..f763be348 100644 --- a/src/blackmisc/json.h +++ b/src/blackmisc/json.h @@ -14,7 +14,7 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/tuple.h" -#include "blackmisc/inheritance_traits.h" +#include "blackmisc/inheritancetraits.h" #include #include #include diff --git a/src/blackmisc/logmessage.cpp b/src/blackmisc/logmessage.cpp index 67fe77221..299f04034 100644 --- a/src/blackmisc/logmessage.cpp +++ b/src/blackmisc/logmessage.cpp @@ -9,7 +9,7 @@ #include "logmessage.h" #include "blackmiscfreefunctions.h" -#include "index_sequence.h" +#include "indexsequence.h" namespace BlackMisc { diff --git a/src/blackmisc/logmessage.h b/src/blackmisc/logmessage.h index c58d0be24..aee2c1dd0 100644 --- a/src/blackmisc/logmessage.h +++ b/src/blackmisc/logmessage.h @@ -16,7 +16,7 @@ #include "statusmessagelist.h" #include "statusmessage.h" #include "logcategorylist.h" -#include "index_sequence.h" +#include "indexsequence.h" #include #include #include diff --git a/src/blackmisc/predicates.h b/src/blackmisc/predicates.h index 49098d381..e4c54a121 100644 --- a/src/blackmisc/predicates.h +++ b/src/blackmisc/predicates.h @@ -10,7 +10,7 @@ #ifndef BLACKMISC_PREDICATES_H #define BLACKMISC_PREDICATES_H -#include "index_sequence.h" +#include "indexsequence.h" #include #include #include diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index f0a04539a..66e14b82d 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -16,7 +16,7 @@ #include "propertyindexlist.h" #include "blackmiscexport.h" #include "tuple.h" -#include "inheritance_traits.h" +#include "inheritancetraits.h" #include #include diff --git a/src/blackmisc/tuple.h b/src/blackmisc/tuple.h index 8f75df1e6..7b1e7bfaf 100644 --- a/src/blackmisc/tuple.h +++ b/src/blackmisc/tuple.h @@ -33,7 +33,7 @@ namespace BlackMisc }; } -#include "tuple_private.h" +#include "tupleprivate.h" /*! * \brief Macro to make a class available to TupleConverter. diff --git a/src/blackmisc/tuple_private.h b/src/blackmisc/tupleprivate.h similarity index 99% rename from src/blackmisc/tuple_private.h rename to src/blackmisc/tupleprivate.h index 5ad918c91..ee59ec553 100644 --- a/src/blackmisc/tuple_private.h +++ b/src/blackmisc/tupleprivate.h @@ -10,7 +10,7 @@ #ifndef BLACKMISC_TUPLE_PRIVATE_H #define BLACKMISC_TUPLE_PRIVATE_H -#include "index_sequence.h" +#include "indexsequence.h" #include #include #include diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h index 679d71557..f3e7279bf 100644 --- a/src/blackmisc/valuecache.h +++ b/src/blackmisc/valuecache.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_VALUECACHE_H #define BLACKMISC_VALUECACHE_H -#include "blackmisc/valuecache_private.h" +#include "blackmisc/valuecacheprivate.h" namespace BlackMisc { diff --git a/src/blackmisc/valuecache_private.h b/src/blackmisc/valuecacheprivate.h similarity index 100% rename from src/blackmisc/valuecache_private.h rename to src/blackmisc/valuecacheprivate.h diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index fed2ebc56..1dfc19ae0 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_VARIANT_H #define BLACKMISC_VARIANT_H -#include "variant_private.h" +#include "variantprivate.h" #include "blackmiscexport.h" #include "blackmiscfreefunctions.h" #include "tuple.h" diff --git a/src/blackmisc/variant_private.h b/src/blackmisc/variantprivate.h similarity index 99% rename from src/blackmisc/variant_private.h rename to src/blackmisc/variantprivate.h index 1b46bb923..97605c3fc 100644 --- a/src/blackmisc/variant_private.h +++ b/src/blackmisc/variantprivate.h @@ -14,7 +14,7 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/inheritance_traits.h" +#include "blackmisc/inheritancetraits.h" #include #include #include diff --git a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp b/src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp similarity index 99% rename from src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp rename to src/plugins/simulator/fs9/blacksimpluginfreefunctions.cpp index 8e5ffc33a..2a461f37d 100644 --- a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp +++ b/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" diff --git a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h b/src/plugins/simulator/fs9/blacksimpluginfreefunctions.h similarity index 98% rename from src/plugins/simulator/fs9/blacksimplugin_freefunctions.h rename to src/plugins/simulator/fs9/blacksimpluginfreefunctions.h index e4359f582..43f5fc3e1 100644 --- a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.h +++ b/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 diff --git a/src/plugins/simulator/fs9/callback_wrapper.h b/src/plugins/simulator/fs9/callbackwrapper.h similarity index 100% rename from src/plugins/simulator/fs9/callback_wrapper.h rename to src/plugins/simulator/fs9/callbackwrapper.h diff --git a/src/plugins/simulator/fs9/directplay_peer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp similarity index 99% rename from src/plugins/simulator/fs9/directplay_peer.cpp rename to src/plugins/simulator/fs9/directplaypeer.cpp index 11c5ddf74..6a735a5aa 100644 --- a/src/plugins/simulator/fs9/directplay_peer.cpp +++ b/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 #include diff --git a/src/plugins/simulator/fs9/directplay_peer.h b/src/plugins/simulator/fs9/directplaypeer.h similarity index 98% rename from src/plugins/simulator/fs9/directplay_peer.h rename to src/plugins/simulator/fs9/directplaypeer.h index 704cb5821..c26f4225f 100644 --- a/src/plugins/simulator/fs9/directplay_peer.h +++ b/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 diff --git a/src/plugins/simulator/fs9/fs9_client.cpp b/src/plugins/simulator/fs9/fs9client.cpp similarity index 98% rename from src/plugins/simulator/fs9/fs9_client.cpp rename to src/plugins/simulator/fs9/fs9client.cpp index a1670168e..56fc8186d 100644 --- a/src/plugins/simulator/fs9/fs9_client.cpp +++ b/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" diff --git a/src/plugins/simulator/fs9/fs9_client.h b/src/plugins/simulator/fs9/fs9client.h similarity index 99% rename from src/plugins/simulator/fs9/fs9_client.h rename to src/plugins/simulator/fs9/fs9client.h index 688d66053..cf14ba323 100644 --- a/src/plugins/simulator/fs9/fs9_client.h +++ b/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" diff --git a/src/plugins/simulator/fs9/fs9_host.cpp b/src/plugins/simulator/fs9/fs9host.cpp similarity index 98% rename from src/plugins/simulator/fs9/fs9_host.cpp rename to src/plugins/simulator/fs9/fs9host.cpp index 9dead288b..907e33e34 100644 --- a/src/plugins/simulator/fs9/fs9_host.cpp +++ b/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 diff --git a/src/plugins/simulator/fs9/fs9_host.h b/src/plugins/simulator/fs9/fs9host.h similarity index 98% rename from src/plugins/simulator/fs9/fs9_host.h rename to src/plugins/simulator/fs9/fs9host.h index ff152bca0..b282139e5 100644 --- a/src/plugins/simulator/fs9/fs9_host.h +++ b/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 diff --git a/src/plugins/simulator/fs9/host_node.cpp b/src/plugins/simulator/fs9/hostnode.cpp similarity index 97% rename from src/plugins/simulator/fs9/host_node.cpp rename to src/plugins/simulator/fs9/hostnode.cpp index a365c9907..05b60bd6d 100644 --- a/src/plugins/simulator/fs9/host_node.cpp +++ b/src/plugins/simulator/fs9/hostnode.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "host_node.h" +#include "hostnode.h" namespace BlackSimPlugin { diff --git a/src/plugins/simulator/fs9/host_node.h b/src/plugins/simulator/fs9/hostnode.h similarity index 100% rename from src/plugins/simulator/fs9/host_node.h rename to src/plugins/simulator/fs9/hostnode.h diff --git a/src/plugins/simulator/fs9/lobby_client.cpp b/src/plugins/simulator/fs9/lobbyclient.cpp similarity index 99% rename from src/plugins/simulator/fs9/lobby_client.cpp rename to src/plugins/simulator/fs9/lobbyclient.cpp index d3ef66145..52de59002 100644 --- a/src/plugins/simulator/fs9/lobby_client.cpp +++ b/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 #include diff --git a/src/plugins/simulator/fs9/lobby_client.h b/src/plugins/simulator/fs9/lobbyclient.h similarity index 98% rename from src/plugins/simulator/fs9/lobby_client.h rename to src/plugins/simulator/fs9/lobbyclient.h index 1b4f1928a..dfd381c5f 100644 --- a/src/plugins/simulator/fs9/lobby_client.h +++ b/src/plugins/simulator/fs9/lobbyclient.h @@ -1,5 +1,5 @@ -#include "callback_wrapper.h" +#include "callbackwrapper.h" #include #include #include diff --git a/src/plugins/simulator/fs9/multiplayer_packet_parser.cpp b/src/plugins/simulator/fs9/multiplayerpacketparser.cpp similarity index 97% rename from src/plugins/simulator/fs9/multiplayer_packet_parser.cpp rename to src/plugins/simulator/fs9/multiplayerpacketparser.cpp index fdd28d31e..7ad40f3da 100644 --- a/src/plugins/simulator/fs9/multiplayer_packet_parser.cpp +++ b/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 { diff --git a/src/plugins/simulator/fs9/multiplayer_packet_parser.h b/src/plugins/simulator/fs9/multiplayerpacketparser.h similarity index 100% rename from src/plugins/simulator/fs9/multiplayer_packet_parser.h rename to src/plugins/simulator/fs9/multiplayerpacketparser.h diff --git a/src/plugins/simulator/fs9/multiplayer_packets.h b/src/plugins/simulator/fs9/multiplayerpackets.h similarity index 100% rename from src/plugins/simulator/fs9/multiplayer_packets.h rename to src/plugins/simulator/fs9/multiplayerpackets.h diff --git a/src/plugins/simulator/fs9/plugin_fs9.pro b/src/plugins/simulator/fs9/plugin_fs9.pro index 706a3e0f6..154f1fd68 100644 --- a/src/plugins/simulator/fs9/plugin_fs9.pro +++ b/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 diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp similarity index 98% rename from src/plugins/simulator/fs9/simulator_fs9.cpp rename to src/plugins/simulator/fs9/simulatorfs9.cpp index 94bdaf2a8..5bf1eed9e 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/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" diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulatorfs9.h similarity index 97% rename from src/plugins/simulator/fs9/simulator_fs9.h rename to src/plugins/simulator/fs9/simulatorfs9.h index cc1eede44..8859473b4 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/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: diff --git a/src/plugins/simulator/fs9/simulator_fs9.json b/src/plugins/simulator/fs9/simulatorfs9.json similarity index 100% rename from src/plugins/simulator/fs9/simulator_fs9.json rename to src/plugins/simulator/fs9/simulatorfs9.json diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp similarity index 99% rename from src/plugins/simulator/fscommon/simulator_fscommon.cpp rename to src/plugins/simulator/fscommon/simulatorfscommon.cpp index 8fd17fb0e..c61c6a3ba 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/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" diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h similarity index 99% rename from src/plugins/simulator/fscommon/simulator_fscommon.h rename to src/plugins/simulator/fscommon/simulatorfscommon.h index ee8aec4ee..103ca6ae2 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.h +++ b/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" diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/plugin_fsx.pro index ec02178ab..fe4c585c7 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/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 diff --git a/src/plugins/simulator/fsx/simconnect_datadefinition.cpp b/src/plugins/simulator/fsx/simconnectdatadefinition.cpp similarity index 99% rename from src/plugins/simulator/fsx/simconnect_datadefinition.cpp rename to src/plugins/simulator/fsx/simconnectdatadefinition.cpp index b4e3d376b..a52da8b2a 100644 --- a/src/plugins/simulator/fsx/simconnect_datadefinition.cpp +++ b/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; diff --git a/src/plugins/simulator/fsx/simconnect_datadefinition.h b/src/plugins/simulator/fsx/simconnectdatadefinition.h similarity index 100% rename from src/plugins/simulator/fsx/simconnect_datadefinition.h rename to src/plugins/simulator/fsx/simconnectdatadefinition.h diff --git a/src/plugins/simulator/fsx/simconnect_object.cpp b/src/plugins/simulator/fsx/simconnectobject.cpp similarity index 91% rename from src/plugins/simulator/fsx/simconnect_object.cpp rename to src/plugins/simulator/fsx/simconnectobject.cpp index 5a56409a9..0f4bb80d5 100644 --- a/src/plugins/simulator/fsx/simconnect_object.cpp +++ b/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; diff --git a/src/plugins/simulator/fsx/simconnect_object.h b/src/plugins/simulator/fsx/simconnectobject.h similarity index 100% rename from src/plugins/simulator/fsx/simconnect_object.h rename to src/plugins/simulator/fsx/simconnectobject.h diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp similarity index 99% rename from src/plugins/simulator/fsx/simulator_fsx.cpp rename to src/plugins/simulator/fsx/simulatorfsx.cpp index 0109b6429..1030b7269 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/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" diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulatorfsx.h similarity index 98% rename from src/plugins/simulator/fsx/simulator_fsx.h rename to src/plugins/simulator/fsx/simulatorfsx.h index f5fe204ed..b7c59fd25 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/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" diff --git a/src/plugins/simulator/fsx/simulator_fsx.json b/src/plugins/simulator/fsx/simulatorfsx.json similarity index 100% rename from src/plugins/simulator/fsx/simulator_fsx.json rename to src/plugins/simulator/fsx/simulatorfsx.json diff --git a/src/plugins/simulator/fsx/simulator_fsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp similarity index 96% rename from src/plugins/simulator/fsx/simulator_fsxfactory.cpp rename to src/plugins/simulator/fsx/simulatorfsxfactory.cpp index e0ffc65ed..7263f294f 100644 --- a/src/plugins/simulator/fsx/simulator_fsxfactory.cpp +++ b/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 diff --git a/src/plugins/simulator/fsx/simulator_fsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h similarity index 97% rename from src/plugins/simulator/fsx/simulator_fsxfactory.h rename to src/plugins/simulator/fsx/simulatorfsxfactory.h index 5599cd871..6f7e9b259 100644 --- a/src/plugins/simulator/fsx/simulator_fsxfactory.h +++ b/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: diff --git a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp similarity index 99% rename from src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp rename to src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp index 7eb34219c..f7a3e91d9 100644 --- a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp +++ b/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" diff --git a/src/plugins/simulator/fsx_config/plugin_fsx_config.pro b/src/plugins/simulator/fsx_config/plugin_fsx_config.pro index ab7e911b9..67f1edf7c 100644 --- a/src/plugins/simulator/fsx_config/plugin_fsx_config.pro +++ b/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 diff --git a/src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp index 205c4df38..0bb81ecbb 100644 --- a/src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp +++ b/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" diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfig.h b/src/plugins/simulator/fsx_config/simulatorfsxconfig.h index dd6d2f407..d6af482d6 100644 --- a/src/plugins/simulator/fsx_config/simulatorfsxconfig.h +++ b/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: diff --git a/src/plugins/simulator/fsx_config/simulator_fsx_config.json b/src/plugins/simulator/fsx_config/simulatorfsxconfig.json similarity index 100% rename from src/plugins/simulator/fsx_config/simulator_fsx_config.json rename to src/plugins/simulator/fsx_config/simulatorfsxconfig.json diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro index 6cf12e6cd..78fab4879 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/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 diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp similarity index 99% rename from src/plugins/simulator/xplane/simulator_xplane.cpp rename to src/plugins/simulator/xplane/simulatorxplane.cpp index b81948a36..f465cb01a 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/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" diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulatorxplane.h similarity index 99% rename from src/plugins/simulator/xplane/simulator_xplane.h rename to src/plugins/simulator/xplane/simulatorxplane.h index 73df4cb74..39b3b13e4 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/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: diff --git a/src/plugins/simulator/xplane/simulator_xplane.json b/src/plugins/simulator/xplane/simulatorxplane.json similarity index 100% rename from src/plugins/simulator/xplane/simulator_xplane.json rename to src/plugins/simulator/xplane/simulatorxplane.json diff --git a/src/plugins/simulator/xplane/xbus_service_proxy.cpp b/src/plugins/simulator/xplane/xbusserviceproxy.cpp similarity index 99% rename from src/plugins/simulator/xplane/xbus_service_proxy.cpp rename to src/plugins/simulator/xplane/xbusserviceproxy.cpp index 3f2674bec..06d00d517 100644 --- a/src/plugins/simulator/xplane/xbus_service_proxy.cpp +++ b/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 #define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus" diff --git a/src/plugins/simulator/xplane/xbus_service_proxy.h b/src/plugins/simulator/xplane/xbusserviceproxy.h similarity index 100% rename from src/plugins/simulator/xplane/xbus_service_proxy.h rename to src/plugins/simulator/xplane/xbusserviceproxy.h diff --git a/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp b/src/plugins/simulator/xplane/xbustrafficproxy.cpp similarity index 98% rename from src/plugins/simulator/xplane/xbus_traffic_proxy.cpp rename to src/plugins/simulator/xplane/xbustrafficproxy.cpp index dac776aac..eb86ac74d 100644 --- a/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp +++ b/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 #define XBUS_SERVICENAME "org.swift-project.xbus" diff --git a/src/plugins/simulator/xplane/xbus_traffic_proxy.h b/src/plugins/simulator/xplane/xbustrafficproxy.h similarity index 100% rename from src/plugins/simulator/xplane/xbus_traffic_proxy.h rename to src/plugins/simulator/xplane/xbustrafficproxy.h diff --git a/src/plugins/simulator/xplane/xbus_weather_proxy.cpp b/src/plugins/simulator/xplane/xbusweatherproxy.cpp similarity index 97% rename from src/plugins/simulator/xplane/xbus_weather_proxy.cpp rename to src/plugins/simulator/xplane/xbusweatherproxy.cpp index 99c5ea918..b4dea1b34 100644 --- a/src/plugins/simulator/xplane/xbus_weather_proxy.cpp +++ b/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" diff --git a/src/plugins/simulator/xplane/xbus_weather_proxy.h b/src/plugins/simulator/xplane/xbusweatherproxy.h similarity index 100% rename from src/plugins/simulator/xplane/xbus_weather_proxy.h rename to src/plugins/simulator/xplane/xbusweatherproxy.h diff --git a/src/plugins/simulator/xplane_config/plugin_xplane_config.pro b/src/plugins/simulator/xplane_config/plugin_xplane_config.pro index 4b5cfdb7a..e28bb6993 100644 --- a/src/plugins/simulator/xplane_config/plugin_xplane_config.pro +++ b/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 diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfig.h b/src/plugins/simulator/xplane_config/simulatorxplaneconfig.h index 01ebf5666..f975c4e05 100644 --- a/src/plugins/simulator/xplane_config/simulatorxplaneconfig.h +++ b/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: diff --git a/src/plugins/simulator/xplane_config/simulator_xplane_config.json b/src/plugins/simulator/xplane_config/simulatorxplaneconfig.json similarity index 100% rename from src/plugins/simulator/xplane_config/simulator_xplane_config.json rename to src/plugins/simulator/xplane_config/simulatorxplaneconfig.json diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp index 06ba110c5..7027a500b 100644 --- a/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp +++ b/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 diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp index 178dc6c1c..c62beff6e 100644 --- a/src/swiftcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -8,10 +8,10 @@ */ #include "swiftcore.h" -#include "blackcore/context_runtime.h" -#include "blackcore/context_application.h" -#include "blackcore/context_application_impl.h" -#include "blackcore/dbus_server.h" +#include "blackcore/contextruntime.h" +#include "blackcore/contextapplication.h" +#include "blackcore/contextapplicationimpl.h" +#include "blackcore/dbusserver.h" #include "blackmisc/icons.h" #include "blackmisc/worker.h" #include "blackmisc/network/networkutils.h" diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index 1445b5c75..3db719e0e 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -14,7 +14,7 @@ #include "blackmisc/project.h" #include "blackgui/components/logcomponent.h" #include "blackgui/components/enableforruntime.h" -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #include "blackgui/stylesheetutility.h" #include #include diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h index a56b59284..6211d2dd6 100644 --- a/src/swiftcore/swiftcore.h +++ b/src/swiftcore/swiftcore.h @@ -12,7 +12,7 @@ #ifndef SWIFTCORE_H #define SWIFTCORE_H -#include "blackcore/context_runtime.h" +#include "blackcore/contextruntime.h" #include "blackgui/systemtraywindow.h" #include "blackgui/components/enableforruntime.h" #include "blackmisc/statusmessage.h" diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 39210882a..bf5fb8cd5 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -12,7 +12,7 @@ #ifndef SWIFTDATA_H #define SWIFTDATA_H -#include "blackcore/context_runtime.h" +#include "blackcore/contextruntime.h" #include "blackcore/data/globalsetup.h" #include "blackcore/data/updateinfo.h" #include "blackcore/setupreader.h" diff --git a/src/swiftdata/swiftdata_menus.cpp b/src/swiftdata/swiftdatamenus.cpp similarity index 100% rename from src/swiftdata/swiftdata_menus.cpp rename to src/swiftdata/swiftdatamenus.cpp diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp index a52361fa8..b0236ac9a 100644 --- a/src/swiftguistandard/main.cpp +++ b/src/swiftguistandard/main.cpp @@ -11,7 +11,7 @@ #include "guimodeenums.h" #include "blackgui/stylesheetutility.h" #include "blackcore/registermetadata.h" -#include "blackcore/context_runtime_config.h" +#include "blackcore/contextruntimeconfig.h" #include "blackgui/guiutility.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/logmessage.h" diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 69c228769..eab33ee6a 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -14,10 +14,10 @@ #include "blackgui/models/atcstationlistmodel.h" #include "blackgui/components/logcomponent.h" #include "blackgui/components/settingscomponent.h" -#include "blackcore/dbus_server.h" -#include "blackcore/context_network.h" -#include "blackcore/context_application.h" -#include "blackcore/context_ownaircraft.h" +#include "blackcore/dbusserver.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextapplication.h" +#include "blackcore/contextownaircraft.h" #include "blackcore/network.h" #include "blackmisc/logmessage.h" #include "blackmisc/audio/notificationsounds.h" diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index d8750019b..2e05ed99c 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -17,7 +17,7 @@ #undef interface #include "guimodeenums.h" -#include "blackcore/context_all_interfaces.h" +#include "blackcore/contextallinterfaces.h" #include "blackcore/actionbind.h" #include "blackcore/data/globalsetup.h" #include "blackgui/components/enableforruntime.h" diff --git a/src/swiftguistandard/swiftguistd_aircraft.cpp b/src/swiftguistandard/swiftguistdaircraft.cpp similarity index 95% rename from src/swiftguistandard/swiftguistd_aircraft.cpp rename to src/swiftguistandard/swiftguistdaircraft.cpp index 4bb847892..9a83e173d 100644 --- a/src/swiftguistandard/swiftguistd_aircraft.cpp +++ b/src/swiftguistandard/swiftguistdaircraft.cpp @@ -9,8 +9,8 @@ #include "swiftguistd.h" #include "blackgui/models/atcstationlistmodel.h" -#include "blackcore/dbus_server.h" -#include "blackcore/context_network.h" +#include "blackcore/dbusserver.h" +#include "blackcore/contextnetwork.h" using namespace BlackCore; using namespace BlackMisc; diff --git a/src/swiftguistandard/swiftguistd_init.cpp b/src/swiftguistandard/swiftguistdinit.cpp similarity index 99% rename from src/swiftguistandard/swiftguistd_init.cpp rename to src/swiftguistandard/swiftguistdinit.cpp index da60f4e26..a3fee4e05 100644 --- a/src/swiftguistandard/swiftguistd_init.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -9,8 +9,8 @@ #include "swiftguistd.h" #include "ui_swiftguistd.h" -#include "blackcore/dbus_server.h" -#include "blackcore/context_all_interfaces.h" +#include "blackcore/dbusserver.h" +#include "blackcore/contextallinterfaces.h" #include "blackgui/stylesheetutility.h" #include "blackgui/guiutility.h" #include "blackgui/components/allmaininfoareacomponents.h" diff --git a/src/swiftguistandard/swiftguistd_menus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp similarity index 100% rename from src/swiftguistandard/swiftguistd_menus.cpp rename to src/swiftguistandard/swiftguistdmenus.cpp diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index 7b4c23661..6f53a2df8 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -10,7 +10,7 @@ #include "swiftlauncher.h" #include "ui_swiftlauncher.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #include "blackcore/data/updateinfo.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/icons.h" diff --git a/src/xbus/plugin.h b/src/xbus/plugin.h index 945891e4b..9d2c4e5de 100644 --- a/src/xbus/plugin.h +++ b/src/xbus/plugin.h @@ -20,7 +20,7 @@ #pragma push_macro("interface") #undef interface -#include "blackcore/dbus_server.h" +#include "blackcore/dbusserver.h" #pragma pop_macro("interface") #include diff --git a/tests/blackcore/testinterpolator.cpp b/tests/blackcore/testinterpolator.cpp index 15de5b191..c0529ef77 100644 --- a/tests/blackcore/testinterpolator.cpp +++ b/tests/blackcore/testinterpolator.cpp @@ -8,7 +8,7 @@ */ #include "testinterpolator.h" -#include "blackcore/interpolator_linear.h" +#include "blackcore/interpolatorlinear.h" #include "blackmisc/simulation/remoteaircraftproviderdummy.h" #include diff --git a/tests/blackcore/testnetwork.h b/tests/blackcore/testnetwork.h index 49144e852..872ecc514 100644 --- a/tests/blackcore/testnetwork.h +++ b/tests/blackcore/testnetwork.h @@ -12,7 +12,7 @@ #ifndef BLACKCORETEST_TESTNETWORK_H #define BLACKCORETEST_TESTNETWORK_H -#include "blackcore/network_vatlib.h" +#include "blackcore/networkvatlib.h" #include "blackcore/data/globalsetup.h" #include "blackmisc/simulation/ownaircraftproviderdummy.h" #include diff --git a/tests/blackcore/testreaders.h b/tests/blackcore/testreaders.h index 070b4cf08..4cd479751 100644 --- a/tests/blackcore/testreaders.h +++ b/tests/blackcore/testreaders.h @@ -12,7 +12,7 @@ #ifndef BLACKCORETEST_TESTREADERS_H #define BLACKCORETEST_TESTREADERS_H -#include "blackcore/network_vatlib.h" +#include "blackcore/networkvatlib.h" #include "blackcore/modeldatareader.h" #include "blackcore/icaodatareader.h" #include