refs #396 BlackMisc: nw* goes to network/, hw* goes to hardware/

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"

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"

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

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"
 

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"

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"
 

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"

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
 {

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
 {

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

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"

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

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

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"
 

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"
 

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

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