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

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"

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"
 

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

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"

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"

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

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.

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 \

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"

src/blackmisc/blackmiscfreefunctions_nwmeta.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "blackmiscfreefunctions.h"
-#include "networkallclasses.h"
+#include "network/network.h"
 
 /*
  * Metadata for Network

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

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

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
 {

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

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 <QStringList>
 #include <QKeySequence>
 

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<CKeyboardKey> &baseClass) :
             CSequence<CKeyboardKey>(baseClass)
         { }
 
-        /*
-         * Register metadata
-         */
         void CKeyboardKeyList::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CKeyboardKey>>();

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

src/blackmisc/hwallclasses.h

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

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())

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<CAircraftMapping> &other) :
             CSequence<CAircraftMapping>(other)
         { }
@@ -80,9 +74,6 @@ namespace BlackMisc
             });
         }
 
-        /*
-         * Register metadata
-         */
         void CAircraftMappingList::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CAircraftMapping>>();

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 <QObject>
 #include <QString>
 #include <QList>

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<int>(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())

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
 {

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<CClient>(other)
         { }
 
-        /*
-         * Register metadata
-         */
         void CClientList::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CClient>>();

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"

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

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())

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
 {

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<CServer> &other) :
             CSequence<CServer>(other)
         { }
 
-        /*
-         * Register metadata
-         */
         void CServerList::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CServer>>();

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
 {

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);

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

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<CFrequency> &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<CTextMessage> &other) :
             CSequence<CTextMessage>(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<BlackMisc::CSequence<CTextMessage>>();
@@ -139,26 +98,17 @@ namespace BlackMisc
             registerMetaValueType<CTextMessageList>();
         }
 
-        /*
-         * 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(); });

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 <QObject>
 #include <QString>
 #include <QList>

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(); }

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
 {

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<CUser>(other)
+        { }
+
+        void CUserList::registerMetadata()
+        {
+            qRegisterMetaType<CUserList>();
+            qDBusRegisterMetaType<CUserList>();
+            registerMetaValueType<CUserList>();
+        }
+
+    } // namespace
+} // namespace

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 <QObject>
 #include <QString>
 #include <QList>

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 <tuple>
@@ -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> &CVoiceCapabilities::allCapabilities()
         {
             static const QList<CVoiceCapabilities> all({fromVoiceCapabilities(Unknown), fromVoiceCapabilities(Voice), fromVoiceCapabilities(VoiceReceivingOnly), fromVoiceCapabilities(TextOnly)});

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
 {

src/blackmisc/networkutils.h

@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_NETWORKUTILS_H
 #define BLACKMISC_NETWORKUTILS_H
 
-#include "nwserver.h"
+#include "network/server.h"
 #include <QStringList>
 
 namespace BlackMisc

src/blackmisc/nwuserlist.cpp

@@ -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<CUser>(other)
-        { }
-
-        /*
-         * Register metadata
-         */
-        void CUserList::registerMetadata()
-        {
-            qRegisterMetaType<CUserList>();
-            qDBusRegisterMetaType<CUserList>();
-            registerMetaValueType<CUserList>();
-        }
-
-    } // namespace
-} // namespace

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

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"

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"

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

src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "vpilotmodelmappings.h"
-#include "blackmisc/nwaircraftmapping.h"
+#include "blackmisc/network/aircraftmapping.h"
 
 #include <QtXml/QDomElement>
 #include <QFile>

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
 {

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"
 

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

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

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;

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 <algorithm>
 #include <iterator>