diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 5ec7a6b7c..571a743fa 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -955,10 +955,10 @@ namespace BlackCore this->updateAircraftInRange(callsign, vm); } - void CAirspaceMonitor::onAircraftConfigReceived(const CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset) + void CAirspaceMonitor::onAircraftConfigReceived(const CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs) { Q_ASSERT(CThreadUtils::isCurrentThreadObjectThread(this)); - this->storeAircraftParts(callsign, jsonObject, currentOffset); + this->storeAircraftParts(callsign, jsonObject, currentOffsetMs); // update client capability CClient client = this->getClientOrDefaultForCallsign(callsign); diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index c6dc62c84..68091dc01 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -285,7 +285,7 @@ namespace BlackCore void onReceivedAtcBookings(const BlackMisc::Aviation::CAtcStationList &bookedStations); void onReadUnchangedAtcBookings(); void onReceivedVatsimDataFile(); - void onAircraftConfigReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset); + void onAircraftConfigReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs); void onAircraftInterimUpdateReceived(const BlackMisc::Aviation::CAircraftSituation &situation); void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus oldStatus, BlackCore::INetwork::ConnectionStatus newStatus); }; diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 8a1c46c63..b90b28eb6 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -531,7 +531,7 @@ namespace BlackCore /*! * We received an aircraft config packet. */ - void aircraftConfigPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &incremental, int currentOffsetTime); + void aircraftConfigPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &incremental, qint64 currentOffsetTimeMs); /*! * We received a raw message for debugging purposes diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 6b050dc60..8a39d0381 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -209,14 +209,14 @@ namespace BlackCore { // Normal / Stealth mode VatPilotPosition pos; - pos.altitudePressure = myAircraft.getPressureAltitude().value(CLengthUnit::ft()); - pos.altitudeTrue = myAircraft.getAltitude().value(CLengthUnit::ft()); + pos.altitudePressure = myAircraft.getPressureAltitude().valueInteger(CLengthUnit::ft()); + pos.altitudeTrue = myAircraft.getAltitude().valueInteger(CLengthUnit::ft()); pos.heading = myAircraft.getHeading().value(CAngleUnit::deg()); pos.pitch = myAircraft.getPitch().value(CAngleUnit::deg()); pos.bank = myAircraft.getBank().value(CAngleUnit::deg()); pos.latitude = myAircraft.latitude().value(CAngleUnit::deg()); pos.longitude = myAircraft.longitude().value(CAngleUnit::deg()); - pos.groundSpeed = myAircraft.getGroundSpeed().value(CSpeedUnit::kts()); + pos.groundSpeed = myAircraft.getGroundSpeed().valueInteger(CSpeedUnit::kts()); pos.rating = vatPilotRatingUnknown; pos.transponderCode = static_cast(myAircraft.getTransponderCode()); pos.transponderMode = vatTransponderModeStandby; @@ -240,7 +240,7 @@ namespace BlackCore if (m_loginMode == LoginNormal) { VatInterimPilotPosition pos; - pos.altitudeTrue = myAircraft.getAltitude().value(CLengthUnit::ft()); + pos.altitudeTrue = myAircraft.getAltitude().valueInteger(CLengthUnit::ft()); pos.heading = myAircraft.getHeading().value(CAngleUnit::deg()); pos.pitch = myAircraft.getPitch().value(CAngleUnit::deg()); pos.bank = myAircraft.getBank().value(CAngleUnit::deg()); @@ -535,8 +535,8 @@ namespace BlackCore // if this is really required, I need to group by message // currently I send individual messages freqsVec.clear(); - freqsVec.push_back(message.getFrequency().valueRounded(CFrequencyUnit::kHz(), 0)); - Vat_SendRadioMessage(m_net.data(), freqsVec.data(), freqsVec.size(), toFSD(message.getMessage())); + freqsVec.push_back(message.getFrequency().valueInteger(CFrequencyUnit::kHz())); + Vat_SendRadioMessage(m_net.data(), freqsVec.data(), static_cast(freqsVec.size()), toFSD(message.getMessage())); emit this->textMessageSent(message); } } @@ -637,7 +637,7 @@ namespace BlackCore vatlibFP.fuelMins = timeParts[CTime::Minutes]; vatlibFP.remarks = remarksTemp = toFSD(remarks); vatlibFP.route = routeTemp = toFSD(route); - vatlibFP.trueCruisingSpeed = flightPlan.getCruiseTrueAirspeed().valueRounded(CSpeedUnit::kts()); + vatlibFP.trueCruisingSpeed = flightPlan.getCruiseTrueAirspeed().valueInteger(CSpeedUnit::kts()); switch (flightPlan.getFlightRules()) { default: @@ -906,7 +906,7 @@ namespace BlackCore //! we set a dynamically updating offset time here situation.setCurrentUtcTime(); - const int offsetMs = self->receivedPositionFixTsAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch()); + const qint64 offsetMs = self->receivedPositionFixTsAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch()); situation.setTimeOffsetMs(offsetMs); CTransponder::TransponderMode mode = CTransponder::StateStandby; @@ -964,7 +964,7 @@ namespace BlackCore const QJsonObject config = doc.object().value("config").toObject(); if (config.empty()) { return; } - const int offsetTimeMs = self->currentOffsetTime(callsign); + const qint64 offsetTimeMs = self->currentOffsetTime(callsign); emit self->aircraftConfigPacketReceived(callsign, config, offsetTimeMs); } @@ -1253,7 +1253,7 @@ namespace BlackCore auto *self = cbvar_cast(cbvar); switch (type) { - case vatClientQueryFreq: emit self->frequencyReplyReceived(self->fromFSD(callsign), CFrequency(self->fromFSD(data).toFloat(), CFrequencyUnit::MHz())); break; + case vatClientQueryFreq: emit self->frequencyReplyReceived(self->fromFSD(callsign), CFrequency(self->fromFSD(data).toDouble(), CFrequencyUnit::MHz())); break; case vatClientQueryServer: emit self->serverReplyReceived(self->fromFSD(callsign), self->fromFSD(data)); break; case vatClientQueryAtc: emit self->atcReplyReceived(CCallsign(self->fromFSD(data2), CCallsign::Atc), *data == 'Y'); break; case vatClientQueryName: emit self->realNameReplyReceived(self->fromFSD(callsign), self->fromFSD(data)); break; diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h index 27a39bcc3..8e03b7a09 100644 --- a/src/blackcore/vatsim/networkvatlib.h +++ b/src/blackcore/vatsim/networkvatlib.h @@ -71,7 +71,7 @@ namespace BlackCore QObject *parent = nullptr); //! Destructor - virtual ~CNetworkVatlib(); + virtual ~CNetworkVatlib() override; //! \copydoc INetwork::getLibraryInfo const QString &getLibraryInfo(bool detailed) const override; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index dcfc276b4..b03236e74 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -367,7 +367,7 @@ namespace BlackMisc emit this->addedAircraftParts(callsign, parts); } - void CRemoteAircraftProvider::storeAircraftParts(const CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset) + void CRemoteAircraftProvider::storeAircraftParts(const CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs) { const CSimulatedAircraft remoteAircraft(this->getAircraftInRangeForCallsign(callsign)); const bool isFull = jsonObject.value(CAircraftParts::attributeNameIsFullJson()).toBool(); @@ -400,7 +400,7 @@ namespace BlackMisc // make sure in any case right time and correct details parts.setCurrentUtcTime(); - parts.setTimeOffsetMs(currentOffset); + parts.setTimeOffsetMs(currentOffsetMs); parts.setPartsDetails(CAircraftParts::FSDAircraftParts); // store part history (parts always absolute) diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 27392c410..3b20e2d2a 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -400,7 +400,7 @@ namespace BlackMisc //! \threadsafe //! @{ void storeAircraftParts(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool removeOutdated); - void storeAircraftParts(const Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset); + void storeAircraftParts(const Aviation::CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs); //! @} //! Guess situation "on ground" and update model's CG if applicable