refs #396 subfolders and renamed callsign list to callsign set

* subfolder audio
* subfolder geo
* adjusted samples, tests ....

src/blackmisc/audio/audio.h

@@ -0,0 +1,25 @@
+/* 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_AUDIO_AUDIO_H
+#define BLACKMISC_AUDIO_AUDIO_H
+
+/*!
+ * \namespace BlackMisc::Audio
+ * \brief Audio classes such as audio devices and voice rooms.
+ */
+
+#include "blackmisc/audio/audiodeviceinfo.h"
+#include "blackmisc/audio/audiodeviceinfolist.h"
+#include "blackmisc/audio/voiceroom.h"
+#include "blackmisc/audio/voiceroomlist.h"
+
+#endif // guard

src/blackmisc/audio/audiodeviceinfo.cpp

@@ -15,29 +15,17 @@ namespace BlackMisc
 {
     namespace Audio
     {
-        /*
-         * Constructor
-         */
+
         CAudioDeviceInfo::CAudioDeviceInfo() :
             m_type(Unknown), m_deviceIndex(invalidDeviceIndex()),
             m_deviceName(""), m_hostName(BlackMisc::localHostName())
-        {
-            // void
-        }
+        { }
 
-        /*
-         * Constructor
-         */
         CAudioDeviceInfo::CAudioDeviceInfo(DeviceType type, const int index, const QString &name) :
             m_type(type), m_deviceIndex(index),
             m_deviceName(name), m_hostName(BlackMisc::localHostName())
-        {
-            // void
-        }
+        { }
 
-        /*
-         * As String
-         */
         QString CAudioDeviceInfo::convertToQString(bool i18n) const
         {
             Q_UNUSED(i18n);

src/blackmisc/audio/audiodeviceinfo.h

@@ -9,11 +9,11 @@
 
 //! \file
 
-#ifndef BLACKMISC_AUDIODEVICE_H
-#define BLACKMISC_AUDIODEVICE_H
+#ifndef BLACKMISC_AUDIO_AUDIODEVICE_H
+#define BLACKMISC_AUDIO_AUDIODEVICE_H
 
-#include "blackmiscfreefunctions.h"
-#include "valueobject.h"
+#include "blackmisc/blackmiscfreefunctions.h"
+#include "blackmisc/valueobject.h"
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/audio/audiodeviceinfolist.cpp

@@ -8,43 +8,29 @@
  */
 
 #include "audiodeviceinfolist.h"
-#include "predicates.h"
+#include "blackmisc/predicates.h"
 
 namespace BlackMisc
 {
     namespace Audio
     {
-        /*
-         * Default constructor
-         */
+
         CAudioDeviceInfoList::CAudioDeviceInfoList() { }
 
-        /*
-         * Construct from base class object
-         */
         CAudioDeviceInfoList::CAudioDeviceInfoList(const CSequence &other) :
             CSequence(other)
         { }
 
-        /*
-         * Output devices
-         */
         CAudioDeviceInfoList CAudioDeviceInfoList::getOutputDevices() const
         {
             return this->findBy(&CAudioDeviceInfo::getType, CAudioDeviceInfo::OutputDevice);
         }
 
-        /*
-         * Output devices
-         */
         CAudioDeviceInfoList CAudioDeviceInfoList::getInputDevices() const
         {
             return this->findBy(&CAudioDeviceInfo::getType, CAudioDeviceInfo::InputDevice);
         }
 
-        /*
-         * Count as of type
-         */
         int CAudioDeviceInfoList::count(CAudioDeviceInfo::DeviceType type) const
         {
             return std::count_if(this->begin(), this->end(), [type](const CAudioDeviceInfo &device)
@@ -53,9 +39,6 @@ namespace BlackMisc
             });
         }
 
-        /*
-         * Register metadata
-         */
         void CAudioDeviceInfoList::registerMetadata()
         {
             qRegisterMetaType<CAudioDeviceInfoList>();

src/blackmisc/audio/audiodeviceinfolist.h

@@ -9,12 +9,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_AUDIODEVICELIST_H
-#define BLACKMISC_AUDIODEVICELIST_H
+#ifndef BLACKMISC_AUDIO_AUDIODEVICELIST_H
+#define BLACKMISC_AUDIO_AUDIODEVICELIST_H
 
-#include "audiodeviceinfo.h"
-#include "sequence.h"
-#include "collection.h"
+#include "blackmisc/audio/audiodeviceinfo.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/collection.h"
 #include <QObject>
 #include <QString>
 #include <QList>
@@ -23,9 +23,7 @@ namespace BlackMisc
 {
     namespace Audio
     {
-        /*!
-         * Value object encapsulating a list of audio devices.
-         */
+        //! Value object encapsulating a list of audio devices.
         class CAudioDeviceInfoList : public CSequence<CAudioDeviceInfo>
         {
         public:

src/blackmisc/audio/voiceroom.cpp

@@ -19,18 +19,13 @@ namespace BlackMisc
 {
     namespace Audio
     {
-        /*
-         * Constructor
-         */
+
         CVoiceRoom::CVoiceRoom(const QString &voiceRoomUrl, bool connected) :
             m_connected(connected), m_audioPlaying(false)
         {
             this->setVoiceRoomUrl(voiceRoomUrl);
         }
 
-        /*
-         * Property by index
-         */
         CVariant CVoiceRoom::propertyByIndex(const CPropertyIndex &index) const
         {
             if (index.isMyself()) { return this->toCVariant(); }
@@ -52,9 +47,6 @@ namespace BlackMisc
             }
         }
 
-        /*
-         * Property by index
-         */
         void CVoiceRoom::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
             if (index.isMyself())
@@ -87,9 +79,6 @@ namespace BlackMisc
             }
         }
 
-        /*
-         * To string
-         */
         QString CVoiceRoom::convertToQString(bool /* i18n */) const
         {
             if (!this->isValid()) return "Invalid";
@@ -99,9 +88,6 @@ namespace BlackMisc
             return s;
         }
 
-        /*
-         * Server URL
-         */
         QString CVoiceRoom::getVoiceRoomUrl(bool noProtocol) const
         {
             if (!this->isValid()) return "";
@@ -112,9 +98,6 @@ namespace BlackMisc
             return url;
         }
 
-        /*
-         * Voice room URL
-         */
         void CVoiceRoom::setVoiceRoomUrl(const QString &serverUrl)
         {
             if (serverUrl.isEmpty())
@@ -133,9 +116,6 @@ namespace BlackMisc
             }
         }
 
-        /*
-         * ATIS voice channel
-         */
         bool CVoiceRoom::isAtis() const
         {
             return (this->m_channel.contains("ATIS", Qt::CaseInsensitive));

src/blackmisc/audio/voiceroom.h

@@ -9,20 +9,18 @@
 
 //! \file
 
-#include "propertyindex.h"
-#include "blackmiscfreefunctions.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/blackmiscfreefunctions.h"
 #include <QString>
 
-#ifndef BLACKMISC_VOICEROOM_H
-#define BLACKMISC_VOICEROOM_H
+#ifndef BLACKMISC_AUDIO_VOICEROOM_H
+#define BLACKMISC_AUDIO_VOICEROOM_H
 
 namespace BlackMisc
 {
     namespace Audio
     {
-        /*!
-         * Value object encapsulating information of a voice room
-         */
+        //! Value object encapsulating information of a voice room
         class CVoiceRoom : public CValueObject<CVoiceRoom>
         {
         public:

src/blackmisc/audio/voiceroomlist.cpp

@@ -8,27 +8,19 @@
  */
 
 #include "voiceroomlist.h"
-#include "predicates.h"
+#include "blackmisc/predicates.h"
 
 namespace BlackMisc
 {
     namespace Audio
     {
-        /*
-         * Default constructor
-         */
+
         CVoiceRoomList::CVoiceRoomList() { }
 
-        /*
-         * Construct from base class object
-         */
         CVoiceRoomList::CVoiceRoomList(const CSequence &other) :
             CSequence(other)
         { }
 
-        /*
-         * Register metadata
-         */
         void CVoiceRoomList::registerMetadata()
         {
             qRegisterMetaType<CVoiceRoomList>();
@@ -36,9 +28,6 @@ namespace BlackMisc
             registerMetaValueType<CVoiceRoomList>();
         }
 
-        /*
-         * Two empty rooms
-         */
         const CVoiceRoomList &CVoiceRoomList::twoEmptyRooms()
         {
             static CVoiceRoomList emptyRooms;

src/blackmisc/audio/voiceroomlist.h

@@ -9,12 +9,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_VOICEROOMLIST_H
-#define BLACKMISC_VOICEROOMLIST_H
+#ifndef BLACKMISC_AUDIO_VOICEROOMLIST_H
+#define BLACKMISC_AUDIO_VOICEROOMLIST_H
 
 #include "voiceroom.h"
-#include "sequence.h"
-#include "collection.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/collection.h"
 #include <QObject>
 #include <QString>
 #include <QList>

src/blackmisc/aviation/aircraftlist.h

@@ -13,9 +13,9 @@
 #define BLACKMISC_AVIATION_AIRCRAFTLIST_H
 
 #include "blackmisc/aviation/aircraft.h"
-#include "blackmisc/aviation/callsignlist.h"
+#include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/nwuserlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/propertyindexvariantmap.h"

src/blackmisc/aviation/aircraftsituation.h

@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
 #define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
 
-#include "blackmisc/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/aviation/heading.h"

src/blackmisc/aviation/airport.h

@@ -13,7 +13,7 @@
 #define BLACKMISC_AVIATION_AIRPORT_H
 
 #include "blackmisc/aviation/airporticao.h"
-#include "blackmisc/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/propertyindex.h"
 
 namespace BlackMisc

src/blackmisc/aviation/airportlist.h

@@ -13,10 +13,10 @@
 #define BLACKMISC_AVIATION_AIRPORTLIST_H
 
 #include "blackmisc/aviation/airport.h"
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include <QObject>
 #include <QString>
 #include <QList>

src/blackmisc/aviation/atcstation.cpp

@@ -9,7 +9,7 @@
 
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/voiceroom.h"
+#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/blackmiscfreefunctions.h"

src/blackmisc/aviation/atcstation.h

@@ -12,12 +12,12 @@
 #ifndef BLACKMISC_AVIATION_ATCSTATION_H
 #define BLACKMISC_AVIATION_ATCSTATION_H
 
-#include "blackmisc/voiceroom.h"
+#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/nwuser.h"
-#include "blackmisc/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/pqfrequency.h"
 #include "blackmisc/pqlength.h"
 #include "blackmisc/pqtime.h"

src/blackmisc/aviation/atcstationlist.h

@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H
 #define BLACKMISC_AVIATION_ATCSTATIONLIST_H
 
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/nwuserlist.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/callsignobjectlist.h"

src/blackmisc/aviation/aviation.h

@@ -19,7 +19,7 @@
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/aviation/track.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/aviation/callsignlist.h"
+#include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/aircraftlist.h"

src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp

@@ -27,7 +27,7 @@ void BlackMisc::Aviation::registerMetadata()
     CTrack::registerMetadata();
     CInformationMessage::registerMetadata();
     CCallsign::registerMetadata();
-    CCallsignList::registerMetadata();
+    CCallsignSet::registerMetadata();
     CAtcStation::registerMetadata();
     CAtcStationList::registerMetadata();
     CAircraft::registerMetadata();

src/blackmisc/aviation/callsignobjectlist.cpp

@@ -37,9 +37,9 @@ namespace BlackMisc
         }
 
         template <class OBJ, class CONTAINER>
-        CCallsignList ICallsignObjectList<OBJ, CONTAINER>::getCallsigns() const
+        CCallsignSet ICallsignObjectList<OBJ, CONTAINER>::getCallsigns() const
         {
-            CCallsignList cs;
+            CCallsignSet cs;
             for (const OBJ &obj : this->container())
             {
                 cs.push_back(obj.getCallsign());
@@ -54,7 +54,7 @@ namespace BlackMisc
         }
 
         template <class OBJ, class CONTAINER>
-        CONTAINER ICallsignObjectList<OBJ, CONTAINER>::findByCallsigns(const CCallsignList &callsigns) const
+        CONTAINER ICallsignObjectList<OBJ, CONTAINER>::findByCallsigns(const CCallsignSet &callsigns) const
         {
             return this->container().findBy(Predicates::MemberIsAnyOf(&OBJ::getCallsign, callsigns));
         }

src/blackmisc/aviation/callsignobjectlist.h

@@ -14,7 +14,7 @@
 
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/aviation/callsignlist.h"
+#include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/propertyindexlist.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include <QList>
@@ -37,13 +37,13 @@ namespace BlackMisc
             int applyIfCallsign(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CPropertyIndexVariantMap &variantMap);
 
             //! All callsigns
-            BlackMisc::Aviation::CCallsignList getCallsigns() const;
+            BlackMisc::Aviation::CCallsignSet getCallsigns() const;
 
             //! Find 0..n stations by callsign
             CONTAINER findByCallsign(const CCallsign &callsign) const;
 
             //! Find 0..n aircraft matching any of a set of callsigns
-            CONTAINER findByCallsigns(const CCallsignList &callsigns) const;
+            CONTAINER findByCallsigns(const CCallsignSet &callsigns) const;
 
             //! Find the first aircraft by callsign, if none return given one
             OBJ findFirstByCallsign(const CCallsign &callsign, const OBJ &ifNotFound = {}) const;

src/blackmisc/aviation/callsignset.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/aviation/callsignlist.h"
+#include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/predicates.h"
 
 namespace BlackMisc
@@ -15,21 +15,21 @@ namespace BlackMisc
     namespace Aviation
     {
 
-        CCallsignList::CCallsignList() { }
+        CCallsignSet::CCallsignSet() { }
 
-        CCallsignList::CCallsignList(const CCollection<CCallsign> &other) :
+        CCallsignSet::CCallsignSet(const CCollection<CCallsign> &other) :
             CCollection<CCallsign>(other)
         { }
 
-        void CCallsignList::registerMetadata()
+        void CCallsignSet::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CCallsign>>();
             qDBusRegisterMetaType<BlackMisc::CSequence<CCallsign>>();
             qRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
             qDBusRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
-            qRegisterMetaType<CCallsignList>();
-            qDBusRegisterMetaType<CCallsignList>();
-            registerMetaValueType<CCallsignList>();
+            qRegisterMetaType<CCallsignSet>();
+            qDBusRegisterMetaType<CCallsignSet>();
+            registerMetaValueType<CCallsignSet>();
         }
 
     } // namespace

src/blackmisc/aviation/callsignset.h

@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_AVIATION_CALLSIGNLIST_H
-#define BLACKMISC_AVIATION_CALLSIGNLIST_H
+#ifndef BLACKMISC_AVIATION_CALLSIGNSET_H
+#define BLACKMISC_AVIATION_CALLSIGNSET_H
 
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/collection.h"
@@ -21,15 +21,15 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-        //! Value object for a list of callsigns.
-        class CCallsignList : public CCollection<CCallsign>
+        //! Value object for a set of callsigns.
+        class CCallsignSet : public CCollection<CCallsign>
         {
         public:
             //! Default constructor.
-            CCallsignList();
+            CCallsignSet();
 
             //! Construct from a base class object.
-            CCallsignList(const CCollection<CCallsign> &other);
+            CCallsignSet(const CCollection<CCallsign> &other);
 
             //! \copydoc CValueObject::toQVariant
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
@@ -44,7 +44,7 @@ namespace BlackMisc
     } //namespace
 } // namespace
 
-Q_DECLARE_METATYPE(BlackMisc::Aviation::CCallsignList)
+Q_DECLARE_METATYPE(BlackMisc::Aviation::CCallsignSet)
 Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CCallsign>)
 Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CCallsign>)
 

src/blackmisc/blackmisc.pro

@@ -26,6 +26,8 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
 HEADERS +=  *.h \
             $$PWD/aviation/*.h \
             $$PWD/math/*.h \
+            $$PWD/geo/*.h \
+            $$PWD/audio/*.h \
             $$PWD/simulation/*.h \
             $$PWD/simulation/fscommon\*.h \
             $$PWD/simulation/fsx\*.h
@@ -33,6 +35,8 @@ HEADERS +=  *.h \
 SOURCES +=  *.cpp \
             $$PWD/aviation/*.cpp \
             $$PWD/math/*.cpp \
+            $$PWD/geo/*.cpp \
+            $$PWD/audio/*.cpp \
             $$PWD/simulation/*.cpp \
             $$PWD/simulation/fscommon\*.cpp \
             $$PWD/simulation/fsx\*.cpp

src/blackmisc/blackmiscallvalueclasses.h

@@ -1,28 +0,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_ALLVALUECLASSES_H
-#define BLACKMISC_ALLVALUECLASSES_H
-
-#include "blackmisc/pqallquantities.h"
-#include "blackmisc/aviation/aviationall.h"
-#include "blackmisc/geoallclasses.h"
-#include "blackmisc/settingsblackmiscclasses.h"
-#include "blackmisc/propertyindexallclasses.h"
-#include "blackmisc/networkallclasses.h"
-#include "blackmisc/statusmessagelist.h"
-#include "blackmisc/statusmessage.h"
-#include "blackmisc/audioallclasses.h"
-#include "blackmisc/variantlist.h"
-#include "blackmisc/simulation/simulationallclasses.h"
-#include "hotkeyfunction.h"
-
-#endif // guard

src/blackmisc/blackmiscfreefunctions.cpp

@@ -11,9 +11,9 @@
 #include "blackmisc/aviation/aviation.h"
 #include "pqallquantities.h"
 #include "math/math.h"
-#include "geoallclasses.h"
+#include "geo/geo.h"
 #include "networkallclasses.h"
-#include "audioallclasses.h"
+#include "audio/audio.h"
 #include "hwallclasses.h"
 #include "settingsblackmiscclasses.h"
 #include "propertyindexlist.h"

src/blackmisc/blackmiscfreefunctions_simmeta.cpp

@@ -32,9 +32,9 @@ void BlackMisc::Simulation::registerMetadata()
     CSimulatorPluginInfo::registerMetadata();
     CSimulatorPluginInfoList::registerMetadata();
     CSettingsSimulator::registerMetadata();
-    FsCommon::CAircraftCfgEntries::registerMetadata();
-    FsCommon::CAircraftCfgEntriesList::registerMetadata();
-    Fsx::CSimConnectUtilities::registerMetadata();
+    CAircraftCfgEntries::registerMetadata();
+    CAircraftCfgEntriesList::registerMetadata();
+    CSimConnectUtilities::registerMetadata();
     CAircraftModel::registerMetadata();
     CAircraftModelList::registerMetadata();
     CSimulatedAircraft::registerMetadata();

src/blackmisc/geo/coordinategeodetic.cpp

@@ -7,11 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/math/mathutils.h"
-#include "variant.h"
+#include "blackmisc/variant.h"
 #include <QtCore/qmath.h>
 
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/geo/coordinategeodetic.h

@@ -12,10 +12,10 @@
 #ifndef BLACKMISC_COORDINATEGEODETIC_H
 #define BLACKMISC_COORDINATEGEODETIC_H
 
-#include "blackmisc/geolatitude.h"
-#include "blackmisc/geolongitude.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
 #include "blackmisc/pqlength.h"
-#include "propertyindex.h"
+#include "blackmisc/propertyindex.h"
 
 namespace BlackMisc
 {

src/blackmisc/geo/earthangle.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/geoearthangle.h"
-#include "blackmisc/geolatitude.h"
-#include "blackmisc/geolongitude.h"
+#include "blackmisc/geo/earthangle.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
 #include "blackmisc/iconlist.h"
 
 namespace BlackMisc
@@ -17,9 +17,6 @@ namespace BlackMisc
     namespace Geo
     {
 
-        /*
-         * Latitude or Longitude from a WGS string
-         */
         template <class LATorLON> LATorLON CEarthAngle<LATorLON>::fromWgs84(const QString &wgsCoordinate)
         {
             // http://www.regular-expressions.info/floatingpoint.html
@@ -68,9 +65,6 @@ namespace BlackMisc
             return LATorLON(a);
         }
 
-        /*
-         * Icon
-         */
         template <class LATorLON> CIcon CEarthAngle<LATorLON>::toIcon() const
         {
             return BlackMisc::CIconList::iconByIndex(CIcons::GeoPosition);

src/blackmisc/geo/earthangle.h

@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_GEOEARTHANGLE_H
-#define BLACKMISC_GEOEARTHANGLE_H
+#ifndef BLACKMISC_GEO_EARTHANGLE_H
+#define BLACKMISC_GEO_EARTHANGLE_H
 
 #include "blackmisc/pqangle.h"
 

src/blackmisc/geo/geo.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,
@@ -7,12 +7,18 @@
  * contained in the LICENSE file.
  */
 
-#ifndef BLACKMISC_AUDIOALLCLASSES_H
-#define BLACKMISC_AUDIOALLCLASSES_H
+#ifndef BLACKMISC_GEO_GEO_H
+#define BLACKMISC_GEO_GEO_H
 
-#include "blackmisc/audiodeviceinfo.h"
-#include "blackmisc/audiodeviceinfolist.h"
-#include "blackmisc/voiceroom.h"
-#include "blackmisc/voiceroomlist.h"
+/*!
+ * \namespace BlackMisc::Geo
+ * \brief Geo classes such as latitude, longitude, etc.
+ */
+
+#include "blackmisc/geo/earthangle.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/geo/geodesicgrid.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 
 #endif // guard

src/blackmisc/geo/geodesicgrid.h

@@ -1,17 +1,21 @@
-/*  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/. */
+/* 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_GEODESICGRID_H
-#define BLACKMISC_GEODESICGRID_H
+#ifndef BLACKMISC_GEO_GEODESICGRID_H
+#define BLACKMISC_GEO_GEODESICGRID_H
 
 //! \file
 
 #include "blackmisc/math/mathutils.h"
 #include "coordinategeodetic.h"
-#include "range.h"
-#include "iterator.h"
+#include "blackmisc/range.h"
+#include "blackmisc/iterator.h"
 #include <QMultiMap>
 #include <type_traits>
 

src/blackmisc/geo/geoobjectlist.cpp

@@ -1,5 +1,5 @@
 /* Copyright (C) 2015
- * 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,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/aircraftlist.h"

src/blackmisc/geo/geoobjectlist.h

@@ -9,12 +9,12 @@
 
 //! \file
 
-#ifndef BLACKMISC_GEOOBJECTLIST_H
-#define BLACKMISC_GEOOBJECTLIST_H
+#ifndef BLACKMISC_GEO_GEOOBJECTLIST_H
+#define BLACKMISC_GEO_GEOOBJECTLIST_H
 
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 
 namespace BlackMisc
 {

src/blackmisc/geo/latitude.h

@@ -9,11 +9,11 @@
 
 //! \file
 
-#ifndef BLACKMISC_GEOLATITUDE_H
-#define BLACKMISC_GEOLATITUDE_H
+#ifndef BLACKMISC_GEO_LATITUDE_H
+#define BLACKMISC_GEO_LATITUDE_H
 
 #include <QtCore/qmath.h>
-#include "blackmisc/geoearthangle.h"
+#include "blackmisc/geo/earthangle.h"
 
 namespace BlackMisc
 {

src/blackmisc/geo/longitude.h

@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_GEOLONGITUDE_H
-#define BLACKMISC_GEOLONGITUDE_H
+#ifndef BLACKMISC_GEO_LONGITUDE_H
+#define BLACKMISC_GEO_LONGITUDE_H
 
-#include "blackmisc/geoearthangle.h"
+#include "blackmisc/geo/earthangle.h"
 
 namespace BlackMisc
 {

src/blackmisc/geoallclasses.h

@@ -1,15 +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_GEOALLCLASSES_H
-#define BLACKMISC_GEOALLCLASSES_H
-
-#include "blackmisc/geoearthangle.h"
-#include "blackmisc/geolatitude.h"
-#include "blackmisc/geolongitude.h"
-#include "blackmisc/geodesicgrid.h"
-#include "blackmisc/coordinategeodetic.h"
-
-#endif // guard

src/blackmisc/simulation/simulatedaircraftlist.cpp

@@ -44,9 +44,9 @@ namespace BlackMisc
             return this->findBy(Predicates::MemberValid(&CSimulatedAircraft::getPilot)).transform(Predicates::MemberTransform(&CSimulatedAircraft::getPilot));
         }
 
-        CCallsignList CSimulatedAircraftList::getCallsignsWithSyncronizedParts() const
+        CCallsignSet CSimulatedAircraftList::getCallsignsWithSyncronizedParts() const
         {
-            CCallsignList csl;
+            CCallsignSet csl;
             for (const CSimulatedAircraft &aircraft : (*this))
             {
                 if (!aircraft.isPartsSynchronized()) { continue; }

src/blackmisc/simulation/simulatedaircraftlist.h

@@ -15,7 +15,7 @@
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
 #include "blackmisc/aviation/aircraftlist.h"
-#include "blackmisc/geoobjectlist.h"
+#include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/nwuserlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
@@ -44,7 +44,7 @@ namespace BlackMisc
             BlackMisc::Network::CUserList getPilots() const;
 
             //! Callsigns of aircraft with synchronized parts
-            BlackMisc::Aviation::CCallsignList getCallsignsWithSyncronizedParts() const;
+            BlackMisc::Aviation::CCallsignSet getCallsignsWithSyncronizedParts() const;
 
             //! Mark all aircraft as unrendered
             void markAllAsNotRendered();