diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index c85eea827..7410dc6c0 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -531,7 +531,7 @@ void Client::pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign) std::cout << "PILOT_DISCONNECTED " << callsign << std::endl; } -void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery) +void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery) { std::cout << "PLANE_INFO_REPLY " << callsign << " " << aircraftIcaoDesignator.toStdString() << " " << airlineIcaoDesignator.toStdString() << " " << livery.toStdString(); } diff --git a/samples/cli_client/client.h b/samples/cli_client/client.h index e25f2d294..fd8c640e6 100644 --- a/samples/cli_client/client.h +++ b/samples/cli_client/client.h @@ -112,7 +112,7 @@ public slots: //to receive from INetwork void metarReplyReceived(const QString &data); void flightPlanReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CFlightPlan &flightPlan); void pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign); - void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); + void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); void pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime); void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages); void customPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data); diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 5e8862f55..e915aa301 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -762,7 +762,7 @@ namespace BlackCore } } - void CAirspaceMonitor::ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery) + void CAirspaceMonitor::ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery) { Q_ASSERT_X(BlackCore::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "not in main thread"); Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "no callsign"); diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index 770ed64fb..95baff73f 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -37,7 +37,7 @@ namespace BlackCore class BLACKCORE_EXPORT CAirspaceMonitor : public QObject, public BlackMisc::Simulation::IRemoteAircraftProvider, // those data will be provided from the class CAirspaceMonitor - public BlackMisc::Simulation::COwnAircraftAware, // used to obtain in memory infomation about own aircraft + public BlackMisc::Simulation::COwnAircraftAware, // used to obtain in memory information about own aircraft public BlackMisc::Network::CWebDataServicesAware // used to get web service data { Q_OBJECT @@ -219,11 +219,11 @@ namespace BlackCore QMap m_flightPlanCache; QMap m_modelCache; - INetwork *m_network = nullptr; - CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer - bool m_serverSupportsNameQuery = false; //!< not all servers support name query - bool m_connected = false; //!< retrieve data - bool m_sendInterimPositions = false; + INetwork *m_network = nullptr; + CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer + bool m_serverSupportsNameQuery = false; //!< not all servers support name query + bool m_connected = false; //!< retrieve data + bool m_sendInterimPositions = false; QTimer m_interimPositionUpdateTimer; // locks @@ -275,7 +275,7 @@ namespace BlackCore void ps_atisReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage); void ps_atisVoiceRoomReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url); void ps_atisLogoffTimeReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime); - void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); + void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); void ps_pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign); void ps_frequencyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency); void ps_receivedBookings(const BlackMisc::Aviation::CAtcStationList &bookedStations); diff --git a/src/blackcore/network.h b/src/blackcore/network.h index d0d52ce85..9531147b7 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -436,7 +436,7 @@ namespace BlackCore * We received a reply to one of our queries. * \sa sendIcaoCodesQuery */ - void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); + void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery); /*! * We received a notification of the state of another aircraft on the network. diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index 1829f0a19..452e6cdd0 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -1030,9 +1030,9 @@ namespace BlackCore { emit cbvar_cast(cbvar)->icaoCodesReplyReceived( cbvar_cast(cbvar)->fromFSD(callsign), - QString(aircraftInfo->aircraftType).trimmed().toUpper(), - QString(aircraftInfo->airline).trimmed().toUpper(), - QString(aircraftInfo->livery).trimmed().toUpper() + cbvar_cast(cbvar)->fromFSD(aircraftInfo->aircraftType).trimmed().toUpper(), + cbvar_cast(cbvar)->fromFSD(aircraftInfo->airline).trimmed().toUpper(), + cbvar_cast(cbvar)->fromFSD(aircraftInfo->livery).trimmed().toUpper() ); } diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 78da7ce82..a14c8b80d 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -155,7 +155,7 @@ namespace BlackMisc CStatusMessageList CAirlineIcaoCode::validate() const { - static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()}); + static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() })); CStatusMessageList msgs; if (!hasValidDesignator()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Airline: missing designator")); } if (!hasValidCountry()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Airline: missing country")); } diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 495c1ec7c..139dbeb94 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -98,7 +98,7 @@ namespace BlackMisc CStatusMessageList CLivery::validate() const { - static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()}); + static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() })); CStatusMessageList msg; if (!hasCombinedCode()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Livery: missing livery code")); } if (!hasColorFuselage()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Livery: no fuselage color")); } diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 0db428ab7..8a1b3b8bc 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -381,7 +381,8 @@ QString BlackMisc::bytesToHexString(const QByteArray &bytes) QString h; for (int i = 0; i < bytes.size(); i++) { - h.append(static_cast(bytes.at(i))); + int b = static_cast(bytes.at(i)); + h.append(intToHex(b, 2)); } return h; } diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index f839550eb..6408b064f 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -218,7 +218,7 @@ namespace BlackMisc CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const { - static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()}); + static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() })); CStatusMessageList msgs; if (!hasModelString()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: missing model string (aka key)")); } if (!hasValidSimulator()) {msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: no simulator set")); } diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index 3de141cd0..bcacd8e8b 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -87,7 +87,7 @@ namespace BlackMisc CStatusMessageList CDistributor::validate() const { - static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()}); + static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() })); CStatusMessageList msgs; if (!hasValidDbKey()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Distributor: missing id")); } if (!hasDescription()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Distributor: missing description")); }