refs #510 Remove underscores from all the source file names

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 <QDBusMetaType>
 #include <QtDBus/qdbusabstractinterface.h>
 #include <QtDBus/qdbusconnection.h>

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 <QTextStream>
 #include <QString>

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"

samples/cli_client/client.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "client.h"
-#include "blackcore/network_vatlib.h"
+#include "blackcore/networkvatlib.h"
 #include <iostream>
 #include <QStringList>
 

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"

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
 {

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"

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"

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"

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;

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"

src/blackcore/audiomixer.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "audio_mixer.h"
+#include "audiomixer.h"
 
 namespace BlackCore
 {

src/blackcore/audiomixervatlib.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "audio_mixer_vatlib.h"
+#include "audiomixervatlib.h"
 
 namespace BlackCore
 {

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 <QScopedPointer>

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 <QObject>
 #include <QDateTime>

src/blackcore/context_all_impl.h

@@ -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

src/blackcore/context_all_interfaces.h

@@ -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

src/blackcore/context_all_proxies.h

@@ -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

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

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

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

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

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"

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

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"

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

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"

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

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
 {

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

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"

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"

src/blackcore/contextaudioproxy.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "context_audio_proxy.h"
+#include "contextaudioproxy.h"
 #include <QDBusConnection>
 
 using namespace BlackMisc::Audio;

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"

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
 {

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

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"

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"

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 <QObject>
 #include <QMetaEnum>

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"

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
 {

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

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"
 

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"

src/blackcore/contextownaircraftproxy.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/context_ownaircraft_proxy.h"
+#include "blackcore/contextownaircraftproxy.h"
 #include <QObject>
 #include <QMetaEnum>
 #include <QDBusConnection>

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"
 

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"

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"

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;
 

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"

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

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"

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"

src/blackcore/contextsimulatorproxy.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/context_simulator_proxy.h"
+#include "blackcore/contextsimulatorproxy.h"
 #include <QObject>
 #include <QMetaEnum>
 #include <QDBusConnection>

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"
 

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 <QProcess>
 #include <QMetaClassInfo>
 

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;

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 <QDateTime>

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 <QJsonDocument>

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 <vatlib/vatlib2.h>
 #include <QScopedPointer>
 #include <QTimer>

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 <QCoreApplication>

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 <QStringBuilder>
 

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"

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"
 

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"

src/blackcore/tokenbucket.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "token_bucket.h"
+#include "tokenbucket.h"
 
 namespace BlackCore
 {

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"

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 <mutex>

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"

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 <QDebug>

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;

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;

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;

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"
 

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"
 

src/blackgui/components/cockpittranspondermodeledscomponent.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "cockpittranspondermodeledscomponent.h"
-#include "blackcore/context_ownaircraft.h"
+#include "blackcore/contextownaircraft.h"
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 

src/blackgui/components/enableforruntime.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "enableforruntime.h"
-#include "blackcore/context_all_interfaces.h"
+#include "blackcore/contextallinterfaces.h"
 #include <QWidget>
 
 using namespace BlackMisc::Audio;

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 <QTimer>
 

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;

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"

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 <QJsonParseError>
 
 using namespace BlackMisc;

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"

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;

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"