From 985a1caecfe2c8c0351cf27b6b51472bf3aa2f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Garapich?= Date: Mon, 6 Apr 2015 22:47:48 +0200 Subject: [PATCH] refs #396 BlackMisc: nw* goes to network/, hw* goes to hardware/ --- samples/blackmiscdbus/servicetool.h | 2 +- samples/blackmiscdbus/testservice.h | 2 +- samples/blackmiscdbus/testservice_interface.h | 2 +- samples/hotkey/hotkey.h | 2 +- src/blackcore/airspace_monitor.h | 4 +- src/blackcore/context_audio.h | 2 +- src/blackcore/context_audio_proxy.h | 2 +- src/blackcore/context_network.h | 6 +- src/blackcore/context_network_impl.h | 2 +- src/blackcore/context_network_proxy.h | 4 +- src/blackcore/context_runtime.cpp | 2 +- src/blackcore/context_settings_impl.h | 2 +- src/blackcore/context_settings_proxy.h | 2 +- src/blackcore/context_simulator_impl.h | 2 +- src/blackcore/input_manager.h | 4 +- src/blackcore/network.h | 4 +- src/blackcore/simulator.h | 4 +- src/blackcore/vatsimbookingreader.cpp | 2 +- src/blackcore/vatsimdatafilereader.cpp | 4 +- src/blackcore/vatsimdatafilereader.h | 6 +- src/blackcore/voice.h | 8 +-- src/blackgui/components/infowindowcomponent.h | 2 +- src/blackgui/components/logincomponent.h | 2 +- src/blackgui/components/settingscomponent.cpp | 2 +- src/blackgui/components/settingscomponent.h | 2 +- .../components/textmessagecomponent.cpp | 2 +- .../components/textmessagecomponent.h | 4 +- src/blackgui/components/usercomponent.cpp | 2 +- src/blackgui/models/atcstationlistmodel.cpp | 2 +- src/blackgui/models/clientlistmodel.h | 2 +- src/blackgui/models/keyboardkeylistmodel.h | 2 +- src/blackgui/models/listmodelbase.cpp | 10 ++-- src/blackgui/models/serverlistmodel.h | 2 +- .../models/simulatedaircraftlistmodel.cpp | 2 +- src/blackgui/models/textmessagelistmodel.h | 2 +- src/blackgui/models/userlistmodel.h | 2 +- src/blackgui/serverform.h | 2 +- src/blackgui/serverlistselector.h | 2 +- src/blackgui/textmessagetextedit.h | 2 +- src/blackinput/joystick.h | 2 +- src/blackinput/keyboard.h | 2 +- src/blackinput/linux/joystick_linux.h | 2 +- src/blackinput/linux/keyboard_linux.h | 2 +- src/blackinput/linux/keymapping_linux.h | 2 +- src/blackinput/osx/joystick_mac.h | 2 +- src/blackinput/osx/keyboard_mac.h | 2 +- src/blackinput/win/joystick_windows.h | 2 +- src/blackinput/win/keyboard_windows.h | 4 +- src/blackinput/win/keymapping_windows.h | 2 +- src/blackmisc/aviation/aircraft.h | 2 +- src/blackmisc/aviation/aircraftlist.cpp | 2 +- src/blackmisc/aviation/aircraftlist.h | 2 +- src/blackmisc/aviation/atcstation.h | 2 +- src/blackmisc/aviation/atcstationlist.h | 2 +- src/blackmisc/aviation/callsignobjectlist.cpp | 2 +- src/blackmisc/blackmisc.h | 5 -- src/blackmisc/blackmisc.pro | 4 ++ src/blackmisc/blackmiscfreefunctions.cpp | 4 +- .../blackmiscfreefunctions_nwmeta.cpp | 2 +- .../hardware.h} | 17 ++---- .../joystickbutton.cpp} | 8 +-- .../joystickbutton.h} | 12 ++-- .../keyboardkey.cpp} | 10 ++-- .../keyboardkey.h} | 8 +-- .../keyboardkeylist.cpp} | 26 ++++----- .../keyboardkeylist.h} | 22 +++++--- src/blackmisc/hwallclasses.h | 12 ---- .../aircraftmapping.cpp} | 21 +------ .../aircraftmapping.h} | 0 .../aircraftmappinglist.cpp} | 13 +---- .../aircraftmappinglist.h} | 10 ++-- .../{nwclient.cpp => network/client.cpp} | 24 +------- .../{nwclient.h => network/client.h} | 12 ++-- .../clientlist.cpp} | 14 +---- .../{nwclientlist.h => network/clientlist.h} | 6 +- src/blackmisc/network/network.h | 30 ++++++++++ .../{nwserver.cpp => network/server.cpp} | 15 +---- .../{nwserver.h => network/server.h} | 10 ++-- .../serverlist.cpp} | 14 +---- .../{nwserverlist.h => network/serverlist.h} | 12 ++-- .../textmessage.cpp} | 6 +- .../textmessage.h} | 8 +-- .../textmessagelist.cpp} | 56 +------------------ .../textmessagelist.h} | 12 ++-- .../{nwuser.cpp => network/user.cpp} | 8 +-- src/blackmisc/{nwuser.h => network/user.h} | 8 +-- src/blackmisc/network/userlist.cpp | 31 ++++++++++ .../{nwuserlist.h => network/userlist.h} | 22 +++++--- .../voicecapabilites.cpp} | 17 +----- .../voicecapabilities.h} | 10 ++-- src/blackmisc/networkutils.h | 2 +- src/blackmisc/nwuserlist.cpp | 35 ------------ src/blackmisc/setkeyboardhotkey.h | 2 +- src/blackmisc/setkeyboardhotkeylist.h | 2 +- src/blackmisc/setnetwork.h | 2 +- src/blackmisc/simulation/aircraftmodel.h | 2 +- .../fscommon/vpilotmodelmappings.cpp | 2 +- src/blackmisc/simulation/simulatedaircraft.h | 2 +- .../simulation/simulatedaircraftlist.cpp | 2 +- .../simulation/simulatedaircraftlist.h | 2 +- .../simulation/simulatormodelmappings.h | 2 +- src/blackmisc/testing.cpp | 2 +- src/blackmisc/timestampobjectlist.cpp | 2 +- src/plugins/simulator/fsx/simulator_fsx.cpp | 2 +- src/plugins/simulator/fsx/simulator_fsx.h | 2 +- src/swiftgui_standard/swiftguistd.h | 2 +- tests/blackmisc/testaviation.cpp | 4 +- tests/blackmisc/testhardware.cpp | 2 +- 108 files changed, 286 insertions(+), 422 deletions(-) rename src/blackmisc/{networkallclasses.h => hardware/hardware.h} (51%) rename src/blackmisc/{hwjoystickbutton.cpp => hardware/joystickbutton.cpp} (94%) rename src/blackmisc/{hwjoystickbutton.h => hardware/joystickbutton.h} (91%) rename src/blackmisc/{hwkeyboardkey.cpp => hardware/keyboardkey.cpp} (98%) rename src/blackmisc/{hwkeyboardkey.h => hardware/keyboardkey.h} (97%) rename src/blackmisc/{hwkeyboardkeylist.cpp => hardware/keyboardkeylist.cpp} (60%) rename src/blackmisc/{hwkeyboardkeylist.h => hardware/keyboardkeylist.h} (59%) delete mode 100644 src/blackmisc/hwallclasses.h rename src/blackmisc/{nwaircraftmapping.cpp => network/aircraftmapping.cpp} (90%) rename src/blackmisc/{nwaircraftmapping.h => network/aircraftmapping.h} (100%) rename src/blackmisc/{nwaircraftmappinglist.cpp => network/aircraftmappinglist.cpp} (94%) rename src/blackmisc/{nwaircraftmappinglist.h => network/aircraftmappinglist.h} (92%) rename src/blackmisc/{nwclient.cpp => network/client.cpp} (93%) rename src/blackmisc/{nwclient.h => network/client.h} (95%) rename src/blackmisc/{nwclientlist.cpp => network/clientlist.cpp} (84%) rename src/blackmisc/{nwclientlist.h => network/clientlist.h} (94%) create mode 100644 src/blackmisc/network/network.h rename src/blackmisc/{nwserver.cpp => network/server.cpp} (94%) rename src/blackmisc/{nwserver.h => network/server.h} (95%) rename src/blackmisc/{nwserverlist.cpp => network/serverlist.cpp} (82%) rename src/blackmisc/{nwserverlist.h => network/serverlist.h} (86%) rename src/blackmisc/{nwtextmessage.cpp => network/textmessage.cpp} (99%) rename src/blackmisc/{nwtextmessage.h => network/textmessage.h} (97%) rename src/blackmisc/{nwtextmessagelist.cpp => network/textmessagelist.cpp} (80%) rename src/blackmisc/{nwtextmessagelist.h => network/textmessagelist.h} (94%) rename src/blackmisc/{nwuser.cpp => network/user.cpp} (98%) rename src/blackmisc/{nwuser.h => network/user.h} (97%) create mode 100644 src/blackmisc/network/userlist.cpp rename src/blackmisc/{nwuserlist.h => network/userlist.h} (63%) rename src/blackmisc/{nwvoicecapabilites.cpp => network/voicecapabilites.cpp} (94%) rename src/blackmisc/{nwvoicecapabilities.h => network/voicecapabilities.h} (94%) delete mode 100644 src/blackmisc/nwuserlist.cpp diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index e2d276115..2879bb93e 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -15,7 +15,7 @@ #include "blackcore/dbus_server.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/airportlist.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include #include diff --git a/samples/blackmiscdbus/testservice.h b/samples/blackmiscdbus/testservice.h index 11054c773..a78089442 100644 --- a/samples/blackmiscdbus/testservice.h +++ b/samples/blackmiscdbus/testservice.h @@ -17,7 +17,7 @@ #undef interface #include "blackmisc/aviation/aviation.h" -#include "blackmisc/networkallclasses.h" +#include "blackmisc/network/network.h" #include "blackmisc/pq/pq.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/math/math.h" diff --git a/samples/blackmiscdbus/testservice_interface.h b/samples/blackmiscdbus/testservice_interface.h index 5093d1498..869b72c2a 100644 --- a/samples/blackmiscdbus/testservice_interface.h +++ b/samples/blackmiscdbus/testservice_interface.h @@ -20,7 +20,7 @@ #include "blackmisc/aviation/airportlist.h" #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/variantlist.h" #include #include diff --git a/samples/hotkey/hotkey.h b/samples/hotkey/hotkey.h index 9b37c9c09..b6f04c327 100644 --- a/samples/hotkey/hotkey.h +++ b/samples/hotkey/hotkey.h @@ -8,7 +8,7 @@ #include "led.h" #include "blackinput/keyboard.h" -#include "blackmisc/hwkeyboardkey.h" +#include "blackmisc/hardware/keyboardkey.h" #include #include diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index 89958a889..54d0cfdfe 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -17,9 +17,9 @@ #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/aviation/flightplan.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/aviation/callsignset.h" #include "network.h" #include "vatsimbookingreader.h" diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 5bf49ccaf..ef772f691 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -16,7 +16,7 @@ #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/audiodeviceinfolist.h" #include "blackmisc/audio/voiceroomlist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/selcal.h" diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 03b8fd5fc..2721840ac 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -17,7 +17,7 @@ #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/audiodeviceinfolist.h" #include "blackmisc/audio/voiceroomlist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/aviation/aircraft.h" namespace BlackCore diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 183f34dee..41f408f25 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -17,9 +17,9 @@ #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/nwuserlist.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/audio/voiceroomlist.h" #include "blackcore/network.h" diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 9d871969c..e251ecdf0 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -21,7 +21,7 @@ #include "blackcore/airspace_monitor.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/setnetwork.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/digestsignal.h" #include "blackmisc/logmessage.h" #include "blackmisc/aviation/aircraftsituationlist.h" diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 8823b5964..50b3954cb 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -18,8 +18,8 @@ #include "blackmisc/aviation/aviation.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/genericdbusinterface.h" #include "blackmisc/audio/voiceroomlist.h" diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index dfae7319b..04511df2a 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -11,7 +11,7 @@ #include "blackcore/context_all_proxies.h" #include "blackcore/context_all_empties.h" #include "blackcore/blackcorefreefunctions.h" -#include "blackmisc/nwserver.h" +#include "blackmisc/network/server.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/blackmiscfreefunctions.h" diff --git a/src/blackcore/context_settings_impl.h b/src/blackcore/context_settings_impl.h index 4947d52e8..4bf453245 100644 --- a/src/blackcore/context_settings_impl.h +++ b/src/blackcore/context_settings_impl.h @@ -18,7 +18,7 @@ #include "blackcore/settingsallclasses.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" namespace BlackCore { diff --git a/src/blackcore/context_settings_proxy.h b/src/blackcore/context_settings_proxy.h index 8d5f72998..7c1420c83 100644 --- a/src/blackcore/context_settings_proxy.h +++ b/src/blackcore/context_settings_proxy.h @@ -12,7 +12,7 @@ #include "blackmisc/genericdbusinterface.h" #include "blackmisc/settingutilities.h" #include "blackmisc/setnetwork.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" namespace BlackCore { diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h index affa6d320..670ded348 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/context_simulator_impl.h @@ -17,7 +17,7 @@ #include "blackmisc/worker.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorinfolist.h" -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/textmessagelist.h" #include "blackmisc/pixmap.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include diff --git a/src/blackcore/input_manager.h b/src/blackcore/input_manager.h index dad0144e3..19b4fdb2d 100644 --- a/src/blackcore/input_manager.h +++ b/src/blackcore/input_manager.h @@ -8,8 +8,8 @@ #include "blackinput/keyboard.h" #include "blackinput/joystick.h" -#include "blackmisc/hwkeyboardkeylist.h" -#include "blackmisc/hwjoystickbutton.h" +#include "blackmisc/hardware/keyboardkeylist.h" +#include "blackmisc/hardware/joystickbutton.h" #include "blackmisc/hotkeyfunction.h" #include "blackmisc/setkeyboardhotkeylist.h" #include "blackmisc/eveventhotkeyfunction.h" diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 4fdbb9e21..b677dd7cc 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -18,8 +18,8 @@ #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/pq/length.h" #include "blackmisc/pq/time.h" -#include "blackmisc/nwserverlist.h" -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/textmessagelist.h" #include "blackmisc/aviation/informationmessage.h" #include "blackmisc/aviation/flightplan.h" #include diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 0cbb27460..f8a89e71c 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -20,8 +20,8 @@ #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/aviation/airportlist.h" -#include "blackmisc/nwtextmessage.h" -#include "blackmisc/nwclient.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/network/client.h" #include "blackmisc/pixmap.h" #include diff --git a/src/blackcore/vatsimbookingreader.cpp b/src/blackcore/vatsimbookingreader.cpp index d7f849fdc..2263ea7a7 100644 --- a/src/blackcore/vatsimbookingreader.cpp +++ b/src/blackcore/vatsimbookingreader.cpp @@ -9,7 +9,7 @@ #include "blackmisc/sequence.h" #include "blackmisc/aviation/atcstation.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/logmessage.h" #include "vatsimbookingreader.h" diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 8864ed049..1f9d81813 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -9,8 +9,8 @@ #include "blackmisc/sequence.h" #include "blackmisc/aviation/atcstation.h" -#include "blackmisc/nwuser.h" -#include "blackmisc/nwserver.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/server.h" #include "blackmisc/logmessage.h" #include "vatsimdatafilereader.h" diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index c49505c32..ae99a5ec4 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -15,9 +15,9 @@ #include "blackmisc/threadedreader.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/aircraftlist.h" -#include "blackmisc/nwserverlist.h" -#include "blackmisc/nwuserlist.h" -#include "blackmisc/nwvoicecapabilities.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/network/voicecapabilities.h" #include "blackmisc/aviation/callsignset.h" #include diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index 28d683bdb..9c93258dc 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -12,10 +12,10 @@ #include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/selcal.h" -#include "../blackmisc/nwuserlist.h" -#include "../blackmisc/audio/voiceroomlist.h" -#include "../blackmisc/audio/audiodeviceinfolist.h" -#include "../blackmisc/statusmessage.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/audio/voiceroomlist.h" +#include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/statusmessage.h" #include #include diff --git a/src/blackgui/components/infowindowcomponent.h b/src/blackgui/components/infowindowcomponent.h index 0d33e892e..2a400c4c6 100644 --- a/src/blackgui/components/infowindowcomponent.h +++ b/src/blackgui/components/infowindowcomponent.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_INFOWINDOW_H #define BLACKGUI_INFOWINDOW_H -#include "blackmisc/nwtextmessage.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index dd0f3a63f..bd95f62ce 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -14,7 +14,7 @@ #include "enableforruntime.h" #include "blackmisc/aviation/aircraft.h" -#include "blackmisc/nwserver.h" +#include "blackmisc/network/server.h" #include #include diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 67287db4c..d2e34cd4b 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -15,7 +15,7 @@ #include "blackcore/context_network.h" #include "blackcore/context_settings.h" #include "blackcore/context_audio.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include "blackmisc/logmessage.h" #include "blackmisc/settingsblackmiscclasses.h" #include diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index b11f21e1d..c19436f3c 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -13,7 +13,7 @@ #define BLACKGUI_SETTINGSCOMPONENT_H #include "blackgui/components/enableforruntime.h" -#include "blackmisc/nwserver.h" +#include "blackmisc/network/server.h" #include "blackmisc/aviation/aircrafticao.h" #include #include diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 1c9afeee4..04d25f1ad 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -10,7 +10,7 @@ #include "textmessagecomponent.h" #include "ui_textmessagecomponent.h" #include "blackcore/context_audio.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/notificationsounds.h" #include "blackmisc/logmessage.h" #include "blackmisc/simplecommandparser.h" diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index ba6297252..2109f6a96 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -15,9 +15,9 @@ #include "blackgui/components/enableforruntime.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/textmessagetextedit.h" -#include "blackmisc/nwtextmessage.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/aviation/aircraft.h" -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/textmessagelist.h" #include "blackcore/context_network.h" #include "blackcore/context_ownaircraft.h" #include diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index 014b57d0e..17846a248 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -10,7 +10,7 @@ #include "usercomponent.h" #include "ui_usercomponent.h" #include "../guiutility.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackcore/context_network.h" #include "blackcore/network.h" diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index 38b3a2e35..c824f13d8 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -9,7 +9,7 @@ #include "atcstationlistmodel.h" #include "blackmisc/audio/voiceroom.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/blackmiscfreefunctions.h" using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackgui/models/clientlistmodel.h b/src/blackgui/models/clientlistmodel.h index 2e04f205f..8ee22e8da 100644 --- a/src/blackgui/models/clientlistmodel.h +++ b/src/blackgui/models/clientlistmodel.h @@ -13,7 +13,7 @@ #define BLACKGUI_CLIENTLISTMODEL_H #include -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackgui/models/listmodelbase.h" namespace BlackGui diff --git a/src/blackgui/models/keyboardkeylistmodel.h b/src/blackgui/models/keyboardkeylistmodel.h index 4afb44714..a19382983 100644 --- a/src/blackgui/models/keyboardkeylistmodel.h +++ b/src/blackgui/models/keyboardkeylistmodel.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_KEYBOARDKEYLISTMODEL_H #define BLACKGUI_KEYBOARDKEYLISTMODEL_H -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include "blackmisc/setkeyboardhotkeylist.h" #include "blackgui/models/listmodelbase.h" #include diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index bcaf03852..76a66c6cd 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -14,11 +14,11 @@ #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/aircraftlist.h" #include "blackmisc/aviation/airportlist.h" -#include "blackmisc/nwserverlist.h" -#include "blackmisc/nwuserlist.h" -#include "blackmisc/nwclientlist.h" -#include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/nwaircraftmappinglist.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/aircraftmappinglist.h" #include "blackmisc/setkeyboardhotkeylist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/variant.h" diff --git a/src/blackgui/models/serverlistmodel.h b/src/blackgui/models/serverlistmodel.h index 9f44c7065..b0beedb53 100644 --- a/src/blackgui/models/serverlistmodel.h +++ b/src/blackgui/models/serverlistmodel.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_SERVERLISTMODEL_H #define BLACKGUI_SERVERLISTMODEL_H -#include "blackmisc/nwserverlist.h" +#include "blackmisc/network/serverlist.h" #include "blackgui/models/listmodelbase.h" #include diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index 07bb5bf00..3f8b82e6e 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -8,7 +8,7 @@ */ #include "simulatedaircraftlistmodel.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscfreefunctions.h" diff --git a/src/blackgui/models/textmessagelistmodel.h b/src/blackgui/models/textmessagelistmodel.h index 70823dcf0..4fd180c80 100644 --- a/src/blackgui/models/textmessagelistmodel.h +++ b/src/blackgui/models/textmessagelistmodel.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_TEXTMESSAGELISTMODEL_H #define BLACKGUI_TEXTMESSAGELISTMODEL_H -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/textmessagelist.h" #include "blackgui/models/listmodelbase.h" #include #include diff --git a/src/blackgui/models/userlistmodel.h b/src/blackgui/models/userlistmodel.h index ad51ea8d2..f06ee450a 100644 --- a/src/blackgui/models/userlistmodel.h +++ b/src/blackgui/models/userlistmodel.h @@ -13,7 +13,7 @@ #define BLACKGUI_USERLISTMODEL_H #include -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackgui/models/listmodelbase.h" namespace BlackGui diff --git a/src/blackgui/serverform.h b/src/blackgui/serverform.h index 60abd69f0..43445e5aa 100644 --- a/src/blackgui/serverform.h +++ b/src/blackgui/serverform.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_NETWORKSERVERFORM_H #define BLACKGUI_NETWORKSERVERFORM_H -#include "blackmisc/nwserver.h" +#include "blackmisc/network/server.h" #include "blackmisc/statusmessagelist.h" #include #include diff --git a/src/blackgui/serverlistselector.h b/src/blackgui/serverlistselector.h index 1e9423e32..7a65ab13c 100644 --- a/src/blackgui/serverlistselector.h +++ b/src/blackgui/serverlistselector.h @@ -15,7 +15,7 @@ #include #include -#include "blackmisc/nwserverlist.h" +#include "blackmisc/network/serverlist.h" namespace BlackGui { diff --git a/src/blackgui/textmessagetextedit.h b/src/blackgui/textmessagetextedit.h index d26f7b2b7..930f53043 100644 --- a/src/blackgui/textmessagetextedit.h +++ b/src/blackgui/textmessagetextedit.h @@ -12,7 +12,7 @@ #ifndef BLACKGUI_TEXTMESSAGETEXTEDIT_H #define BLACKGUI_TEXTMESSAGETEXTEDIT_H -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/textmessagelist.h" #include #include diff --git a/src/blackinput/joystick.h b/src/blackinput/joystick.h index 56076e82b..0822a50c1 100644 --- a/src/blackinput/joystick.h +++ b/src/blackinput/joystick.h @@ -12,7 +12,7 @@ #ifndef BLACKINPUT_JOYSTICK_H #define BLACKINPUT_JOYSTICK_H -#include "blackmisc/hwjoystickbutton.h" +#include "blackmisc/hardware/joystickbutton.h" #include #include #include diff --git a/src/blackinput/keyboard.h b/src/blackinput/keyboard.h index 166b7836a..570ccde46 100644 --- a/src/blackinput/keyboard.h +++ b/src/blackinput/keyboard.h @@ -10,7 +10,7 @@ #ifndef BLACKINPUT_KEYBOARD_H #define BLACKINPUT_KEYBOARD_H -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include #include #include diff --git a/src/blackinput/linux/joystick_linux.h b/src/blackinput/linux/joystick_linux.h index a2e388416..7bd14362f 100644 --- a/src/blackinput/linux/joystick_linux.h +++ b/src/blackinput/linux/joystick_linux.h @@ -13,7 +13,7 @@ //! \file #include "blackinput/joystick.h" -#include "blackmisc/hwjoystickbutton.h" +#include "blackmisc/hardware/joystickbutton.h" #include "blackmisc/collection.h" #include diff --git a/src/blackinput/linux/keyboard_linux.h b/src/blackinput/linux/keyboard_linux.h index cb33a2a62..80315dbfd 100644 --- a/src/blackinput/linux/keyboard_linux.h +++ b/src/blackinput/linux/keyboard_linux.h @@ -11,7 +11,7 @@ #define BLACKINPUT_KEYBOARD_LINUX_H #include "blackinput/keyboard.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include class QFileSystemWatcher; diff --git a/src/blackinput/linux/keymapping_linux.h b/src/blackinput/linux/keymapping_linux.h index 1e7bc6eef..758c1a984 100644 --- a/src/blackinput/linux/keymapping_linux.h +++ b/src/blackinput/linux/keymapping_linux.h @@ -7,7 +7,7 @@ #ifndef BLACKINPUT_KEYMAPPING_LINUX_H #define BLACKINPUT_KEYMAPPING_LINUX_H -#include "blackmisc/hwkeyboardkey.h" +#include "blackmisc/hardware/keyboardkey.h" namespace BlackInput { diff --git a/src/blackinput/osx/joystick_mac.h b/src/blackinput/osx/joystick_mac.h index 29e4afb44..8866b1dcf 100644 --- a/src/blackinput/osx/joystick_mac.h +++ b/src/blackinput/osx/joystick_mac.h @@ -13,7 +13,7 @@ //! \file #include "blackinput/joystick.h" -#include "blackmisc/hwjoystickbutton.h" +#include "blackmisc/hardware/joystickbutton.h" #include "blackmisc/collection.h" #include diff --git a/src/blackinput/osx/keyboard_mac.h b/src/blackinput/osx/keyboard_mac.h index 3cff04d7f..44a387f1f 100644 --- a/src/blackinput/osx/keyboard_mac.h +++ b/src/blackinput/osx/keyboard_mac.h @@ -11,7 +11,7 @@ #define BLACKINPUT_KEYBOARD_MAC_H #include "blackinput/keyboard.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include namespace BlackInput diff --git a/src/blackinput/win/joystick_windows.h b/src/blackinput/win/joystick_windows.h index 233189ae9..b54dd46f7 100644 --- a/src/blackinput/win/joystick_windows.h +++ b/src/blackinput/win/joystick_windows.h @@ -13,7 +13,7 @@ //! \file #include "blackinput/joystick.h" -#include "blackmisc/hwjoystickbutton.h" +#include "blackmisc/hardware/joystickbutton.h" #include "blackmisc/collection.h" #include diff --git a/src/blackinput/win/keyboard_windows.h b/src/blackinput/win/keyboard_windows.h index 77cf6451b..10b3c2ea7 100644 --- a/src/blackinput/win/keyboard_windows.h +++ b/src/blackinput/win/keyboard_windows.h @@ -11,8 +11,8 @@ #define BLACKINPUT_KEYBOARD_WINDOWS_H #include "blackinput/keyboard.h" -#include "blackmisc/hwkeyboardkey.h" -#include "blackmisc/hwkeyboardkeylist.h" +#include "blackmisc/hardware/keyboardkey.h" +#include "blackmisc/hardware/keyboardkeylist.h" #include #ifndef NOMINMAX #define NOMINMAX diff --git a/src/blackinput/win/keymapping_windows.h b/src/blackinput/win/keymapping_windows.h index b406a9785..ba087b210 100644 --- a/src/blackinput/win/keymapping_windows.h +++ b/src/blackinput/win/keymapping_windows.h @@ -7,7 +7,7 @@ #ifndef BLACKINPUT_KEYMAPPING_WINDOWS_H #define BLACKINPUT_KEYMAPPING_WINDOWS_H -#include "blackmisc/hwkeyboardkey.h" +#include "blackmisc/hardware/keyboardkey.h" #ifndef NOMINMAX #define NOMINMAX #endif diff --git a/src/blackmisc/aviation/aircraft.h b/src/blackmisc/aviation/aircraft.h index 4ad4eaa34..b9898694b 100644 --- a/src/blackmisc/aviation/aircraft.h +++ b/src/blackmisc/aviation/aircraft.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFT_H #define BLACKMISC_AVIATION_AIRCRAFT_H -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/aviation/callsign.h" diff --git a/src/blackmisc/aviation/aircraftlist.cpp b/src/blackmisc/aviation/aircraftlist.cpp index cf7cd8594..2ff1244c9 100644 --- a/src/blackmisc/aviation/aircraftlist.cpp +++ b/src/blackmisc/aviation/aircraftlist.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/aviation/aircraftlist.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/predicates.h" #include "blackmisc/propertyindexallclasses.h" diff --git a/src/blackmisc/aviation/aircraftlist.h b/src/blackmisc/aviation/aircraftlist.h index d472cc15d..771837dee 100644 --- a/src/blackmisc/aviation/aircraftlist.h +++ b/src/blackmisc/aviation/aircraftlist.h @@ -16,7 +16,7 @@ #include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/geo/geoobjectlist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/collection.h" #include "blackmisc/propertyindexvariantmap.h" #include diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 24103342e..0e8d6e0cf 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -16,7 +16,7 @@ #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/informationmessage.h" #include "blackmisc/aviation/callsign.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/pq/length.h" diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 03f22d9cc..69e95b2de 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -13,7 +13,7 @@ #define BLACKMISC_AVIATION_ATCSTATIONLIST_H #include "blackmisc/geo/geoobjectlist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp index 3475f3704..62d20c0b4 100644 --- a/src/blackmisc/aviation/callsignobjectlist.cpp +++ b/src/blackmisc/aviation/callsignobjectlist.cpp @@ -13,7 +13,7 @@ #include "blackmisc/aviation/aircraftlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" -#include "blackmisc/nwclientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h" namespace BlackMisc diff --git a/src/blackmisc/blackmisc.h b/src/blackmisc/blackmisc.h index dadd8b29c..186f0a7b8 100644 --- a/src/blackmisc/blackmisc.h +++ b/src/blackmisc/blackmisc.h @@ -23,11 +23,6 @@ * \brief Position handling as geo locations and coordinates systems. */ -/*! - * \namespace BlackMisc::Network - * \brief Classes related to the traffic network such as VATSIM user etc. - */ - /*! * \namespace BlackMisc::Settings * \brief Classes related to configuration settings. diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 058e88a07..b2ecc8b85 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -27,7 +27,9 @@ HEADERS += *.h \ $$PWD/pq/*.h \ $$PWD/aviation/*.h \ $$PWD/math/*.h \ + $$PWD/network/*.h \ $$PWD/geo/*.h \ + $$PWD/hardware/*.h \ $$PWD/audio/*.h \ $$PWD/simulation/*.h \ $$PWD/simulation/fscommon\*.h \ @@ -37,6 +39,8 @@ SOURCES += *.cpp \ $$PWD/pq/*.cpp \ $$PWD/aviation/*.cpp \ $$PWD/math/*.cpp \ + $$PWD/network/*.cpp \ + $$PWD/hardware/*.cpp \ $$PWD/geo/*.cpp \ $$PWD/audio/*.cpp \ $$PWD/simulation/*.cpp \ diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index d05901172..61885b0a8 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -12,9 +12,9 @@ #include "blackmisc/pq/pq.h" #include "math/math.h" #include "geo/geo.h" -#include "networkallclasses.h" +#include "network/network.h" #include "audio/audio.h" -#include "hwallclasses.h" +#include "hardware/hardware.h" #include "settingsblackmiscclasses.h" #include "propertyindexlist.h" #include "propertyindexvariantmap.h" diff --git a/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp index d1b32015e..ab49b9467 100644 --- a/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp +++ b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp @@ -8,7 +8,7 @@ */ #include "blackmiscfreefunctions.h" -#include "networkallclasses.h" +#include "network/network.h" /* * Metadata for Network diff --git a/src/blackmisc/networkallclasses.h b/src/blackmisc/hardware/hardware.h similarity index 51% rename from src/blackmisc/networkallclasses.h rename to src/blackmisc/hardware/hardware.h index cf45b0aa8..be06b0a12 100644 --- a/src/blackmisc/networkallclasses.h +++ b/src/blackmisc/hardware/hardware.h @@ -7,19 +7,10 @@ * contained in the LICENSE file. */ -//! \file +#ifndef BLACKMISC_HARDWARE_HARDWAREALL_H +#define BLACKMISC_HARDWARE_HARDWAREALL_H -#ifndef BLACKMISC_NETWORKALLCLASSES_H -#define BLACKMISC_NETWORKALLCLASSES_H - -#include "blackmisc/nwuser.h" -#include "blackmisc/nwuserlist.h" -#include "blackmisc/nwserverlist.h" -#include "blackmisc/nwtextmessagelist.h" -#include "blackmisc/nwclient.h" -#include "blackmisc/nwclientlist.h" -#include "blackmisc/nwvoicecapabilities.h" -#include "blackmisc/nwaircraftmapping.h" -#include "blackmisc/nwaircraftmappinglist.h" +#include "blackmisc/hardware/keyboardkeylist.h" +#include "blackmisc/hardware/joystickbutton.h" #endif // guard diff --git a/src/blackmisc/hwjoystickbutton.cpp b/src/blackmisc/hardware/joystickbutton.cpp similarity index 94% rename from src/blackmisc/hwjoystickbutton.cpp rename to src/blackmisc/hardware/joystickbutton.cpp index 45a472714..db5424851 100644 --- a/src/blackmisc/hwjoystickbutton.cpp +++ b/src/blackmisc/hardware/joystickbutton.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2014 - * swift Project Community / Contributors + * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level * directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project, @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "hwjoystickbutton.h" -#include "blackmiscfreefunctions.h" -#include "variant.h" +#include "blackmisc/hardware/joystickbutton.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" #include namespace BlackMisc diff --git a/src/blackmisc/hwjoystickbutton.h b/src/blackmisc/hardware/joystickbutton.h similarity index 91% rename from src/blackmisc/hwjoystickbutton.h rename to src/blackmisc/hardware/joystickbutton.h index d964e4e3c..322e47042 100644 --- a/src/blackmisc/hwjoystickbutton.h +++ b/src/blackmisc/hardware/joystickbutton.h @@ -1,5 +1,5 @@ /* Copyright (C) 2014 - * swift Project Community / Contributors + * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level * directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project, @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_JOYSTICKBUTTON_H -#define BLACKMISC_JOYSTICKBUTTON_H +#ifndef BLACKMISC_HARDWARE_JOYSTICKBUTTON_H +#define BLACKMISC_HARDWARE_JOYSTICKBUTTON_H -#include "valueobject.h" -#include "propertyindex.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { diff --git a/src/blackmisc/hwkeyboardkey.cpp b/src/blackmisc/hardware/keyboardkey.cpp similarity index 98% rename from src/blackmisc/hwkeyboardkey.cpp rename to src/blackmisc/hardware/keyboardkey.cpp index 2b63bda95..e9147ce96 100644 --- a/src/blackmisc/hwkeyboardkey.cpp +++ b/src/blackmisc/hardware/keyboardkey.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2013 - * swift Project Community / Contributors + * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level * directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project, @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "hwkeyboardkey.h" -#include "blackmiscfreefunctions.h" -#include "propertyindex.h" -#include "variant.h" +#include "blackmisc/hardware/keyboardkey.h" +#include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" #include namespace BlackMisc diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hardware/keyboardkey.h similarity index 97% rename from src/blackmisc/hwkeyboardkey.h rename to src/blackmisc/hardware/keyboardkey.h index eb4550aaa..fc830e580 100644 --- a/src/blackmisc/hwkeyboardkey.h +++ b/src/blackmisc/hardware/keyboardkey.h @@ -9,11 +9,11 @@ //! \file -#ifndef BLACKMISC_KEYBOARDKEY_H -#define BLACKMISC_KEYBOARDKEY_H +#ifndef BLACKMISC_HARDWARE_KEYBOARDKEY_H +#define BLACKMISC_HARDWARE_KEYBOARDKEY_H -#include "propertyindex.h" -#include "blackmiscfreefunctions.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscfreefunctions.h" #include #include diff --git a/src/blackmisc/hwkeyboardkeylist.cpp b/src/blackmisc/hardware/keyboardkeylist.cpp similarity index 60% rename from src/blackmisc/hwkeyboardkeylist.cpp rename to src/blackmisc/hardware/keyboardkeylist.cpp index c1e5291ed..ecbdbaeaa 100644 --- a/src/blackmisc/hwkeyboardkeylist.cpp +++ b/src/blackmisc/hardware/keyboardkeylist.cpp @@ -1,30 +1,26 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ -#include "hwkeyboardkeylist.h" -#include "predicates.h" +#include "blackmisc/hardware/keyboardkeylist.h" +#include "blackmisc/predicates.h" namespace BlackMisc { namespace Hardware { - /* - * Constructor - */ + CKeyboardKeyList::CKeyboardKeyList() { } - /* - * Construct from base class object - */ CKeyboardKeyList::CKeyboardKeyList(const CSequence &baseClass) : CSequence(baseClass) { } - /* - * Register metadata - */ void CKeyboardKeyList::registerMetadata() { qRegisterMetaType>(); diff --git a/src/blackmisc/hwkeyboardkeylist.h b/src/blackmisc/hardware/keyboardkeylist.h similarity index 59% rename from src/blackmisc/hwkeyboardkeylist.h rename to src/blackmisc/hardware/keyboardkeylist.h index b56cb3a26..cc7a7eff9 100644 --- a/src/blackmisc/hwkeyboardkeylist.h +++ b/src/blackmisc/hardware/keyboardkeylist.h @@ -1,16 +1,20 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ //! \file -#ifndef BLACKMISC_KEYBOARDKEYLIST_H -#define BLACKMISC_KEYBOARDKEYLIST_H +#ifndef BLACKMISC_HARDWARE_KEYBOARDKEYLIST_H +#define BLACKMISC_HARDWARE_KEYBOARDKEYLIST_H -#include "hwkeyboardkey.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/hardware/keyboardkey.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include namespace BlackMisc diff --git a/src/blackmisc/hwallclasses.h b/src/blackmisc/hwallclasses.h deleted file mode 100644 index e530bae12..000000000 --- a/src/blackmisc/hwallclasses.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#ifndef BLACKMISC_HWALLCLASSES_H -#define BLACKMISC_HWALLCLASSES_H - -#include "blackmisc/hwkeyboardkeylist.h" -#include "blackmisc/hwjoystickbutton.h" - -#endif // guard diff --git a/src/blackmisc/nwaircraftmapping.cpp b/src/blackmisc/network/aircraftmapping.cpp similarity index 90% rename from src/blackmisc/nwaircraftmapping.cpp rename to src/blackmisc/network/aircraftmapping.cpp index d38575f5f..3a727732b 100644 --- a/src/blackmisc/nwaircraftmapping.cpp +++ b/src/blackmisc/network/aircraftmapping.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "nwaircraftmapping.h" -#include "propertyindex.h" -#include "variant.h" +#include "blackmisc/network/aircraftmapping.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; @@ -19,33 +19,21 @@ namespace BlackMisc namespace Network { - /* - * Constructor - */ CAircraftMapping::CAircraftMapping(const QString &source, const QString &packageName, const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model) : m_source(source.trimmed()), m_packageName(packageName.trimmed()), m_icao(aircraftDesignator, airlineDesignator), m_model(model, BlackMisc::Simulation::CAircraftModel::TypeModelMapping) { } - /* - * Convert to string - */ QString CAircraftMapping::convertToQString(bool i18n) const { QString s = QString(this->m_model.toQString(i18n)).append(' ').append(this->m_icao.toQString(i18n)); return s; } - /* - * Model string? - */ bool CAircraftMapping::matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const { return this->m_model.matchesModelString(modelString, sensitivity); } - /* - * Property by index - */ CVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -65,9 +53,6 @@ namespace BlackMisc } } - /* - * Set property as index - */ void CAircraftMapping::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/network/aircraftmapping.h similarity index 100% rename from src/blackmisc/nwaircraftmapping.h rename to src/blackmisc/network/aircraftmapping.h diff --git a/src/blackmisc/nwaircraftmappinglist.cpp b/src/blackmisc/network/aircraftmappinglist.cpp similarity index 94% rename from src/blackmisc/nwaircraftmappinglist.cpp rename to src/blackmisc/network/aircraftmappinglist.cpp index 4da8cca3c..e2e516e6a 100644 --- a/src/blackmisc/nwaircraftmappinglist.cpp +++ b/src/blackmisc/network/aircraftmappinglist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "nwaircraftmappinglist.h" -#include "predicates.h" +#include "blackmisc/network/aircraftmappinglist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; @@ -17,14 +17,8 @@ namespace BlackMisc { namespace Network { - /* - * Empty constructor - */ CAircraftMappingList::CAircraftMappingList() { } - /* - * Construct from base class object - */ CAircraftMappingList::CAircraftMappingList(const CSequence &other) : CSequence(other) { } @@ -80,9 +74,6 @@ namespace BlackMisc }); } - /* - * Register metadata - */ void CAircraftMappingList::registerMetadata() { qRegisterMetaType>(); diff --git a/src/blackmisc/nwaircraftmappinglist.h b/src/blackmisc/network/aircraftmappinglist.h similarity index 92% rename from src/blackmisc/nwaircraftmappinglist.h rename to src/blackmisc/network/aircraftmappinglist.h index b74090f00..0328e096b 100644 --- a/src/blackmisc/nwaircraftmappinglist.h +++ b/src/blackmisc/network/aircraftmappinglist.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_AIRCRAFTMAPPINGLIST_H -#define BLACKMISC_AIRCRAFTMAPPINGLIST_H +#ifndef BLACKMISC_NETWORK_AIRCRAFTMAPPINGLIST_H +#define BLACKMISC_NETWORK_AIRCRAFTMAPPINGLIST_H -#include "nwaircraftmapping.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/network/aircraftmapping.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include #include #include diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/network/client.cpp similarity index 93% rename from src/blackmisc/nwclient.cpp rename to src/blackmisc/network/client.cpp index 952262a70..b3037e5dc 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/network/client.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackmisc/nwclient.h" +#include "blackmisc/network/client.h" #include "blackmisc/icon.h" #include "blackmisc/aviation/callsign.h" @@ -17,9 +17,7 @@ namespace BlackMisc { namespace Network { - /* - * Convert to string - */ + QString CClient::convertToQString(bool i18n) const { QString s = this->m_user.toQString(i18n); @@ -32,25 +30,16 @@ namespace BlackMisc return s; } - /* - * Capability - */ void CClient::setCapability(bool hasCapability, CClient::Capabilities capability) { this->m_capabilities.addValue(static_cast(capability), hasCapability); } - /* - * Capabilities - */ void CClient::setCapabilities(const CPropertyIndexVariantMap &capabilities) { this->m_capabilities = capabilities; } - /* - * Capabilities - */ QString CClient::getCapabilitiesAsString() const { QStringList sl; @@ -62,9 +51,6 @@ namespace BlackMisc return sl.join(", "); } - /* - * Capability - */ bool CClient::hasCapability(CClient::Capabilities capability) const { if (this->m_capabilities.contains(capability)) @@ -82,9 +68,6 @@ namespace BlackMisc this->m_user.setCallsign(callsign); } - /* - * Property by index - */ CVariant CClient::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -116,9 +99,6 @@ namespace BlackMisc } } - /* - * Set property as index - */ void CClient::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/network/client.h similarity index 95% rename from src/blackmisc/nwclient.h rename to src/blackmisc/network/client.h index f10271a84..426bdd6c1 100644 --- a/src/blackmisc/nwclient.h +++ b/src/blackmisc/network/client.h @@ -9,14 +9,14 @@ //! \file -#ifndef BLACKMISC_CLIENT_H -#define BLACKMISC_CLIENT_H +#ifndef BLACKMISC_NETWORK_CLIENT_H +#define BLACKMISC_NETWORK_CLIENT_H -#include "nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/simulation/aircraftmodel.h" -#include "nwvoicecapabilities.h" -#include "propertyindex.h" -#include "propertyindexvariantmap.h" +#include "blackmisc/network/voicecapabilities.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/propertyindexvariantmap.h" namespace BlackMisc { diff --git a/src/blackmisc/nwclientlist.cpp b/src/blackmisc/network/clientlist.cpp similarity index 84% rename from src/blackmisc/nwclientlist.cpp rename to src/blackmisc/network/clientlist.cpp index e619d7154..53f1a7222 100644 --- a/src/blackmisc/nwclientlist.cpp +++ b/src/blackmisc/network/clientlist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "nwclientlist.h" -#include "predicates.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::Aviation; @@ -16,20 +16,12 @@ namespace BlackMisc { namespace Network { - /* - * Default constructor - */ + CClientList::CClientList() { } - /* - * Construct from base class object - */ CClientList::CClientList(const CSequence &other) : CSequence(other) { } - /* - * Register metadata - */ void CClientList::registerMetadata() { qRegisterMetaType>(); diff --git a/src/blackmisc/nwclientlist.h b/src/blackmisc/network/clientlist.h similarity index 94% rename from src/blackmisc/nwclientlist.h rename to src/blackmisc/network/clientlist.h index ef695245d..db5862180 100644 --- a/src/blackmisc/nwclientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -9,10 +9,10 @@ //! \file -#ifndef BLACKMISC_CLIENTLIST_H -#define BLACKMISC_CLIENTLIST_H +#ifndef BLACKMISC_NETWORK_CLIENTLIST_H +#define BLACKMISC_NETWORK_CLIENTLIST_H -#include "blackmisc/nwclient.h" +#include "blackmisc/network/client.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" #include "blackmisc/aviation/callsignobjectlist.h" diff --git a/src/blackmisc/network/network.h b/src/blackmisc/network/network.h new file mode 100644 index 000000000..52ed3f808 --- /dev/null +++ b/src/blackmisc/network/network.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKMISC_NETWORK_NETWORK_H +#define BLACKMISC_NETWORK_NETWORK_H + +/*! + * \namespace BlackMisc::Network + * \brief Classes related to the traffic network such as VATSIM user etc. + */ + +#include "blackmisc/network/user.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/client.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/network/voicecapabilities.h" +#include "blackmisc/network/aircraftmapping.h" +#include "blackmisc/network/aircraftmappinglist.h" + +#endif // guard diff --git a/src/blackmisc/nwserver.cpp b/src/blackmisc/network/server.cpp similarity index 94% rename from src/blackmisc/nwserver.cpp rename to src/blackmisc/network/server.cpp index 466317976..279681bf7 100644 --- a/src/blackmisc/nwserver.cpp +++ b/src/blackmisc/network/server.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "nwserver.h" +#include "blackmisc/network/server.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" @@ -17,9 +17,7 @@ namespace BlackMisc { namespace Network { - /* - * Convert to string - */ + QString CServer::convertToQString(bool i18n) const { QString s(this->m_name); @@ -31,9 +29,6 @@ namespace BlackMisc return s; } - /* - * Valid for login - */ bool CServer::isValidForLogin() const { return this->m_user.hasValidCredentials() && this->m_port > 0 && !this->m_address.isEmpty() && this->isAcceptingConnections(); @@ -50,9 +45,6 @@ namespace BlackMisc return msgs; } - /* - * Property by index - */ CVariant CServer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } @@ -80,9 +72,6 @@ namespace BlackMisc return CVariant::fromValue(m); } - /* - * Property by index (setter) - */ void CServer::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/network/server.h similarity index 95% rename from src/blackmisc/nwserver.h rename to src/blackmisc/network/server.h index 9233d3087..90a9ac474 100644 --- a/src/blackmisc/nwserver.h +++ b/src/blackmisc/network/server.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_SERVER_H -#define BLACKMISC_SERVER_H +#ifndef BLACKMISC_NETWORK_SERVER_H +#define BLACKMISC_NETWORK_SERVER_H -#include "nwuser.h" -#include "statusmessagelist.h" -#include "valueobject.h" +#include "blackmisc/network/user.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" namespace BlackMisc { diff --git a/src/blackmisc/nwserverlist.cpp b/src/blackmisc/network/serverlist.cpp similarity index 82% rename from src/blackmisc/nwserverlist.cpp rename to src/blackmisc/network/serverlist.cpp index 8150369d4..e6535e80e 100644 --- a/src/blackmisc/nwserverlist.cpp +++ b/src/blackmisc/network/serverlist.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2013 - * swift Project Community / Contributors + * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, @@ -7,27 +7,19 @@ * contained in the LICENSE file. */ -#include "nwserverlist.h" +#include "blackmisc/network/serverlist.h" namespace BlackMisc { namespace Network { - /* - * Empty constructor - */ + CServerList::CServerList() { } - /* - * Construct from base class object - */ CServerList::CServerList(const CSequence &other) : CSequence(other) { } - /* - * Register metadata - */ void CServerList::registerMetadata() { qRegisterMetaType>(); diff --git a/src/blackmisc/nwserverlist.h b/src/blackmisc/network/serverlist.h similarity index 86% rename from src/blackmisc/nwserverlist.h rename to src/blackmisc/network/serverlist.h index 39394aa7f..fac291224 100644 --- a/src/blackmisc/nwserverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -1,5 +1,5 @@ /* Copyright (C) 2013 - * swift Project Community / Contributors + * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKMISC_SERVERLIST_H -#define BLACKMISC_SERVERLIST_H +#ifndef BLACKMISC_NETWORK_SERVERLIST_H +#define BLACKMISC_NETWORK_SERVERLIST_H -#include "nwserver.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/network/server.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" namespace BlackMisc { diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/network/textmessage.cpp similarity index 99% rename from src/blackmisc/nwtextmessage.cpp rename to src/blackmisc/network/textmessage.cpp index 6981f22a7..3854b6e48 100644 --- a/src/blackmisc/nwtextmessage.cpp +++ b/src/blackmisc/network/textmessage.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "nwtextmessage.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/pq/constants.h" #include "blackmisc/aviation/comsystem.h" @@ -21,9 +21,7 @@ namespace BlackMisc { namespace Network { - /* - * Convert to string - */ + QString CTextMessage::convertToQString(bool i18n) const { QString s(this->m_message); diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/network/textmessage.h similarity index 97% rename from src/blackmisc/nwtextmessage.h rename to src/blackmisc/network/textmessage.h index 2a3878bf9..bf3fcc350 100644 --- a/src/blackmisc/nwtextmessage.h +++ b/src/blackmisc/network/textmessage.h @@ -9,14 +9,14 @@ //! \file -#ifndef BLACKMISC_TEXTMESSAGE_H -#define BLACKMISC_TEXTMESSAGE_H +#ifndef BLACKMISC_NETWORK_TEXTMESSAGE_H +#define BLACKMISC_NETWORK_TEXTMESSAGE_H #include "blackmisc/timestampbased.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/aviation/callsign.h" -#include "statusmessage.h" -#include "valueobject.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/valueobject.h" #include namespace BlackMisc diff --git a/src/blackmisc/nwtextmessagelist.cpp b/src/blackmisc/network/textmessagelist.cpp similarity index 80% rename from src/blackmisc/nwtextmessagelist.cpp rename to src/blackmisc/network/textmessagelist.cpp index bb3d267cd..99b7d9f85 100644 --- a/src/blackmisc/nwtextmessagelist.cpp +++ b/src/blackmisc/network/textmessagelist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "nwtextmessagelist.h" -#include "predicates.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/predicates.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; @@ -17,49 +17,32 @@ namespace BlackMisc { namespace Network { - /* - * Empty constructor - */ + CTextMessageList::CTextMessageList() { } - /* - * Single private message constructor - */ CTextMessageList::CTextMessageList(const QString &message, const CCallsign &recipientCallsign) { CTextMessage pm(message, recipientCallsign); this->push_back(pm); } - /* - * Single private message - */ CTextMessageList::CTextMessageList(const QString &message, const CCallsign &fromCallsign, const CCallsign &toCallsign) { CTextMessage pm(message, fromCallsign, toCallsign); this->push_back(pm); } - /* - * Single radio message - */ CTextMessageList::CTextMessageList(const QString &message, const CFrequency &frequency, const CCallsign &fromCallsign) { CTextMessage pm(message, frequency, fromCallsign); this->push_back(pm); } - /* - * Single text message - */ CTextMessageList::CTextMessageList(const CTextMessage &message) { this->push_back(message); } - /* - * Radio messages - */ CTextMessageList::CTextMessageList(const QString &message, const QList &frequencies, const BlackMisc::Aviation::CCallsign &fromCallsign) { if (frequencies.isEmpty()) return; @@ -70,64 +53,40 @@ namespace BlackMisc } } - /* - * Construct from base class object - */ CTextMessageList::CTextMessageList(const CSequence &other) : CSequence(other) { } - /* - * Private messages - */ CTextMessageList CTextMessageList::getPrivateMessages() const { return this->findBy(&CTextMessage::isPrivateMessage, true); } - /* - * Private messages? - */ bool CTextMessageList::containsPrivateMessages() const { return this->contains(&CTextMessage::isPrivateMessage, true); } - /* - * Supervisor messages? - */ CTextMessageList CTextMessageList::containsSupervisorMessages() const { return this->findBy(&CTextMessage::isSupervisorMessage, true); } - /* - * Radio messages - */ CTextMessageList CTextMessageList::getRadioMessages() const { return this->findBy(&CTextMessage::isRadioMessage, true); } - /* - * Supervisor messages - */ CTextMessageList CTextMessageList::getSupervisorMessages() const { return this->findBy(&CTextMessage::isSupervisorMessage, true); } - /* - * Radio messages? - */ bool CTextMessageList::containsRadioMessages() const { return this->contains(&CTextMessage::isRadioMessage, true); } - /* - * Register metadata - */ void CTextMessageList::registerMetadata() { qRegisterMetaType>(); @@ -139,26 +98,17 @@ namespace BlackMisc registerMetaValueType(); } - /* - * Find by frequency - */ CTextMessageList CTextMessageList::findByFrequency(const CFrequency &frequency) const { return this->findBy(&CTextMessage::getFrequency, frequency); } - /* - * Toggle all senders / receivers - */ void CTextMessageList::toggleSenderRecipients() { if (this->isEmpty()) { return; } std::for_each(this->begin(), this->end(), [](CTextMessage & tm) { tm.toggleSenderRecipient(); }); } - /* - * Mark all messages as sent - */ void CTextMessageList::markAsSent() { std::for_each(this->begin(), this->end(), [](CTextMessage & tm) { tm.markAsSent(); }); diff --git a/src/blackmisc/nwtextmessagelist.h b/src/blackmisc/network/textmessagelist.h similarity index 94% rename from src/blackmisc/nwtextmessagelist.h rename to src/blackmisc/network/textmessagelist.h index e9937db60..2d6a3950c 100644 --- a/src/blackmisc/nwtextmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -9,13 +9,13 @@ //! \file -#ifndef BLACKMISC_TEXTMESSAGELIST_H -#define BLACKMISC_TEXTMESSAGELIST_H +#ifndef BLACKMISC_NETWORK_TEXTMESSAGELIST_H +#define BLACKMISC_NETWORK_TEXTMESSAGELIST_H -#include "nwtextmessage.h" -#include "timestampobjectlist.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include #include #include diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/network/user.cpp similarity index 98% rename from src/blackmisc/nwuser.cpp rename to src/blackmisc/network/user.cpp index ea0bd5581..352bd7cd3 100644 --- a/src/blackmisc/nwuser.cpp +++ b/src/blackmisc/network/user.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/aviation/airporticao.h" #include "blackmisc/icon.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -91,9 +91,6 @@ namespace BlackMisc return msgs; } - /* - * Exchange data - */ void CUser::syncronizeData(CUser &otherUser) { if (otherUser == (*this)) { return; } @@ -169,9 +166,6 @@ namespace BlackMisc return newRealName; } - /* - * Property by index - */ CVariant CUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (index.isMyself()) { return this->toCVariant(); } diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/network/user.h similarity index 97% rename from src/blackmisc/nwuser.h rename to src/blackmisc/network/user.h index 9b6f931c8..59853e2e0 100644 --- a/src/blackmisc/nwuser.h +++ b/src/blackmisc/network/user.h @@ -9,13 +9,13 @@ //! \file -#ifndef BLACKMISC_USER_H -#define BLACKMISC_USER_H +#ifndef BLACKMISC_NETWORK_USER_H +#define BLACKMISC_NETWORK_USER_H #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/airporticao.h" -#include "propertyindex.h" -#include "statusmessagelist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessagelist.h" namespace BlackMisc { diff --git a/src/blackmisc/network/userlist.cpp b/src/blackmisc/network/userlist.cpp new file mode 100644 index 000000000..28c435c4d --- /dev/null +++ b/src/blackmisc/network/userlist.cpp @@ -0,0 +1,31 @@ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +#include "blackmisc/network/userlist.h" +#include "blackmisc/predicates.h" + +namespace BlackMisc +{ + namespace Network + { + + CUserList::CUserList() { } + + CUserList::CUserList(const CSequence &other) : CSequence(other) + { } + + void CUserList::registerMetadata() + { + qRegisterMetaType(); + qDBusRegisterMetaType(); + registerMetaValueType(); + } + + } // namespace +} // namespace diff --git a/src/blackmisc/nwuserlist.h b/src/blackmisc/network/userlist.h similarity index 63% rename from src/blackmisc/nwuserlist.h rename to src/blackmisc/network/userlist.h index be8d8c2db..baf023f5b 100644 --- a/src/blackmisc/nwuserlist.h +++ b/src/blackmisc/network/userlist.h @@ -1,14 +1,18 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ -#ifndef BLACKMISC_USERLIST_H -#define BLACKMISC_USERLIST_H +#ifndef BLACKMISC_NETWORK_USERLIST_H +#define BLACKMISC_NETWORK_USERLIST_H -#include "nwuser.h" -#include "sequence.h" -#include "collection.h" +#include "blackmisc/network/user.h" +#include "blackmisc/sequence.h" +#include "blackmisc/collection.h" #include #include #include diff --git a/src/blackmisc/nwvoicecapabilites.cpp b/src/blackmisc/network/voicecapabilites.cpp similarity index 94% rename from src/blackmisc/nwvoicecapabilites.cpp rename to src/blackmisc/network/voicecapabilites.cpp index 7a442e494..37f57773b 100644 --- a/src/blackmisc/nwvoicecapabilites.cpp +++ b/src/blackmisc/network/voicecapabilites.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "blackmisc/nwvoicecapabilities.h" +#include "blackmisc/network/voicecapabilities.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/iconlist.h" #include @@ -19,17 +19,11 @@ namespace BlackMisc namespace Network { - /* - * Constructor - */ CVoiceCapabilities::CVoiceCapabilities(const QString &flightPlanRemarks) { this->setFromFlightPlanRemarks(flightPlanRemarks); } - /* - * Convert to string - */ QString CVoiceCapabilities::convertToQString(bool i18n) const { Q_UNUSED(i18n); @@ -90,9 +84,6 @@ namespace BlackMisc this->setCapabilities(Unknown); } - /* - * Icon - */ CIcon CVoiceCapabilities::toIcon() const { switch (this->m_voiceCapabilities) @@ -112,9 +103,6 @@ namespace BlackMisc return CIconList::iconByIndex(CIcons::NetworkCapabilityUnknown); // never reached } - /* - * From enum - */ const CVoiceCapabilities &CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::VoiceCapabilities capabilities) { static const CVoiceCapabilities u(CVoiceCapabilities::Unknown); @@ -136,9 +124,6 @@ namespace BlackMisc } } - /* - * All - */ const QList &CVoiceCapabilities::allCapabilities() { static const QList all({fromVoiceCapabilities(Unknown), fromVoiceCapabilities(Voice), fromVoiceCapabilities(VoiceReceivingOnly), fromVoiceCapabilities(TextOnly)}); diff --git a/src/blackmisc/nwvoicecapabilities.h b/src/blackmisc/network/voicecapabilities.h similarity index 94% rename from src/blackmisc/nwvoicecapabilities.h rename to src/blackmisc/network/voicecapabilities.h index 6d37190e8..75d9c6361 100644 --- a/src/blackmisc/nwvoicecapabilities.h +++ b/src/blackmisc/network/voicecapabilities.h @@ -7,13 +7,13 @@ * contained in the LICENSE file. */ -#ifndef BLACKMISC_VOICECAPABILITIES_H -#define BLACKMISC_VOICECAPABILITIES_H - //! \file -#include "valueobject.h" -#include "blackmiscfreefunctions.h" +#ifndef BLACKMISC_NETWORK_VOICECAPABILITIES_H +#define BLACKMISC_NETWORK_VOICECAPABILITIES_H + +#include "blackmisc/valueobject.h" +#include "blackmisc/blackmiscfreefunctions.h" namespace BlackMisc { diff --git a/src/blackmisc/networkutils.h b/src/blackmisc/networkutils.h index db4d047fa..f2be94372 100644 --- a/src/blackmisc/networkutils.h +++ b/src/blackmisc/networkutils.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_NETWORKUTILS_H #define BLACKMISC_NETWORKUTILS_H -#include "nwserver.h" +#include "network/server.h" #include namespace BlackMisc diff --git a/src/blackmisc/nwuserlist.cpp b/src/blackmisc/nwuserlist.cpp deleted file mode 100644 index bd0d928dc..000000000 --- a/src/blackmisc/nwuserlist.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * 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 "nwuserlist.h" -#include "predicates.h" - -namespace BlackMisc -{ - namespace Network - { - /* - * Default constructor - */ - CUserList::CUserList() { } - - /* - * Construct from base class object - */ - CUserList::CUserList(const CSequence &other) : CSequence(other) - { } - - /* - * Register metadata - */ - void CUserList::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - - } // namespace -} // namespace diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 32d3bfe9d..1b66e893c 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -13,7 +13,7 @@ #define BLACKMISC_SETTINGS_KEYBOARDHOTKEY_H #include "propertyindex.h" -#include "hwkeyboardkey.h" +#include "hardware/keyboardkey.h" #include "hotkeyfunction.h" #include "blackmiscfreefunctions.h" #include diff --git a/src/blackmisc/setkeyboardhotkeylist.h b/src/blackmisc/setkeyboardhotkeylist.h index 6921baf3a..487738ca0 100644 --- a/src/blackmisc/setkeyboardhotkeylist.h +++ b/src/blackmisc/setkeyboardhotkeylist.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_SETTINGS_KEYBOARDHOTKEYLIST_H #define BLACKMISC_SETTINGS_KEYBOARDHOTKEYLIST_H -#include "hwkeyboardkey.h" +#include "hardware/keyboardkey.h" #include "setkeyboardhotkey.h" #include "collection.h" #include "sequence.h" diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index ca4ca24e1..f663d0c40 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_SETTINGS_NETWORK_H #define BLACKMISC_SETTINGS_NETWORK_H -#include "nwserverlist.h" +#include "network/serverlist.h" #include "valueobject.h" #include "statusmessagelist.h" #include "settingutilities.h" diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 1dfe842d6..6b7e0d933 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -14,7 +14,7 @@ #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/aircrafticao.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/propertyindex.h" namespace BlackMisc diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp index 9c8b111e6..408488140 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp @@ -8,7 +8,7 @@ */ #include "vpilotmodelmappings.h" -#include "blackmisc/nwaircraftmapping.h" +#include "blackmisc/network/aircraftmapping.h" #include #include diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 04e77ade1..d3f85ac41 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -14,7 +14,7 @@ #include "blackmisc/aviation/aircraft.h" #include "aircraftmodel.h" -#include "blackmisc/nwclient.h" +#include "blackmisc/network/client.h" namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatedaircraftlist.cpp b/src/blackmisc/simulation/simulatedaircraftlist.cpp index 3ca3efe76..bac8edce5 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.cpp +++ b/src/blackmisc/simulation/simulatedaircraftlist.cpp @@ -8,7 +8,7 @@ */ #include "blackmisc/simulation/simulatedaircraftlist.h" -#include "blackmisc/nwuser.h" +#include "blackmisc/network/user.h" #include "blackmisc/predicates.h" #include "blackmisc/propertyindexallclasses.h" diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index a283fc1d1..59dca6502 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -16,7 +16,7 @@ #include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/aviation/aircraftlist.h" #include "blackmisc/geo/geoobjectlist.h" -#include "blackmisc/nwuserlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" #include diff --git a/src/blackmisc/simulation/simulatormodelmappings.h b/src/blackmisc/simulation/simulatormodelmappings.h index 6df7e5676..fce08aec1 100644 --- a/src/blackmisc/simulation/simulatormodelmappings.h +++ b/src/blackmisc/simulation/simulatormodelmappings.h @@ -12,7 +12,7 @@ #ifndef BLACKMISC_SIMULATION_MODELMAPPINGS_H #define BLACKMISC_SIMULATION_MODELMAPPINGS_H -#include "blackmisc/nwaircraftmappinglist.h" +#include "blackmisc/network/aircraftmappinglist.h" #include namespace BlackMisc diff --git a/src/blackmisc/testing.cpp b/src/blackmisc/testing.cpp index 1f3f36fed..f89e15133 100644 --- a/src/blackmisc/testing.cpp +++ b/src/blackmisc/testing.cpp @@ -8,7 +8,7 @@ */ #include "testing.h" -#include "nwvoicecapabilities.h" +#include "network/voicecapabilities.h" using namespace BlackMisc; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp index 5899dca4a..4e7fb9ef1 100644 --- a/src/blackmisc/timestampobjectlist.cpp +++ b/src/blackmisc/timestampobjectlist.cpp @@ -11,7 +11,7 @@ #include "blackmisc/predicates.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" -#include "blackmisc/nwtextmessagelist.h" +#include "blackmisc/network/textmessagelist.h" #include "blackmisc/statusmessagelist.h" #include #include diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index 81740d3c8..ac1095ad6 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -17,7 +17,7 @@ #include "blackmisc/project.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/logmessage.h" -#include "blackmisc/nwaircraftmappinglist.h" +#include "blackmisc/network/aircraftmappinglist.h" #include "blackcore/interpolator_linear.h" #include diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index d60cb5fcd..61cdcfe1a 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -22,7 +22,7 @@ #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/statusmessage.h" -#include "blackmisc/nwclient.h" +#include "blackmisc/network/client.h" #include "blackmisc/pixmap.h" #include diff --git a/src/swiftgui_standard/swiftguistd.h b/src/swiftgui_standard/swiftguistd.h index 03a21592c..697c73f2b 100644 --- a/src/swiftgui_standard/swiftguistd.h +++ b/src/swiftgui_standard/swiftguistd.h @@ -30,7 +30,7 @@ #include "blackgui/models/keyboardkeylistmodel.h" #include "blackgui/enableforframelesswindow.h" #include "blackgui/managedstatusbar.h" -#include "blackmisc/nwtextmessage.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/loghandler.h" #include "blacksound/soundgenerator.h" #include diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp index c359a2161..54336dd6d 100644 --- a/tests/blackmisc/testaviation.cpp +++ b/tests/blackmisc/testaviation.cpp @@ -14,8 +14,8 @@ #include "blackmisc/aviation/navsystem.h" #include "blackmisc/aviation/transponder.h" #include "blackmisc/aviation/atcstation.h" -#include "blackmisc/nwuser.h" -#include "blackmisc/nwserver.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/server.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/tests/blackmisc/testhardware.cpp b/tests/blackmisc/testhardware.cpp index a6f938283..03420842f 100644 --- a/tests/blackmisc/testhardware.cpp +++ b/tests/blackmisc/testhardware.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "testhardware.h" -#include "blackmisc/hwkeyboardkey.h" +#include "blackmisc/hardware/keyboardkey.h" using namespace BlackMisc::Hardware;