From 0ab755d51033c509b8655a83639ac587abebdf00 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 4 Apr 2015 02:40:23 +0200 Subject: [PATCH] refs #396 subfolders and renamed callsign list to callsign set * subfolder audio * subfolder geo * adjusted samples, tests .... --- samples/blackmisc/samplesperformance.cpp | 2 +- samples/blackmiscdbus/main.cpp | 2 -- .../blackmiscdbus/sample_blackmisc_dbus.pro | 6 ++-- samples/blackmiscdbus/servicetool.cpp | 2 +- samples/blackmiscdbus/servicetool.h | 4 +-- samples/blackmiscdbus/testservice.cpp | 2 +- samples/blackmiscdbus/testservice.h | 4 +-- samples/blackmiscdbus/testservice_interface.h | 26 ++++++++++------- samples/blackmiscgeo/samplesgeo.cpp | 4 +-- samples/blackmiscgeo/samplesgeo.h | 26 +++++++---------- samples/blackmiscsim/main.cpp | 2 -- samples/blackmiscsim/samplesfscommon.cpp | 6 ++-- samples/blackmiscsim/samplesfsx.cpp | 8 +++--- samples/blackmiscsim/samplesmodelmapping.cpp | 10 +++---- samples/cli_client/sample_cli_client.pro | 9 +++--- samples/voiceclient/client.cpp | 8 +++--- src/blackcore/airspace_monitor.cpp | 6 ++-- src/blackcore/airspace_monitor.h | 6 ++-- src/blackcore/audio_device.h | 4 +-- src/blackcore/audio_device_vatlib.h | 4 +-- src/blackcore/context_application.h | 2 +- src/blackcore/context_audio.h | 8 +++--- src/blackcore/context_audio_empty.h | 4 +-- src/blackcore/context_audio_impl.cpp | 22 +++++++-------- src/blackcore/context_audio_impl.h | 4 +-- src/blackcore/context_audio_proxy.cpp | 4 +-- src/blackcore/context_audio_proxy.h | 6 ++-- src/blackcore/context_network.h | 10 +++---- src/blackcore/context_network_empty.h | 10 +++---- src/blackcore/context_network_impl.cpp | 12 ++++---- src/blackcore/context_network_impl.h | 8 +++--- src/blackcore/context_network_proxy.cpp | 12 ++++---- src/blackcore/context_network_proxy.h | 10 +++---- src/blackcore/context_ownaircraft.h | 2 +- src/blackcore/interpolator.h | 2 +- src/blackcore/network.h | 2 +- src/blackcore/simulator.cpp | 6 ++-- src/blackcore/simulator.h | 2 +- src/blackcore/vatsimdatafilereader.cpp | 12 ++++---- src/blackcore/vatsimdatafilereader.h | 8 +++--- src/blackcore/voice.h | 6 ++-- src/blackcore/voice_channel.h | 8 +++--- src/blackcore/voice_channel_vatlib.cpp | 4 +-- src/blackcore/voice_channel_vatlib.h | 10 +++---- src/blackgui/components/audiosetupcomponent.h | 2 +- .../components/cockpitcomcomponent.cpp | 2 +- src/blackgui/components/cockpitcomcomponent.h | 2 +- src/blackgui/components/voiceroomscomponent.h | 2 +- src/blackgui/models/atcstationlistmodel.cpp | 2 +- src/blackgui/models/columnformatters.cpp | 2 +- src/blackmisc/audio/audio.h | 25 +++++++++++++++++ src/blackmisc/{ => audio}/audiodeviceinfo.cpp | 18 ++---------- src/blackmisc/{ => audio}/audiodeviceinfo.h | 8 +++--- .../{ => audio}/audiodeviceinfolist.cpp | 21 ++------------ .../{ => audio}/audiodeviceinfolist.h | 14 ++++------ src/blackmisc/{ => audio}/voiceroom.cpp | 22 +-------------- src/blackmisc/{ => audio}/voiceroom.h | 12 ++++---- src/blackmisc/{ => audio}/voiceroomlist.cpp | 15 ++-------- src/blackmisc/{ => audio}/voiceroomlist.h | 8 +++--- src/blackmisc/aviation/aircraftlist.h | 4 +-- src/blackmisc/aviation/aircraftsituation.h | 2 +- src/blackmisc/aviation/airport.h | 2 +- src/blackmisc/aviation/airportlist.h | 4 +-- src/blackmisc/aviation/atcstation.cpp | 2 +- src/blackmisc/aviation/atcstation.h | 4 +-- src/blackmisc/aviation/atcstationlist.h | 2 +- src/blackmisc/aviation/aviation.h | 2 +- .../blackmiscfreefunctions_avmeta.cpp | 2 +- src/blackmisc/aviation/callsignobjectlist.cpp | 6 ++-- src/blackmisc/aviation/callsignobjectlist.h | 6 ++-- .../{callsignlist.cpp => callsignset.cpp} | 14 +++++----- .../{callsignlist.h => callsignset.h} | 14 +++++----- src/blackmisc/blackmisc.pro | 4 +++ src/blackmisc/blackmiscallvalueclasses.h | 28 ------------------- src/blackmisc/blackmiscfreefunctions.cpp | 4 +-- .../blackmiscfreefunctions_simmeta.cpp | 6 ++-- .../{ => geo}/coordinategeodetic.cpp | 4 +-- src/blackmisc/{ => geo}/coordinategeodetic.h | 6 ++-- .../{geoearthangle.cpp => geo/earthangle.cpp} | 12 ++------ .../{geoearthangle.h => geo/earthangle.h} | 4 +-- .../{audioallclasses.h => geo/geo.h} | 20 ++++++++----- src/blackmisc/{ => geo}/geodesicgrid.h | 20 +++++++------ src/blackmisc/{ => geo}/geoobjectlist.cpp | 4 +-- src/blackmisc/{ => geo}/geoobjectlist.h | 6 ++-- .../{geolatitude.h => geo/latitude.h} | 6 ++-- .../{geolongitude.h => geo/longitude.h} | 6 ++-- src/blackmisc/geoallclasses.h | 15 ---------- .../simulation/simulatedaircraftlist.cpp | 4 +-- .../simulation/simulatedaircraftlist.h | 4 +-- src/blacksound/soundgenerator.h | 2 +- src/plugins/simulator/fs9/fs9_client.cpp | 2 +- .../simulator/xplane/plugin_xplane.pro | 1 - .../simulator/xplane/simulator_xplane.cpp | 2 +- src/swiftgui_standard/introwindow.cpp | 9 ++++++ src/xbus/service.h | 2 +- tests/blackcore/test_blackcore.pro | 8 ++---- tests/blackcore/testinterpolator.cpp | 6 ++-- tests/blackmisc/testaviation.cpp | 4 +-- tests/blackmisc/testcontainers.cpp | 4 +-- tests/blackmisc/testgeo.cpp | 4 +-- 100 files changed, 328 insertions(+), 403 deletions(-) create mode 100644 src/blackmisc/audio/audio.h rename src/blackmisc/{ => audio}/audiodeviceinfo.cpp (86%) rename src/blackmisc/{ => audio}/audiodeviceinfo.h (95%) rename src/blackmisc/{ => audio}/audiodeviceinfolist.cpp (82%) rename src/blackmisc/{ => audio}/audiodeviceinfolist.h (87%) rename src/blackmisc/{ => audio}/voiceroom.cpp (92%) rename src/blackmisc/{ => audio}/voiceroom.h (94%) rename src/blackmisc/{ => audio}/voiceroomlist.cpp (83%) rename src/blackmisc/{ => audio}/voiceroomlist.h (92%) rename src/blackmisc/aviation/{callsignlist.cpp => callsignset.cpp} (71%) rename src/blackmisc/aviation/{callsignlist.h => callsignset.h} (79%) delete mode 100644 src/blackmisc/blackmiscallvalueclasses.h rename src/blackmisc/{ => geo}/coordinategeodetic.cpp (99%) rename src/blackmisc/{ => geo}/coordinategeodetic.h (98%) rename src/blackmisc/{geoearthangle.cpp => geo/earthangle.cpp} (92%) rename src/blackmisc/{geoearthangle.h => geo/earthangle.h} (98%) rename src/blackmisc/{audioallclasses.h => geo/geo.h} (51%) rename src/blackmisc/{ => geo}/geodesicgrid.h (93%) rename src/blackmisc/{ => geo}/geoobjectlist.cpp (98%) rename src/blackmisc/{ => geo}/geoobjectlist.h (95%) rename src/blackmisc/{geolatitude.h => geo/latitude.h} (93%) rename src/blackmisc/{geolongitude.h => geo/longitude.h} (93%) delete mode 100644 src/blackmisc/geoallclasses.h diff --git a/samples/blackmisc/samplesperformance.cpp b/samples/blackmisc/samplesperformance.cpp index fe20db71f..1e3065a6d 100644 --- a/samples/blackmisc/samplesperformance.cpp +++ b/samples/blackmisc/samplesperformance.cpp @@ -9,7 +9,7 @@ #include "samplesperformance.h" #include "blackmisc/aviation/aircraftsituationlist.h" -#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/aviation/altitude.h" #include "blackmisc/testing.h" diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index b5109b4b9..e9083ea6b 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -8,7 +8,6 @@ */ #include "blackmisc/blackmiscfreefunctions.h" -#include "blacksim/blacksimfreefunctions.h" #include "servicetool.h" #include "blackcore/dbus_server.h" #include @@ -27,7 +26,6 @@ int main(int argc, char *argv[]) // is just for testing, I did not split it up BlackMisc::registerMetadata(); - BlackSim::registerMetadata(); QCoreApplication a(argc, argv); // trying to get the arguments into a list diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/sample_blackmisc_dbus.pro index 595b68241..08f704d1e 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/sample_blackmisc_dbus.pro @@ -8,16 +8,14 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -CONFIG += blackmisc blackcore blacksim +CONFIG += blackmisc blackcore -DEPENDPATH += . ../../src/blackmisc ../../src/blackcore ../../src/blacksim +DEPENDPATH += . ../../src/blackmisc ../../src/blackcore INCLUDEPATH += . ../../src win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blacksim.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblacksim.a \ ../../lib/libblackcore.a DESTDIR = ../../bin diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index 93d0e7f7f..b1c044fcc 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -25,7 +25,7 @@ using namespace BlackMisc::Aviation; using namespace BlackMisc::Math; using namespace BlackMisc::Geo; using namespace BlackMisc::Network; -using namespace BlackSim::FsCommon; +using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMiscTest; namespace BlackMiscTest diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index c2a50d5c8..e2d276115 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -16,7 +16,7 @@ #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/nwclientlist.h" -#include "blacksim/fscommon/aircraftcfgentrieslist.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include #include #include @@ -101,7 +101,7 @@ namespace BlackMiscTest * \param number * \return */ - static BlackSim::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntries(int number); + static BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntries(int number); /*! * \brief Get airports diff --git a/samples/blackmiscdbus/testservice.cpp b/samples/blackmiscdbus/testservice.cpp index 12c26d055..427bf04b2 100644 --- a/samples/blackmiscdbus/testservice.cpp +++ b/samples/blackmiscdbus/testservice.cpp @@ -15,7 +15,7 @@ using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; -using namespace BlackSim::FsCommon; +using namespace BlackMisc::Simulation::FsCommon; namespace BlackMiscTest { diff --git a/samples/blackmiscdbus/testservice.h b/samples/blackmiscdbus/testservice.h index a638361ad..fdc2cfb39 100644 --- a/samples/blackmiscdbus/testservice.h +++ b/samples/blackmiscdbus/testservice.h @@ -21,7 +21,7 @@ #include "blackmisc/pqallquantities.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/math/math.h" -#include "blacksim/fscommon/aircraftcfgentrieslist.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include "servicetool.h" #include #include @@ -149,7 +149,7 @@ namespace BlackMiscTest BlackMisc::Aviation::CAtcStationList getAtcStationList(int number) const; //! return n aircraft cfg entries - BlackSim::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntriesList(int number) const; + BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntriesList(int number) const; //! Get object paths QList getObjectPaths(int number) const; diff --git a/samples/blackmiscdbus/testservice_interface.h b/samples/blackmiscdbus/testservice_interface.h index f30e4d5cc..5093d1498 100644 --- a/samples/blackmiscdbus/testservice_interface.h +++ b/samples/blackmiscdbus/testservice_interface.h @@ -13,8 +13,15 @@ #define BLACKMISCTEST_TESTSERVICE_INTERFACE_H #include "blackmisc/blackmiscfreefunctions.h" -#include "blackmisc/blackmiscallvalueclasses.h" -#include "blacksim/fscommon/aircraftcfgentrieslist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/track.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/aviation/aircraftlist.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/nwclientlist.h" +#include "blackmisc/variantlist.h" #include #include #include @@ -27,26 +34,25 @@ namespace BlackMiscTest { - /*! - * Proxy class for interface blackmisctest.testservice - */ + //! Proxy class for interface blackmisctest.testservice class TestServiceInterface: public QDBusAbstractInterface { Q_OBJECT public: + //! Interface name static inline const char *staticInterfaceName() { return "blackmisctest.testservice"; } public: - //! \brief Constructor + //! Constructor TestServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - //! \brief Destructor + //! Destructor ~TestServiceInterface(); public Q_SLOTS: - //! \brief DBus calls + //! DBus calls //! @{ inline QDBusPendingReply getAtcStation() { @@ -54,7 +60,7 @@ namespace BlackMiscTest return asyncCallWithArgumentList(QLatin1String("getAtcStation"), argumentList); } - inline QDBusPendingReply getAircraftCfgEntriesList(int number) + inline QDBusPendingReply getAircraftCfgEntriesList(int number) { QList argumentList; argumentList << QVariant::fromValue(number); @@ -287,7 +293,7 @@ namespace BlackMiscTest Q_SIGNALS: - //! \brief send message + //! send message void sendStringMessage(const QString &message); }; } // namespace diff --git a/samples/blackmiscgeo/samplesgeo.cpp b/samples/blackmiscgeo/samplesgeo.cpp index aab57cbc4..fecba3773 100644 --- a/samples/blackmiscgeo/samplesgeo.cpp +++ b/samples/blackmiscgeo/samplesgeo.cpp @@ -4,8 +4,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "samplesgeo.h" -#include "blackmisc/geolatitude.h" -#include "blackmisc/geolongitude.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; diff --git a/samples/blackmiscgeo/samplesgeo.h b/samples/blackmiscgeo/samplesgeo.h index 3b4006d07..418030b63 100644 --- a/samples/blackmiscgeo/samplesgeo.h +++ b/samples/blackmiscgeo/samplesgeo.h @@ -9,23 +9,17 @@ namespace BlackMiscTest { -/*! - * \brief Samples for vector / matrix - */ -class CSamplesGeo -{ -public: - /*! - * \brief Run the samples - */ - static int samples(); + //! Samples for geo + class CSamplesGeo + { + public: + //! Run the samples + static int samples(); -private: - /*! - * \brief Avoid init - */ - CSamplesGeo(); -}; + private: + //! Constructor + CSamplesGeo(); + }; } // namespace diff --git a/samples/blackmiscsim/main.cpp b/samples/blackmiscsim/main.cpp index d20e0843d..6ec5ffa52 100644 --- a/samples/blackmiscsim/main.cpp +++ b/samples/blackmiscsim/main.cpp @@ -7,7 +7,6 @@ * contained in the LICENSE file. */ -#include "blacksim/blacksimfreefunctions.h" #include "blackmisc/blackmiscfreefunctions.h" #include "samplesfscommon.h" #include "samplesfsx.h" @@ -29,7 +28,6 @@ int main(int argc, char *argv[]) QTextStream streamIn(stdin); QTextStream streamOut(stdout); BlackMisc::registerMetadata(); - BlackSim::registerMetadata(); streamOut << "Run samples:" << endl; streamOut << "1 .. FS common / Simulation" << endl; diff --git a/samples/blackmiscsim/samplesfscommon.cpp b/samples/blackmiscsim/samplesfscommon.cpp index 1bbb3b981..546943269 100644 --- a/samples/blackmiscsim/samplesfscommon.cpp +++ b/samples/blackmiscsim/samplesfscommon.cpp @@ -9,8 +9,8 @@ #include "samplesfscommon.h" #include "blackmisc/sampleutils.h" -#include "blacksim/fscommon/aircraftcfgentrieslist.h" -#include "blacksim/fscommon/aircraftmapper.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" +#include "blackmisc/simulation/fscommon/aircraftmapper.h" #include #include @@ -19,7 +19,7 @@ #include using namespace BlackMisc; -using namespace BlackSim::FsCommon; +using namespace BlackMisc::Simulation::FsCommon; namespace BlackSimTest { diff --git a/samples/blackmiscsim/samplesfsx.cpp b/samples/blackmiscsim/samplesfsx.cpp index 3fb334c1a..0e047302a 100644 --- a/samples/blackmiscsim/samplesfsx.cpp +++ b/samples/blackmiscsim/samplesfsx.cpp @@ -8,11 +8,11 @@ */ #include "samplesfsx.h" -#include "blacksim/blacksimfreefunctions.h" -#include "blacksim/fsx/simconnectutilities.h" +#include "blackmisc/simulation/fsx/simconnectutilities.h" +#include "blackmisc/blackmiscfreefunctions.h" #include -using namespace BlackSim::Fsx; +using namespace BlackMisc::Simulation::Fsx; namespace BlackSimTest { @@ -22,7 +22,7 @@ namespace BlackSimTest */ int CSamplesFsx::samplesMisc(QTextStream &streamOut) { - BlackSim::registerMetadata(); + BlackMisc::registerMetadata(); streamOut << CSimConnectUtilities::simConnectExceptionToString(CSimConnectUtilities::SIMCONNECT_EXCEPTION_ALREADY_SUBSCRIBED) << endl; streamOut << CSimConnectUtilities::simConnectExceptionToString(CSimConnectUtilities::SIMCONNECT_EXCEPTION_ILLEGAL_OPERATION) << endl; streamOut << CSimConnectUtilities::simConnectSurfaceTypeToString(CSimConnectUtilities::Bituminus) << endl; diff --git a/samples/blackmiscsim/samplesmodelmapping.cpp b/samples/blackmiscsim/samplesmodelmapping.cpp index a1088d91e..1ba2dbb10 100644 --- a/samples/blackmiscsim/samplesmodelmapping.cpp +++ b/samples/blackmiscsim/samplesmodelmapping.cpp @@ -10,17 +10,16 @@ #include "samplesmodelmapping.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/sampleutils.h" -#include "blacksim/blacksimfreefunctions.h" -#include "blacksim/fscommon/vpilotmodelmappings.h" -#include "blacksim/fscommon/aircraftmapper.h" +#include "blackmisc/simulation/fscommon/vpilotmodelmappings.h" +#include "blackmisc/simulation/fscommon/aircraftmapper.h" #include #include #include using namespace BlackMisc; -using namespace BlackSim; -using namespace BlackSim::FsCommon; +using namespace BlackMisc::Simulation; +using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Aviation; namespace BlackSimTest @@ -32,7 +31,6 @@ namespace BlackSimTest int CSamplesModelMapping::samples(QTextStream &streamOut, QTextStream &streamIn) { BlackMisc::registerMetadata(); - BlackSim::registerMetadata(); std::unique_ptr cvm(new CVPilotModelMappings(true)); bool s = cvm->read(); diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index 17010e6cc..1b47941ac 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -8,7 +8,7 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -CONFIG += blackmisc blackcore blacksim +CONFIG += blackmisc blackcore DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -17,11 +17,10 @@ SOURCES += *.cpp HEADERS += *.h win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ - ../../lib/blacksim.lib + ../../lib/blackcore.lib + else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ - ../../lib/libblacksim.a + ../../lib/libblackcore.a DESTDIR = ../../bin diff --git a/samples/voiceclient/client.cpp b/samples/voiceclient/client.cpp index 6432a3be0..592c7488f 100644 --- a/samples/voiceclient/client.cpp +++ b/samples/voiceclient/client.cpp @@ -5,8 +5,8 @@ #include "client.h" #include "blackcore/voice_vatlib.h" -#include "blackmisc/audiodeviceinfolist.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/aviation/callsignset.h" #include using namespace BlackMisc::Audio; @@ -112,7 +112,7 @@ void Client::setCallsignCmd(QTextStream &args) { QString callsign; args >> callsign; - m_channelCom1->setMyAircraftCallsign(BlackMisc::Aviation::CCallsign(callsign)); + m_channelCom1->setOwnAircraftCallsign(BlackMisc::Aviation::CCallsign(callsign)); } void Client::initiateConnectionCmd(QTextStream &args) @@ -159,7 +159,7 @@ void Client::outputDevicesCmd(QTextStream & /** args **/) void Client::listCallsignsCmd(QTextStream &args) { Q_UNUSED(args) - CCallsignList callsigns = m_channelCom1->getVoiceRoomCallsigns(); + CCallsignSet callsigns = m_channelCom1->getVoiceRoomCallsigns(); foreach(CCallsign callsign, callsigns) { m_stdout << " " << callsign << endl; diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 30ffcf866..d9d934957 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -204,11 +204,11 @@ namespace BlackCore return users; } - CUserList CAirspaceMonitor::getUsersForCallsigns(const CCallsignList &callsigns) const + CUserList CAirspaceMonitor::getUsersForCallsigns(const CCallsignSet &callsigns) const { CUserList users; if (callsigns.isEmpty()) { return users; } - CCallsignList searchList(callsigns); + CCallsignSet searchList(callsigns); // myself, which is not in the lists below if (!ownAircraft().getCallsign().isEmpty() && searchList.contains(ownAircraft().getCallsign())) @@ -261,7 +261,7 @@ namespace BlackCore return users; } - CClientList CAirspaceMonitor::getOtherClientsForCallsigns(const CCallsignList &callsigns) const + CClientList CAirspaceMonitor::getOtherClientsForCallsigns(const CCallsignSet &callsigns) const { CClientList clients; if (callsigns.isEmpty()) return clients; diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index deb313025..89958a889 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -20,7 +20,7 @@ #include "blackmisc/nwclientlist.h" #include "blackmisc/aviation/flightplan.h" #include "blackmisc/nwuserlist.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include "network.h" #include "vatsimbookingreader.h" #include "vatsimdatafilereader.h" @@ -75,7 +75,7 @@ namespace BlackCore BlackMisc::Network::CUserList getUsers() const; //! Returns a list of the users corresponding to the given callsigns - BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const; + BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const; //! Returns the flightplan for the given callsign //! \remarks pseudo synchronous, call the async functions and waits for result @@ -85,7 +85,7 @@ namespace BlackCore BlackMisc::Network::CClientList getOtherClients() const; //! Returns a list of other clients corresponding to the given callsigns - BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const; + BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const; //! Returns a METAR for the given airport, if available BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode); diff --git a/src/blackcore/audio_device.h b/src/blackcore/audio_device.h index ad7b5cb70..88dabadb7 100644 --- a/src/blackcore/audio_device.h +++ b/src/blackcore/audio_device.h @@ -12,8 +12,8 @@ #ifndef BLACKCORE_AUDIODEVICE_H #define BLACKCORE_AUDIODEVICE_H -#include "blackmisc/audiodeviceinfo.h" -#include "blackmisc/audiodeviceinfolist.h" +#include "blackmisc/audio/audiodeviceinfo.h" +#include "blackmisc/audio/audiodeviceinfolist.h" #include //! \file diff --git a/src/blackcore/audio_device_vatlib.h b/src/blackcore/audio_device_vatlib.h index 23a51fedd..d386c79f7 100644 --- a/src/blackcore/audio_device_vatlib.h +++ b/src/blackcore/audio_device_vatlib.h @@ -13,8 +13,8 @@ #define BLACKCORE_AUDIODEVICEVATLIB_H #include "audio_device.h" -#include "blackmisc/audiodeviceinfo.h" -#include "blackmisc/audiodeviceinfolist.h" +#include "blackmisc/audio/audiodeviceinfo.h" +#include "blackmisc/audio/audiodeviceinfolist.h" #include "vatlib/vatlib2.h" #include diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index 434ab8b1b..f6372d08b 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -14,7 +14,7 @@ #include "blackcore/context.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/eveventhotkeyfunction.h" #include "blackmisc/evoriginator.h" #include diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 0df22a599..5bf49ccaf 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -14,11 +14,11 @@ #include "blackcore/context.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/audiodeviceinfolist.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/aviation/aircraft.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/selcal.h" #include @@ -120,7 +120,7 @@ namespace BlackCore virtual void leaveAllVoiceRooms() = 0; //! Room user callsigns - virtual BlackMisc::Aviation::CCallsignList getRoomCallsigns(int comUnit) const = 0; + virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnit) const = 0; //! Room users virtual BlackMisc::Network::CUserList getRoomUsers(int comUnit) const = 0; diff --git a/src/blackcore/context_audio_empty.h b/src/blackcore/context_audio_empty.h index ad6f0cdcf..8e6c26d39 100644 --- a/src/blackcore/context_audio_empty.h +++ b/src/blackcore/context_audio_empty.h @@ -67,11 +67,11 @@ namespace BlackCore } //! \copydoc IContextAudio::getRoomCallsigns() - virtual BlackMisc::Aviation::CCallsignList getRoomCallsigns(int comUnitValue) const override + virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override { Q_UNUSED(comUnitValue); logEmptyContextWarning(Q_FUNC_INFO); - return BlackMisc::Aviation::CCallsignList(); + return BlackMisc::Aviation::CCallsignSet(); } //! \copydoc IContextAudio::getRoomUsers() diff --git a/src/blackcore/context_audio_impl.cpp b/src/blackcore/context_audio_impl.cpp index 8ea8881de..313396416 100644 --- a/src/blackcore/context_audio_impl.cpp +++ b/src/blackcore/context_audio_impl.cpp @@ -16,7 +16,7 @@ #include "blacksound/soundgenerator.h" #include "blackmisc/notificationsounds.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/hotkeyfunction.h" #include "blackmisc/logmessage.h" #include "blackmisc/simplecommandparser.h" @@ -47,12 +47,12 @@ namespace BlackCore m_handlePtt = m_inputManager->registerHotkeyFunc(CHotkeyFunction::Ptt(), this, &CContextAudio::ps_setVoiceTransmission); m_channel1 = m_voice->createVoiceChannel(); - m_channel1->setMyAircraftCallsign(ownCallsign); + m_channel1->setOwnAircraftCallsign(ownCallsign); connect(m_channel1.data(), &IVoiceChannel::connectionStatusChanged, this, &CContextAudio::ps_connectionStatusChanged); connect(m_channel1.data(), &IVoiceChannel::userJoinedRoom, this, &CContextAudio::ps_userJoinedRoom); connect(m_channel1.data(), &IVoiceChannel::userLeftRoom, this, &CContextAudio::ps_userLeftRoom); m_channel2 = m_voice->createVoiceChannel(); - m_channel2->setMyAircraftCallsign(ownCallsign); + m_channel2->setOwnAircraftCallsign(ownCallsign); connect(m_channel2.data(), &IVoiceChannel::connectionStatusChanged, this, &CContextAudio::ps_connectionStatusChanged); connect(m_channel1.data(), &IVoiceChannel::userJoinedRoom, this, &CContextAudio::ps_userJoinedRoom); connect(m_channel1.data(), &IVoiceChannel::userLeftRoom, this, &CContextAudio::ps_userLeftRoom); @@ -321,7 +321,7 @@ namespace BlackCore if (newRoomCom1.isValid()) { auto newVoiceChannel = getVoiceChannelBy(newRoomCom1); - newVoiceChannel->setMyAircraftCallsign(ownCallsign); + newVoiceChannel->setOwnAircraftCallsign(ownCallsign); bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel); m_voiceChannelMapping.insert(Com1, newVoiceChannel); @@ -361,7 +361,7 @@ namespace BlackCore if (newRoomCom2.isValid()) { auto newVoiceChannel = getVoiceChannelBy(newRoomCom2); - newVoiceChannel->setMyAircraftCallsign(ownCallsign); + newVoiceChannel->setOwnAircraftCallsign(ownCallsign); bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel); m_voiceChannelMapping.insert(Com2, newVoiceChannel); @@ -385,11 +385,11 @@ namespace BlackCore void CContextAudio::setOwnCallsignForRooms(const CCallsign &callsign) { - if (m_channel1) { m_channel1->setMyAircraftCallsign(callsign); } - if (m_channel2) { m_channel2->setMyAircraftCallsign(callsign); } + if (m_channel1) { m_channel1->setOwnAircraftCallsign(callsign); } + if (m_channel2) { m_channel2->setOwnAircraftCallsign(callsign); } } - CCallsignList CContextAudio::getRoomCallsigns(int comUnitValue) const + CCallsignSet CContextAudio::getRoomCallsigns(int comUnitValue) const { Q_ASSERT(this->m_voice); CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; @@ -398,7 +398,7 @@ namespace BlackCore if (voiceChannel) return voiceChannel->getVoiceRoomCallsigns(); else - return CCallsignList(); + return CCallsignSet(); } Network::CUserList CContextAudio::getRoomUsers(int comUnitValue) const @@ -541,8 +541,8 @@ namespace BlackCore if (this->getIContextOwnAircraft()) { // good chance to update aircraft - m_channel1->setMyAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign()); - m_channel2->setMyAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign()); + m_channel1->setOwnAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign()); + m_channel2->setOwnAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign()); } emit this->changedVoiceRooms(getComVoiceRooms(), false); break; diff --git a/src/blackcore/context_audio_impl.h b/src/blackcore/context_audio_impl.h index 4f5081c97..610f6d9f3 100644 --- a/src/blackcore/context_audio_impl.h +++ b/src/blackcore/context_audio_impl.h @@ -22,7 +22,7 @@ #include "audio_mixer.h" #include "input_manager.h" #include "blackinput/keyboard.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include #include @@ -64,7 +64,7 @@ namespace BlackCore virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) override; //! \copydoc IContextAudio::getRoomCallsigns() - virtual BlackMisc::Aviation::CCallsignList getRoomCallsigns(int comUnitValue) const override; + virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override; //! \copydoc IContextAudio::getRoomUsers() virtual BlackMisc::Network::CUserList getRoomUsers(int comUnitValue) const override; diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/context_audio_proxy.cpp index 3081a545d..5aec8389d 100644 --- a/src/blackcore/context_audio_proxy.cpp +++ b/src/blackcore/context_audio_proxy.cpp @@ -61,9 +61,9 @@ namespace BlackCore /* * COM1 callsigns */ - BlackMisc::Aviation::CCallsignList CContextAudioProxy::getRoomCallsigns(int comUnitValue) const + BlackMisc::Aviation::CCallsignSet CContextAudioProxy::getRoomCallsigns(int comUnitValue) const { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getRoomCallsigns"), comUnitValue); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getRoomCallsigns"), comUnitValue); } /* diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index e1236014d..03b8fd5fc 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -15,8 +15,8 @@ #include "context_audio.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/audiodeviceinfolist.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/aviation/aircraft.h" @@ -67,7 +67,7 @@ namespace BlackCore virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) override; //! \copydoc IContextAudio::getRoomCallsigns() - virtual BlackMisc::Aviation::CCallsignList getRoomCallsigns(int comUnitValue) const override; + virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override; //! \copydoc IContextAudio::getRoomUsers() virtual BlackMisc::Network::CUserList getRoomUsers(int comUnitValue) const override; diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 88fe0acd7..183f34dee 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -20,7 +20,7 @@ #include "blackmisc/nwtextmessagelist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/nwclientlist.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackcore/network.h" //! \addtogroup dbus @@ -162,7 +162,7 @@ namespace BlackCore virtual BlackMisc::Network::CUserList getUsers() const = 0; //! Users for given callsigns, e.g. for voice room resolution - virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const = 0; + virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const = 0; //! User for given callsign, e.g. for text messages virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0; @@ -171,7 +171,7 @@ namespace BlackCore virtual BlackMisc::Network::CClientList getOtherClients() const = 0; //! Clients for given callsign, e.g. to test/fetch direct aircraft model - virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const = 0; + virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const = 0; //! Known voice servers, available when data file was first read virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const = 0; @@ -186,10 +186,10 @@ namespace BlackCore virtual void enableFastPositionSending(bool enable) = 0; //! Callsigns enabled for fast position updates - virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignList &callsigns) = 0; + virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) = 0; //! Callsigns enabled for fast position updates - virtual BlackMisc::Aviation::CCallsignList getFastPositionEnabledCallsigns() = 0; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() = 0; /*! * Connect to Network diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h index bec1e0feb..82c0592d5 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -149,7 +149,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::getUsersForCallsigns - virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override + virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override { Q_UNUSED(callsigns); logEmptyContextWarning(Q_FUNC_INFO); @@ -172,7 +172,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::getOtherClientForCallsigns - virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override + virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override { Q_UNUSED(callsigns); logEmptyContextWarning(Q_FUNC_INFO); @@ -274,17 +274,17 @@ namespace BlackCore } //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignList &callsigns) override + virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override { Q_UNUSED(callsigns); logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns - virtual BlackMisc::Aviation::CCallsignList getFastPositionEnabledCallsigns() override + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override { logEmptyContextWarning(Q_FUNC_INFO); - return BlackMisc::Aviation::CCallsignList(); + return BlackMisc::Aviation::CCallsignSet(); } }; diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 00801b39f..cf34d237a 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -338,7 +338,7 @@ namespace BlackCore return this->m_airspace->getUsers(); } - CUserList CContextNetwork::getUsersForCallsigns(const CCallsignList &callsigns) const + CUserList CContextNetwork::getUsersForCallsigns(const CCallsignSet &callsigns) const { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } CUserList users; @@ -349,7 +349,7 @@ namespace BlackCore CUser CContextNetwork::getUserForCallsign(const CCallsign &callsign) const { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } - CCallsignList callsigns; + CCallsignSet callsigns; callsigns.push_back(callsign); CUserList users = this->getUsersForCallsigns(callsigns); if (users.size() < 1) return CUser(); @@ -362,7 +362,7 @@ namespace BlackCore return this->m_airspace->getOtherClients(); } - CClientList CContextNetwork::getOtherClientsForCallsigns(const CCallsignList &callsigns) const + CClientList CContextNetwork::getOtherClientsForCallsigns(const CCallsignSet &callsigns) const { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } return this->m_airspace->getOtherClientsForCallsigns(callsigns); @@ -565,18 +565,18 @@ namespace BlackCore m_network->enableFastPositionSending(enable); } - void CContextNetwork::setFastPositionEnabledCallsigns(CCallsignList &callsigns) + void CContextNetwork::setFastPositionEnabledCallsigns(CCallsignSet &callsigns) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsigns; } Q_ASSERT(this->m_network); } - CCallsignList CContextNetwork::getFastPositionEnabledCallsigns() + CCallsignSet CContextNetwork::getFastPositionEnabledCallsigns() { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } Q_ASSERT(this->m_network); //! \todo Fast position updates in vatlib - return CCallsignList(); + return CCallsignSet(); } void CContextNetwork::testCreateDummyOnlineAtcStations(int number) diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 8a98513e4..9d871969c 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -152,7 +152,7 @@ namespace BlackCore virtual BlackMisc::Network::CUserList getUsers() const override; //! \copydoc IContextNetwork::getUsersForCallsigns - virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override; + virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override; //! \copydoc IContextNetwork::getUsersForCallsign virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; @@ -161,7 +161,7 @@ namespace BlackCore virtual BlackMisc::Network::CClientList getOtherClients() const override; //! \copydoc IContextNetwork::getOtherClientForCallsigns - virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override; + virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override; //! \copydoc IContextNetwork::getVatsimFsdServers virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; @@ -191,10 +191,10 @@ namespace BlackCore virtual void enableFastPositionSending(bool enable) override; //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignList &callsigns) override; + virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override; //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns - virtual BlackMisc::Aviation::CCallsignList getFastPositionEnabledCallsigns() override; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override; //! \copydoc IContextNetwork::testCreateDummyOnlineAtcStations virtual void testCreateDummyOnlineAtcStations(int number) override; diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index 6d79862cb..68cfa8915 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -8,7 +8,7 @@ */ #include "blackcore/context_network_proxy.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include #include #include @@ -128,7 +128,7 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getUsers")); } - BlackMisc::Network::CUserList CContextNetworkProxy::getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const + BlackMisc::Network::CUserList CContextNetworkProxy::getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getUsersForCallsigns"), callsigns); } @@ -153,7 +153,7 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getVatsimVoiceServers")); } - BlackMisc::Network::CClientList CContextNetworkProxy::getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const + BlackMisc::Network::CClientList CContextNetworkProxy::getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getOtherClientsForCallsigns"), callsigns); } @@ -203,14 +203,14 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("enableFastPositionSending"), enable); } - void CContextNetworkProxy::setFastPositionEnabledCallsigns(CCallsignList &callsigns) + void CContextNetworkProxy::setFastPositionEnabledCallsigns(CCallsignSet &callsigns) { this->m_dBusInterface->callDBus(QLatin1Literal("setFastPositionEnabledCallsigns"), callsigns); } - CCallsignList CContextNetworkProxy::getFastPositionEnabledCallsigns() + CCallsignSet CContextNetworkProxy::getFastPositionEnabledCallsigns() { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getFastPositionEnabledCallsigns")); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getFastPositionEnabledCallsigns")); } void CContextNetworkProxy::testCreateDummyOnlineAtcStations(int number) diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 06c6ae295..8823b5964 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -21,7 +21,7 @@ #include "blackmisc/nwtextmessagelist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" namespace BlackCore { @@ -105,7 +105,7 @@ namespace BlackCore virtual BlackMisc::Network::CUserList getUsers() const override; //! \copydoc IContextNetwork::getUsersForCallsigns - virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override; + virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override; //! \copydoc IContextNetwork::getUserForCallsign virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; @@ -120,7 +120,7 @@ namespace BlackCore virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; //! \copydoc IContextNetwork::getOtherClientForCallsigns - virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const override; + virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override; //! \copydoc IContextNetwork::requestDataUpdates virtual void requestDataUpdates()override; @@ -144,10 +144,10 @@ namespace BlackCore virtual void enableFastPositionSending(bool enable) override; //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignList &callsigns) override; + virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override; //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns - virtual BlackMisc::Aviation::CCallsignList getFastPositionEnabledCallsigns() override; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override; //! \copydoc IContextNetwork::testCreateDummyOnlineAtcStations virtual void testCreateDummyOnlineAtcStations(int number) override; diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index e03e08aa8..90ef24ab7 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -15,7 +15,7 @@ #include "blackcore/context.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/aircrafticao.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/aviation/selcal.h" //! \addtogroup dbus diff --git a/src/blackcore/interpolator.h b/src/blackcore/interpolator.h index 66bf9b357..8f9a5a38a 100644 --- a/src/blackcore/interpolator.h +++ b/src/blackcore/interpolator.h @@ -133,7 +133,7 @@ namespace BlackCore bool m_withDebugMsg = false; //!< allows to disable debug messages bool m_forceSortWhenAddingValues = false; //!< force sorting (latest first) when adding values - BlackMisc::Aviation::CCallsignList m_aircraftSupportingParts; //!< aircraft supporting parts + BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts // hashs, because not sorted by key but keeping order CSituationsPerCallsign m_situationsByCallsign; //!< situations diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 5440f57cd..e5430f209 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -15,7 +15,7 @@ #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/pqfrequency.h" -#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/pqlength.h" #include "blackmisc/pqtime.h" #include "blackmisc/nwserverlist.h" diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index acf3dda16..e8d03f49a 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -87,9 +87,9 @@ namespace BlackCore //! \todo Simulator, why is there no difference on CSequence? CSimulatedAircraftList newAircraftInRange(remoteAircraft().getClosestObjects(getMaxRenderedAircraft())); - CCallsignList newAircraftCallsigns(newAircraftInRange.getCallsigns()); - CCallsignList toBeRemovedCallsigns(m_callsignsToBeRendered.difference(newAircraftCallsigns)); - CCallsignList toBeAddedCallsigns(newAircraftCallsigns.difference(m_callsignsToBeRendered)); + CCallsignSet newAircraftCallsigns(newAircraftInRange.getCallsigns()); + CCallsignSet toBeRemovedCallsigns(m_callsignsToBeRendered.difference(newAircraftCallsigns)); + CCallsignSet toBeAddedCallsigns(newAircraftCallsigns.difference(m_callsignsToBeRendered)); for (const CCallsign &cs : toBeRemovedCallsigns) { removeRemoteAircraft(cs); diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 340f6f4a3..0cbb27460 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -335,7 +335,7 @@ namespace BlackCore int m_timerCounter = 0; //!< allows to calculate n seconds QTimer *m_oneSecondTimer = nullptr; //!< timer BlackMisc::Simulation::CSimulatedAircraftList m_highlightedAircraft; //!< all other aircraft are to be ignored - BlackMisc::Aviation::CCallsignList m_callsignsToBeRendered; //!< callsigns which will be rendered + BlackMisc::Aviation::CCallsignSet m_callsignsToBeRendered; //!< callsigns which will be rendered int m_maxRenderedAircraft = MaxAircraftInfinite; //!< max.rendered aircraft BlackMisc::PhysicalQuantities::CLength m_maxRenderedDistance { 0.0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()}; //!< max.distance for rendering }; diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 5a9a4194f..8864ed049 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -57,14 +57,14 @@ namespace BlackCore return this->m_fsdServers; } - CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignList &callsigns) + CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignSet &callsigns) { return this->getAircraft().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CAircraft::getPilot)); } CUserList CVatsimDataFileReader::getPilotsForCallsign(const CCallsign &callsign) { - CCallsignList callsigns; + CCallsignSet callsigns; callsigns.push_back(callsign); return this->getPilotsForCallsigns(callsigns); } @@ -95,24 +95,24 @@ namespace BlackCore CUserList CVatsimDataFileReader::getControllersForCallsign(const CCallsign &callsign) { - CCallsignList callsigns; + CCallsignSet callsigns; callsigns.push_back(callsign); return this->getControllersForCallsigns(callsigns); } CUserList CVatsimDataFileReader::getUsersForCallsign(const CCallsign &callsign) { - CCallsignList callsigns; + CCallsignSet callsigns; callsigns.push_back(callsign); return this->getUsersForCallsigns(callsigns); } - CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignList &callsigns) + CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignSet &callsigns) { return this->getAtcStations().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CAtcStation::getController)); } - CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignList &callsigns) + CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignSet &callsigns) { CUserList users; if (callsigns.isEmpty()) return users; diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index 554f3b8c2..c49505c32 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -18,7 +18,7 @@ #include "blackmisc/nwserverlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/nwvoicecapabilities.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include #include @@ -56,7 +56,7 @@ namespace BlackCore //! Users for callsign(s) //! \threadsafe - BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns); + BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); //! User for callsign //! \threadsafe @@ -64,7 +64,7 @@ namespace BlackCore //! Controllers for callsigns //! \threadsafe - BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns); + BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); //! Controllers for callsign //! \threadsafe @@ -72,7 +72,7 @@ namespace BlackCore //! Users for callsigns //! \threadsafe - BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns); + BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns); //! Users for callsign //! \threadsafe diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index ea83039a4..28d683bdb 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -10,11 +10,11 @@ #include "voice_channel.h" #include "audio_mixer.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/selcal.h" #include "../blackmisc/nwuserlist.h" -#include "../blackmisc/voiceroomlist.h" -#include "../blackmisc/audiodeviceinfolist.h" +#include "../blackmisc/audio/voiceroomlist.h" +#include "../blackmisc/audio/audiodeviceinfolist.h" #include "../blackmisc/statusmessage.h" #include diff --git a/src/blackcore/voice_channel.h b/src/blackcore/voice_channel.h index a7052d5d7..dae65461a 100644 --- a/src/blackcore/voice_channel.h +++ b/src/blackcore/voice_channel.h @@ -13,8 +13,8 @@ #define BLACKCORE_VOICE_CHANNEL_H #include "blackmisc/statusmessage.h" -#include "blackmisc/voiceroomlist.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/audio/voiceroomlist.h" +#include "blackmisc/aviation/callsignset.h" #include #include @@ -52,10 +52,10 @@ namespace BlackCore virtual void leaveVoiceRoom() = 0; //! Get voice room callsings - virtual BlackMisc::Aviation::CCallsignList getVoiceRoomCallsigns() const = 0; + virtual BlackMisc::Aviation::CCallsignSet getVoiceRoomCallsigns() const = 0; //! Set own aircraft's callsign - virtual void setMyAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0; + virtual void setOwnAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0; //! Get voice room virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom() const = 0; diff --git a/src/blackcore/voice_channel_vatlib.cpp b/src/blackcore/voice_channel_vatlib.cpp index 02792d99b..681ba6b41 100644 --- a/src/blackcore/voice_channel_vatlib.cpp +++ b/src/blackcore/voice_channel_vatlib.cpp @@ -62,12 +62,12 @@ namespace BlackCore m_listCallsigns = {}; } - CCallsignList CVoiceChannelVatlib::getVoiceRoomCallsigns() const + CCallsignSet CVoiceChannelVatlib::getVoiceRoomCallsigns() const { return m_listCallsigns; } - void CVoiceChannelVatlib::setMyAircraftCallsign(const CCallsign &callsign) + void CVoiceChannelVatlib::setOwnAircraftCallsign(const CCallsign &callsign) { m_callsign = callsign; } diff --git a/src/blackcore/voice_channel_vatlib.h b/src/blackcore/voice_channel_vatlib.h index eab3b7c2b..5c4ff9740 100644 --- a/src/blackcore/voice_channel_vatlib.h +++ b/src/blackcore/voice_channel_vatlib.h @@ -13,8 +13,8 @@ #include "voice_channel.h" #include "voice_vatlib.h" #include "blackmisc/statusmessage.h" -#include "blackmisc/voiceroomlist.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/audio/voiceroomlist.h" +#include "blackmisc/aviation/callsignset.h" #include #include @@ -44,10 +44,10 @@ namespace BlackCore virtual void leaveVoiceRoom() override; //! \copydoc IVoiceChannel::getVoiceRoomCallsigns - virtual BlackMisc::Aviation::CCallsignList getVoiceRoomCallsigns() const override; + virtual BlackMisc::Aviation::CCallsignSet getVoiceRoomCallsigns() const override; //! \copydoc IVoiceChannel::setMyAircraftCallsign - virtual void setMyAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) override; + virtual void setOwnAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) override; //! \copydoc IVoiceChannel::getVoiceRoom virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom() const override; @@ -89,7 +89,7 @@ namespace BlackCore BlackMisc::Aviation::CCallsign m_callsign; // Own callsign BlackMisc::Audio::CVoiceRoom m_voiceRoom; // Voice Room - BlackMisc::Aviation::CCallsignList m_listCallsigns; // Callsigns connected to room + BlackMisc::Aviation::CCallsignSet m_listCallsigns; // Callsigns connected to room IVoiceChannel::ConnectionStatus m_roomStatus = IVoiceChannel::Disconnected; // Room connection status VatAudioService m_audioService; diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h index c7e9b2937..23bb5dce2 100644 --- a/src/blackgui/components/audiosetupcomponent.h +++ b/src/blackgui/components/audiosetupcomponent.h @@ -13,7 +13,7 @@ #define BLACKGUI_AUDIOSETUPCOMPONENT_H #include "enableforruntime.h" -#include "blackmisc/audiodeviceinfolist.h" +#include "blackmisc/audio/audiodeviceinfolist.h" #include #include diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index 48d2e3d77..daa0cf095 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -14,7 +14,7 @@ #include "blackcore/context_ownaircraft.h" #include "blackcore/context_audio.h" #include "blackmisc/aviation/aircraft.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h index 5eb81cf8f..82a08603f 100644 --- a/src/blackgui/components/cockpitcomcomponent.h +++ b/src/blackgui/components/cockpitcomcomponent.h @@ -14,7 +14,7 @@ #include "enableforruntime.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/transponder.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include #include diff --git a/src/blackgui/components/voiceroomscomponent.h b/src/blackgui/components/voiceroomscomponent.h index 80d055443..8bf7112cc 100644 --- a/src/blackgui/components/voiceroomscomponent.h +++ b/src/blackgui/components/voiceroomscomponent.h @@ -13,7 +13,7 @@ #define BLACKGUI_VOICEROOMSCOMPONENT_H #include "enableforruntime.h" -#include "blackmisc/voiceroomlist.h" +#include "blackmisc/audio/voiceroomlist.h" #include #include diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index 86a324ad7..38b3a2e35 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -8,7 +8,7 @@ */ #include "atcstationlistmodel.h" -#include "blackmisc/voiceroom.h" +#include "blackmisc/audio/voiceroom.h" #include "blackmisc/nwuser.h" #include "blackmisc/blackmiscfreefunctions.h" diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp index 1c3035ce3..3d4afdcab 100644 --- a/src/blackgui/models/columnformatters.cpp +++ b/src/blackgui/models/columnformatters.cpp @@ -8,7 +8,7 @@ */ #include "columnformatters.h" -#include "blackmisc/geolatitude.h" +#include "blackmisc/geo/latitude.h" #include "blackmisc/variant.h" #include "blackmisc/iconlist.h" #include "blackmisc/icons.h" diff --git a/src/blackmisc/audio/audio.h b/src/blackmisc/audio/audio.h new file mode 100644 index 000000000..d54e087d8 --- /dev/null +++ b/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 diff --git a/src/blackmisc/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp similarity index 86% rename from src/blackmisc/audiodeviceinfo.cpp rename to src/blackmisc/audio/audiodeviceinfo.cpp index 9de0febd6..eb6ed27f1 100644 --- a/src/blackmisc/audiodeviceinfo.cpp +++ b/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); diff --git a/src/blackmisc/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h similarity index 95% rename from src/blackmisc/audiodeviceinfo.h rename to src/blackmisc/audio/audiodeviceinfo.h index a364ebb94..0c21c0345 100644 --- a/src/blackmisc/audiodeviceinfo.h +++ b/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 namespace BlackMisc diff --git a/src/blackmisc/audiodeviceinfolist.cpp b/src/blackmisc/audio/audiodeviceinfolist.cpp similarity index 82% rename from src/blackmisc/audiodeviceinfolist.cpp rename to src/blackmisc/audio/audiodeviceinfolist.cpp index 5fa2f8de3..31e0ab981 100644 --- a/src/blackmisc/audiodeviceinfolist.cpp +++ b/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(); diff --git a/src/blackmisc/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h similarity index 87% rename from src/blackmisc/audiodeviceinfolist.h rename to src/blackmisc/audio/audiodeviceinfolist.h index 34676fd53..ccb685cb6 100644 --- a/src/blackmisc/audiodeviceinfolist.h +++ b/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 #include #include @@ -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 { public: diff --git a/src/blackmisc/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp similarity index 92% rename from src/blackmisc/voiceroom.cpp rename to src/blackmisc/audio/voiceroom.cpp index 2b8847367..dc1cfa0a5 100644 --- a/src/blackmisc/voiceroom.cpp +++ b/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)); diff --git a/src/blackmisc/voiceroom.h b/src/blackmisc/audio/voiceroom.h similarity index 94% rename from src/blackmisc/voiceroom.h rename to src/blackmisc/audio/voiceroom.h index 62b8b9115..06f2afe0b 100644 --- a/src/blackmisc/voiceroom.h +++ b/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 -#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 { public: diff --git a/src/blackmisc/voiceroomlist.cpp b/src/blackmisc/audio/voiceroomlist.cpp similarity index 83% rename from src/blackmisc/voiceroomlist.cpp rename to src/blackmisc/audio/voiceroomlist.cpp index 85644b619..0eff1a7a0 100644 --- a/src/blackmisc/voiceroomlist.cpp +++ b/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(); @@ -36,9 +28,6 @@ namespace BlackMisc registerMetaValueType(); } - /* - * Two empty rooms - */ const CVoiceRoomList &CVoiceRoomList::twoEmptyRooms() { static CVoiceRoomList emptyRooms; diff --git a/src/blackmisc/voiceroomlist.h b/src/blackmisc/audio/voiceroomlist.h similarity index 92% rename from src/blackmisc/voiceroomlist.h rename to src/blackmisc/audio/voiceroomlist.h index f8120d2b4..30fa3e0c7 100644 --- a/src/blackmisc/voiceroomlist.h +++ b/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 #include #include diff --git a/src/blackmisc/aviation/aircraftlist.h b/src/blackmisc/aviation/aircraftlist.h index 0770cb5be..d472cc15d 100644 --- a/src/blackmisc/aviation/aircraftlist.h +++ b/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" diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index f19447411..2bf8de578 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/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" diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h index 70fe91c43..9ffcc6226 100644 --- a/src/blackmisc/aviation/airport.h +++ b/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 diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 398395e04..5444624ae 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/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 #include #include diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index 72e418d4a..cc187e3aa 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/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" diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index ddd7e87da..4b2c1322b 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/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" diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 36608ef53..03f22d9cc 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/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" diff --git a/src/blackmisc/aviation/aviation.h b/src/blackmisc/aviation/aviation.h index 89d1cf7e4..016e00396 100644 --- a/src/blackmisc/aviation/aviation.h +++ b/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" diff --git a/src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp b/src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp index 604da248a..1457c5188 100644 --- a/src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp +++ b/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(); diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp index 94f435d22..3475f3704 100644 --- a/src/blackmisc/aviation/callsignobjectlist.cpp +++ b/src/blackmisc/aviation/callsignobjectlist.cpp @@ -37,9 +37,9 @@ namespace BlackMisc } template - CCallsignList ICallsignObjectList::getCallsigns() const + CCallsignSet ICallsignObjectList::getCallsigns() const { - CCallsignList cs; + CCallsignSet cs; for (const OBJ &obj : this->container()) { cs.push_back(obj.getCallsign()); @@ -54,7 +54,7 @@ namespace BlackMisc } template - CONTAINER ICallsignObjectList::findByCallsigns(const CCallsignList &callsigns) const + CONTAINER ICallsignObjectList::findByCallsigns(const CCallsignSet &callsigns) const { return this->container().findBy(Predicates::MemberIsAnyOf(&OBJ::getCallsign, callsigns)); } diff --git a/src/blackmisc/aviation/callsignobjectlist.h b/src/blackmisc/aviation/callsignobjectlist.h index 041b329dc..157d6ce3b 100644 --- a/src/blackmisc/aviation/callsignobjectlist.h +++ b/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 @@ -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; diff --git a/src/blackmisc/aviation/callsignlist.cpp b/src/blackmisc/aviation/callsignset.cpp similarity index 71% rename from src/blackmisc/aviation/callsignlist.cpp rename to src/blackmisc/aviation/callsignset.cpp index 481e22059..fa6345e1d 100644 --- a/src/blackmisc/aviation/callsignlist.cpp +++ b/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 &other) : + CCallsignSet::CCallsignSet(const CCollection &other) : CCollection(other) { } - void CCallsignList::registerMetadata() + void CCallsignSet::registerMetadata() { qRegisterMetaType>(); qDBusRegisterMetaType>(); qRegisterMetaType>(); qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); + qRegisterMetaType(); + qDBusRegisterMetaType(); + registerMetaValueType(); } } // namespace diff --git a/src/blackmisc/aviation/callsignlist.h b/src/blackmisc/aviation/callsignset.h similarity index 79% rename from src/blackmisc/aviation/callsignlist.h rename to src/blackmisc/aviation/callsignset.h index 3af44923c..200cad32e 100644 --- a/src/blackmisc/aviation/callsignlist.h +++ b/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 + //! Value object for a set of callsigns. + class CCallsignSet : public CCollection { public: //! Default constructor. - CCallsignList(); + CCallsignSet(); //! Construct from a base class object. - CCallsignList(const CCollection &other); + CCallsignSet(const CCollection &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) Q_DECLARE_METATYPE(BlackMisc::CSequence) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 4d9fa0083..5e7d649fd 100644 --- a/src/blackmisc/blackmisc.pro +++ b/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 diff --git a/src/blackmisc/blackmiscallvalueclasses.h b/src/blackmisc/blackmiscallvalueclasses.h deleted file mode 100644 index 3d64aef10..000000000 --- a/src/blackmisc/blackmiscallvalueclasses.h +++ /dev/null @@ -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 diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 889b98da2..fb321d341 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/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" diff --git a/src/blackmisc/blackmiscfreefunctions_simmeta.cpp b/src/blackmisc/blackmiscfreefunctions_simmeta.cpp index c04a0fdc9..9499d14e8 100644 --- a/src/blackmisc/blackmiscfreefunctions_simmeta.cpp +++ b/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(); diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp similarity index 99% rename from src/blackmisc/coordinategeodetic.cpp rename to src/blackmisc/geo/coordinategeodetic.cpp index 12f282057..6cb46b8e7 100644 --- a/src/blackmisc/coordinategeodetic.cpp +++ b/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 using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h similarity index 98% rename from src/blackmisc/coordinategeodetic.h rename to src/blackmisc/geo/coordinategeodetic.h index 4ce5d4566..0e8ab0762 100644 --- a/src/blackmisc/coordinategeodetic.h +++ b/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 { diff --git a/src/blackmisc/geoearthangle.cpp b/src/blackmisc/geo/earthangle.cpp similarity index 92% rename from src/blackmisc/geoearthangle.cpp rename to src/blackmisc/geo/earthangle.cpp index 40be03746..fee28e8fc 100644 --- a/src/blackmisc/geoearthangle.cpp +++ b/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 LATorLON CEarthAngle::fromWgs84(const QString &wgsCoordinate) { // http://www.regular-expressions.info/floatingpoint.html @@ -68,9 +65,6 @@ namespace BlackMisc return LATorLON(a); } - /* - * Icon - */ template CIcon CEarthAngle::toIcon() const { return BlackMisc::CIconList::iconByIndex(CIcons::GeoPosition); diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geo/earthangle.h similarity index 98% rename from src/blackmisc/geoearthangle.h rename to src/blackmisc/geo/earthangle.h index fc9fab653..d5d9f1d3e 100644 --- a/src/blackmisc/geoearthangle.h +++ b/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" diff --git a/src/blackmisc/audioallclasses.h b/src/blackmisc/geo/geo.h similarity index 51% rename from src/blackmisc/audioallclasses.h rename to src/blackmisc/geo/geo.h index 345a82445..e92672676 100644 --- a/src/blackmisc/audioallclasses.h +++ b/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 diff --git a/src/blackmisc/geodesicgrid.h b/src/blackmisc/geo/geodesicgrid.h similarity index 93% rename from src/blackmisc/geodesicgrid.h rename to src/blackmisc/geo/geodesicgrid.h index 1d31d350f..8de53dd67 100644 --- a/src/blackmisc/geodesicgrid.h +++ b/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 #include diff --git a/src/blackmisc/geoobjectlist.cpp b/src/blackmisc/geo/geoobjectlist.cpp similarity index 98% rename from src/blackmisc/geoobjectlist.cpp rename to src/blackmisc/geo/geoobjectlist.cpp index 9977cebdc..ef66a0f15 100644 --- a/src/blackmisc/geoobjectlist.cpp +++ b/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" diff --git a/src/blackmisc/geoobjectlist.h b/src/blackmisc/geo/geoobjectlist.h similarity index 95% rename from src/blackmisc/geoobjectlist.h rename to src/blackmisc/geo/geoobjectlist.h index 618e1a43b..c09813283 100644 --- a/src/blackmisc/geoobjectlist.h +++ b/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 { diff --git a/src/blackmisc/geolatitude.h b/src/blackmisc/geo/latitude.h similarity index 93% rename from src/blackmisc/geolatitude.h rename to src/blackmisc/geo/latitude.h index 6dd283083..af195aeee 100644 --- a/src/blackmisc/geolatitude.h +++ b/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 -#include "blackmisc/geoearthangle.h" +#include "blackmisc/geo/earthangle.h" namespace BlackMisc { diff --git a/src/blackmisc/geolongitude.h b/src/blackmisc/geo/longitude.h similarity index 93% rename from src/blackmisc/geolongitude.h rename to src/blackmisc/geo/longitude.h index f197826ba..2d11228fd 100644 --- a/src/blackmisc/geolongitude.h +++ b/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 { diff --git a/src/blackmisc/geoallclasses.h b/src/blackmisc/geoallclasses.h deleted file mode 100644 index db2f57cc0..000000000 --- a/src/blackmisc/geoallclasses.h +++ /dev/null @@ -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 diff --git a/src/blackmisc/simulation/simulatedaircraftlist.cpp b/src/blackmisc/simulation/simulatedaircraftlist.cpp index f17a68e33..3ca3efe76 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.cpp +++ b/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; } diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index a35bb6337..a283fc1d1 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/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(); diff --git a/src/blacksound/soundgenerator.h b/src/blacksound/soundgenerator.h index c3582fe0e..43eef4de4 100644 --- a/src/blacksound/soundgenerator.h +++ b/src/blacksound/soundgenerator.h @@ -13,7 +13,7 @@ #define BLACKSOUND_SOUNDGENERATOR_H #include "blackmisc/aviation/selcal.h" -#include "blackmisc/audiodeviceinfo.h" +#include "blackmisc/audio/audiodeviceinfo.h" #include "blackmisc/pqtime.h" #include "blackmisc/notificationsounds.h" #include diff --git a/src/plugins/simulator/fs9/fs9_client.cpp b/src/plugins/simulator/fs9/fs9_client.cpp index e22d5291f..9b0041029 100644 --- a/src/plugins/simulator/fs9/fs9_client.cpp +++ b/src/plugins/simulator/fs9/fs9_client.cpp @@ -14,7 +14,7 @@ #include "multiplayer_packet_parser.h" #include "blacksimplugin_freefunctions.h" #include "blackmisc/aviation/aircraftsituation.h" -#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/logmessage.h" #include diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro index 6a311829c..a178c7d0b 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/src/plugins/simulator/xplane/plugin_xplane.pro @@ -17,7 +17,6 @@ HEADERS += *.h #win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib #win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackcore.lib -#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blacksim.lib DESTDIR = ../../../../bin/plugins/simulator diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index 43adb821f..f65a22007 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -11,7 +11,7 @@ #include "xbus_service_proxy.h" #include "xbus_traffic_proxy.h" #include "blackmisc/logmessage.h" -#include "blackmisc/coordinategeodetic.h" +#include "blackmisc/geo/coordinategeodetic.h" #include #include #include diff --git a/src/swiftgui_standard/introwindow.cpp b/src/swiftgui_standard/introwindow.cpp index 271b47930..27d1c0257 100644 --- a/src/swiftgui_standard/introwindow.cpp +++ b/src/swiftgui_standard/introwindow.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2014 + * 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 "introwindow.h" #include "ui_introwindow.h" #include "blackcore/dbus_server.h" diff --git a/src/xbus/service.h b/src/xbus/service.h index dd888faa0..84bf99cce 100644 --- a/src/xbus/service.h +++ b/src/xbus/service.h @@ -12,7 +12,7 @@ #define NOMINMAX #endif #include "datarefs.h" -#include "blackmisc/geodesicgrid.h" +#include "blackmisc/geo/geodesicgrid.h" #include #include #include diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/test_blackcore.pro index 54ebc6e7c..74b1b7e9d 100644 --- a/tests/blackcore/test_blackcore.pro +++ b/tests/blackcore/test_blackcore.pro @@ -8,7 +8,7 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -CONFIG += blackmisc blackcore blacksim +CONFIG += blackmisc blackcore CONFIG += testcase DEPENDPATH += . ../../src @@ -18,11 +18,9 @@ HEADERS += *.h SOURCES += *.cpp win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ - ../../lib/blacksim.lib + ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ - ../../lib/libblacksim.a + ../../lib/libblackcore.a DESTDIR = ../../bin diff --git a/tests/blackcore/testinterpolator.cpp b/tests/blackcore/testinterpolator.cpp index 2daee5a71..d1d5a9ba5 100644 --- a/tests/blackcore/testinterpolator.cpp +++ b/tests/blackcore/testinterpolator.cpp @@ -9,7 +9,7 @@ #include "testinterpolator.h" #include "blackcore/interpolator_linear.h" -#include "blackmisc/simulation/remoteaircraftprovider.h" +#include "blackmisc/simulation/remoteaircraftproviderdummy.h" #include using namespace BlackCore; @@ -26,6 +26,8 @@ namespace BlackCoreTest QScopedPointer provider(new CRemoteAircraftProviderDummy()); CInterpolatorLinear interpolator(provider.data()); interpolator.forceSortingOfAddedValues(true); + + // fixed time so everything can be debugged const qint64 ts = 1425000000000; // QDateTime::currentMSecsSinceEpoch(); const qint64 deltaT = 5000; // ms CCallsign cs("SWIFT"); @@ -131,7 +133,7 @@ namespace BlackCoreTest } QList csKeys = interpolator.getSituationsByCallsign().keys(); - CCallsignList callsigns(csKeys); + CCallsignSet callsigns(csKeys); QVERIFY(callsigns.size() == callsignsInProvider); QVERIFY(interpolator.getSituationsForCallsign("SWIFT0").size() == IInterpolator::MaxSituationsPerCallsign); QVERIFY(interpolator.getPartsForCallsign("SWIFT0").size() == IInterpolator::MaxPartsPerCallsign); diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp index 7681dcc6a..7350c5ec8 100644 --- a/tests/blackmisc/testaviation.cpp +++ b/tests/blackmisc/testaviation.cpp @@ -9,7 +9,7 @@ #include "blackmisc/aviation/informationmessage.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/aircrafticao.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/navsystem.h" #include "blackmisc/aviation/transponder.h" @@ -105,7 +105,7 @@ namespace BlackMiscTest QVERIFY2(cs1 == cs2, "Callsigns shall be equal"); QVERIFY2(cs1 != cs3, "Callsigns shall not be equal"); - CCallsignList list; + CCallsignSet list; list.push_back(cs1); QVERIFY2(list.size() == 1, "List shall be 1"); QVERIFY2(list.contains(cs1), "Callsign is in list"); diff --git a/tests/blackmisc/testcontainers.cpp b/tests/blackmisc/testcontainers.cpp index 3846b39e6..3383938f6 100644 --- a/tests/blackmisc/testcontainers.cpp +++ b/tests/blackmisc/testcontainers.cpp @@ -14,7 +14,7 @@ #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include "blackmisc/aviation/callsignlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/dictionary.h" #include @@ -124,7 +124,7 @@ namespace BlackMiscTest void CTestContainers::findTests() { BlackMisc::registerMetadata(); - CCallsignList callsigns; + CCallsignSet callsigns; CSequence found = callsigns.findBy(&CCallsign::asString, "Foo"); QVERIFY2(found.isEmpty(), "Empty found"); callsigns.push_back(CCallsign("EDDM_TWR")); diff --git a/tests/blackmisc/testgeo.cpp b/tests/blackmisc/testgeo.cpp index cc234cf4b..56d431657 100644 --- a/tests/blackmisc/testgeo.cpp +++ b/tests/blackmisc/testgeo.cpp @@ -1,6 +1,6 @@ #include "testgeo.h" -#include "blackmisc/geolatitude.h" -#include "blackmisc/geolongitude.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities;