diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index ae69a47da..729ba81e9 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -53,9 +53,9 @@ namespace BlackCore virtual void sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data) override; virtual void sendFsipiCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator, - const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) override; + const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) override; virtual void sendFsipirCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator, - const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) override; + const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) override; // Text message slots virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &messages) override; @@ -75,8 +75,8 @@ namespace BlackCore virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override; virtual void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override; virtual void setOwnCockpit(const BlackMisc::Aviation::CComSystem &com1, - const BlackMisc::Aviation::CComSystem &com2, - const BlackMisc::Aviation::CTransponder &xpdr) override; + const BlackMisc::Aviation::CComSystem &com2, + const BlackMisc::Aviation::CTransponder &xpdr) override; // Weather slots virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) override; diff --git a/src/blackcore/vatsimbookingreader.cpp b/src/blackcore/vatsimbookingreader.cpp index 0903c8f77..f32d21516 100644 --- a/src/blackcore/vatsimbookingreader.cpp +++ b/src/blackcore/vatsimbookingreader.cpp @@ -54,6 +54,7 @@ namespace BlackCore { if (nwReply->error() == QNetworkReply::NoError) { + static const QString timestampFormat("yyyy-MM-dd HH:mm:ss"); QString xmlData = nwReply->readAll(); QDomDocument doc; @@ -71,7 +72,7 @@ namespace BlackCore { // normally the timestamp is always updated from backend // if this changes in the future we're prepared - QDateTime fileTimestamp = QDateTime::fromString(ts, "yyyy-MM-dd HH:mm:ss"); + QDateTime fileTimestamp = QDateTime::fromString(ts, timestampFormat); fileTimestamp.setTimeSpec(Qt::UTC); if (this->m_updateTimestamp == fileTimestamp) return; // nothing to do this->m_updateTimestamp = fileTimestamp; @@ -110,13 +111,13 @@ namespace BlackCore } else if (name == "time_end") { - QDateTime t = QDateTime::fromString(value, "yyyy-MM-dd HH:mm:ss"); + QDateTime t = QDateTime::fromString(value, timestampFormat); t.setTimeSpec(Qt::UTC); bookedStation.setBookedUntilUtc(t); } else if (name == "time_start") { - QDateTime t = QDateTime::fromString(value, "yyyy-MM-dd HH:mm:ss"); + QDateTime t = QDateTime::fromString(value, timestampFormat); t.setTimeSpec(Qt::UTC); bookedStation.setBookedFromUtc(t); } diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h index e101760ce..16bfb1b96 100644 --- a/src/blackmisc/nwaircraftmapping.h +++ b/src/blackmisc/nwaircraftmapping.h @@ -34,7 +34,7 @@ namespace BlackMisc //! \copydoc CValueObject::unmarshallFromDbus virtual void unmarshallFromDbus(const QDBusArgument &) override; - //! \copydoc CValueObject::compareImpl + //! \copydoc CValueObject::compareImpl(const CValueObject &) int compareImpl(const CValueObject &otherBase) const override; //! \copydoc CValueObject::getMetaTypeId()