diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 5d0ef835b..eaadff5fc 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -259,7 +259,7 @@ namespace BlackCore capabilities.addValue(CClient::FsdAtisCanBeReceived, (flags & INetwork::AcceptsAtisResponses)); capabilities.addValue(CClient::FsdWithInterimPositions, (flags & INetwork::SupportsInterimPosUpdates)); capabilities.addValue(CClient::FsdWithModelDescription, (flags & INetwork::SupportsModelDescriptions)); - CPropertyIndexVariantMap vm(CClient::IndexCapabilities, capabilities.toQVariant()); + CPropertyIndexVariantMap vm(CClient::IndexCapabilities, capabilities.toCVariant()); this->addVoiceCapabilitiesFromDataFile(vm, callsign); this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm); } @@ -269,8 +269,8 @@ namespace BlackCore if (callsign.isEmpty() || model.isEmpty()) return; // Request of other client, I can get the other's model from that - CPropertyIndexVariantMap vm({ CClient::IndexModel, CAircraftModel::IndexModelString }, QVariant(model)); - vm.addValue({ CClient::IndexModel, CAircraftModel::IndexIsQueriedModelString }, QVariant(true)); + CPropertyIndexVariantMap vm({ CClient::IndexModel, CAircraftModel::IndexModelString }, model); + vm.addValue({ CClient::IndexModel, CAircraftModel::IndexIsQueriedModelString }, true); if (!this->m_otherClients.contains(&CClient::getCallsign, callsign)) { // with custom packets it can happen, @@ -284,7 +284,7 @@ namespace BlackCore void CAirspaceMonitor::ps_serverReplyReceived(const CCallsign &callsign, const QString &server) { if (callsign.isEmpty() || server.isEmpty()) return; - CPropertyIndexVariantMap vm(CClient::IndexServer, QVariant(server)); + CPropertyIndexVariantMap vm(CClient::IndexServer, server); this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm); } @@ -297,7 +297,7 @@ namespace BlackCore CInformationMessage metar(CInformationMessage::METAR, metarMessage); // add METAR to existing stations - CPropertyIndexVariantMap vm(CAtcStation::IndexMetar, metar.toQVariant()); + CPropertyIndexVariantMap vm(CAtcStation::IndexMetar, metar.toCVariant()); this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsignTower, vm); this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsignTower, vm); this->m_metarCache.insert(icaoCode, metar); @@ -446,14 +446,14 @@ namespace BlackCore } // booked - this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, CPropertyIndexVariantMap(CAtcStation::IndexIsOnline, QVariant(false))); + this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, CPropertyIndexVariantMap(CAtcStation::IndexIsOnline, CVariant::from(false))); } void CAirspaceMonitor::ps_atisReceived(const CCallsign &callsign, const CInformationMessage &atisMessage) { Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this)); if (callsign.isEmpty()) return; - CPropertyIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant()); + CPropertyIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toCVariant()); int changedOnline = this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm); // receiving an ATIS means station is online, update in bookings @@ -485,7 +485,7 @@ namespace BlackCore } // receiving voice room means ATC has voice - vm = CPropertyIndexVariantMap(CClient::IndexVoiceCapabilities, CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice).toQVariant()); + vm = CPropertyIndexVariantMap(CClient::IndexVoiceCapabilities, CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice).toCVariant()); this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm, false); } @@ -503,7 +503,7 @@ namespace BlackCore QDateTime logoffDateTime = QDateTime::currentDateTimeUtc(); logoffDateTime.setTime(QTime(h, m)); - CPropertyIndexVariantMap vm(CAtcStation::IndexBookedUntil, logoffDateTime); + CPropertyIndexVariantMap vm(CAtcStation::IndexBookedUntil, CVariant(logoffDateTime)); int changedOnline = this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm, true); int changedBooked = this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm, true); @@ -517,14 +517,14 @@ namespace BlackCore Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this)); // update - CPropertyIndexVariantMap vm(CAircraft::IndexIcao, icaoData.toQVariant()); + CPropertyIndexVariantMap vm(CAircraft::IndexIcao, icaoData.toCVariant()); if (!icaoData.hasAircraftDesignator()) { // empty so far, try to fetch from data file qDebug() << "Empty ICAO info for " << callsign << icaoData; CAircraftIcao icaoDataDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign); if (!icaoDataDataFile.hasAircraftDesignator()) return; // give up! - vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, icaoData.toQVariant()); + vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, icaoData.toCVariant()); } int changed = this->m_aircraftsInRange.applyIf(&CAircraft::getCallsign, callsign, vm, true); if (changed > 0) {emit this->changedAircraftsInRange();} @@ -605,7 +605,7 @@ namespace BlackCore Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this)); // update - CPropertyIndexVariantMap vm({CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency}, frequency.toQVariant()); + CPropertyIndexVariantMap vm({CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency}, frequency.toCVariant()); int changed = this->m_aircraftsInRange.applyIf(&CAircraft::getCallsign, callsign, vm, true); if (changed > 0) { emit this->changedAircraftsInRange(); } } diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index b6aae0e51..cb034ce4e 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -129,9 +129,9 @@ namespace BlackMisc /* * Property by index */ - QVariant CAircraft::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraft::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { @@ -161,11 +161,11 @@ namespace BlackMisc /* * Property by index (setter) */ - void CAircraft::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraft::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h index 0c64443f8..89230319b 100644 --- a/src/blackmisc/avaircraft.h +++ b/src/blackmisc/avaircraft.h @@ -224,10 +224,10 @@ namespace BlackMisc void initTransponder(); //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString() diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/avaircrafticao.cpp index 4794fe705..3b4e026f3 100644 --- a/src/blackmisc/avaircrafticao.cpp +++ b/src/blackmisc/avaircrafticao.cpp @@ -10,6 +10,7 @@ #include "avaircrafticao.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" #include #include @@ -65,22 +66,22 @@ namespace BlackMisc /* * Property by index */ - QVariant CAircraftIcao::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftIcao::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexAircraftDesignator: - return QVariant::fromValue(this->m_aircraftDesignator); + return CVariant::fromValue(this->m_aircraftDesignator); case IndexAirlineDesignator: - return QVariant::fromValue(this->m_airlineDesignator); + return CVariant::fromValue(this->m_airlineDesignator); case IndexCombinedAircraftType: - return QVariant::fromValue(this->m_aircraftCombinedType); + return CVariant::fromValue(this->m_aircraftCombinedType); case IndexAircraftColor: - return QVariant::fromValue(this->m_aircraftColor); + return CVariant::fromValue(this->m_aircraftColor); case IndexAsString: - return QVariant::fromValue(this->asString()); + return CVariant::fromValue(this->asString()); default: return CValueObject::propertyByIndex(index); } @@ -89,11 +90,11 @@ namespace BlackMisc /* * Property by index */ - void CAircraftIcao::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftIcao::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/avaircrafticao.h index ff969fe02..049cddae2 100644 --- a/src/blackmisc/avaircrafticao.h +++ b/src/blackmisc/avaircrafticao.h @@ -130,10 +130,10 @@ namespace BlackMisc bool matchesWildcardIcao(const CAircraftIcao &otherIcao) const; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Valid designator? static bool isValidDesignator(const QString &designator); diff --git a/src/blackmisc/avaircraftsituation.cpp b/src/blackmisc/avaircraftsituation.cpp index 888e20c80..a6b1df7b7 100644 --- a/src/blackmisc/avaircraftsituation.cpp +++ b/src/blackmisc/avaircraftsituation.cpp @@ -10,6 +10,7 @@ #include "avaircraftsituation.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; @@ -37,9 +38,9 @@ namespace BlackMisc /* * Property by index */ - QVariant CAircraftSituation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftSituation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { @@ -60,26 +61,26 @@ namespace BlackMisc case IndexGroundspeed: return this->m_groundspeed.propertyByIndex(index.copyFrontRemoved()); case IndexTimeStamp: - return QVariant::fromValue(this->m_timestamp); + return CVariant::fromValue(this->m_timestamp); case IndexTimeStampFormatted: - return QVariant::fromValue(this->m_groundspeed.toQString("dd hh:mm:ss")); + return CVariant::fromValue(this->m_groundspeed.toQString("dd hh:mm:ss")); default: break; } Q_ASSERT_X(false, "CAircraftSituation", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } /* * Property by index */ - void CAircraftSituation::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftSituation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } diff --git a/src/blackmisc/avaircraftsituation.h b/src/blackmisc/avaircraftsituation.h index 5a91b23ef..4b7580822 100644 --- a/src/blackmisc/avaircraftsituation.h +++ b/src/blackmisc/avaircraftsituation.h @@ -57,10 +57,10 @@ namespace BlackMisc m_bank(bank), m_groundspeed(gs), m_timestamp(QDateTime::currentDateTimeUtc()) {} //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Get position const BlackMisc::Geo::CCoordinateGeodetic &getPosition() const { return this->m_position; } diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/avairport.cpp index f8c63d788..e98bed456 100644 --- a/src/blackmisc/avairport.cpp +++ b/src/blackmisc/avairport.cpp @@ -10,6 +10,7 @@ #include "avairport.h" #include "blackmiscfreefunctions.h" #include "propertyindex.h" +#include "variant.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; @@ -79,16 +80,16 @@ namespace BlackMisc /* * Property by index */ - QVariant CAirport::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAirport::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexIcao: return this->m_icao.propertyByIndex(index.copyFrontRemoved()); case IndexDescriptiveName: - return QVariant(this->m_descriptiveName); + return CVariant(this->m_descriptiveName); case IndexPosition: return this->m_position.propertyByIndex(index.copyFrontRemoved()); case IndexElevation: @@ -105,17 +106,17 @@ namespace BlackMisc Q_ASSERT_X(false, "CAirport", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } /* * Set property as index */ - void CAirport::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAirport::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -125,7 +126,7 @@ namespace BlackMisc this->m_icao.setPropertyByIndex(variant, index.copyFrontRemoved()); break; case IndexDescriptiveName: - this->setDescriptiveName(variant.toString()); + this->setDescriptiveName(variant.toQString()); break; case IndexPosition: this->m_position.setPropertyByIndex(variant, index.copyFrontRemoved()); diff --git a/src/blackmisc/avairport.h b/src/blackmisc/avairport.h index ac8fa0721..0a5bb66a3 100644 --- a/src/blackmisc/avairport.h +++ b/src/blackmisc/avairport.h @@ -110,10 +110,10 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/avatcstation.cpp index 588a637e8..efa9becfe 100644 --- a/src/blackmisc/avatcstation.cpp +++ b/src/blackmisc/avatcstation.cpp @@ -13,6 +13,7 @@ #include "icon.h" #include "propertyindex.h" #include "blackmiscfreefunctions.h" +#include "variant.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; @@ -233,16 +234,16 @@ namespace BlackMisc /* * Property by index */ - QVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexBookedFrom: - return QVariant(this->m_bookedFromUtc); + return CVariant::from(this->m_bookedFromUtc); case IndexBookedUntil: - return QVariant(this->m_bookedUntilUtc); + return CVariant::from(this->m_bookedUntilUtc); case IndexCallsign: return this->m_callsign.propertyByIndex(index.copyFrontRemoved()); case IndexController: @@ -250,7 +251,7 @@ namespace BlackMisc case IndexFrequency: return this->m_frequency.propertyByIndex(index.copyFrontRemoved()); case IndexIsOnline: - return QVariant(this->m_isOnline); + return CVariant::from(this->m_isOnline); case IndexLatitude: return this->latitude().propertyByIndex(index.copyFrontRemoved()); case IndexDistance: @@ -266,7 +267,7 @@ namespace BlackMisc case IndexMetar: return this->m_metar.propertyByIndex(index.copyFrontRemoved()); case IndexVoiceRoom: - return QVariant(this->m_voiceRoom.propertyByIndex(index.copyFrontRemoved())); + return this->m_voiceRoom.propertyByIndex(index.copyFrontRemoved()); default: if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::propertyByIndex(index); } return CValueObject::propertyByIndex(index); @@ -276,9 +277,9 @@ namespace BlackMisc /* * Set property as index */ - void CAtcStation::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAtcStation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { - if (index.isMyself()) { this->convertFromQVariant(variant); return; } + if (index.isMyself()) { this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h index 4455213a5..01f48a89b 100644 --- a/src/blackmisc/avatcstation.h +++ b/src/blackmisc/avatcstation.h @@ -255,10 +255,10 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index bf158fd84..e536869c8 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -82,18 +82,18 @@ namespace BlackMisc /* * Index */ - QVariant CCallsign::propertyByIndex(const CPropertyIndex &index) const + CVariant CCallsign::propertyByIndex(const CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexCallsignString: - return QVariant(this->asString()); + return CVariant(this->asString()); case IndexCallsignStringAsSet: - return QVariant(this->getStringAsSet()); + return CVariant(this->getStringAsSet()); case IndexTelephonyDesignator: - return QVariant(this->getTelephonyDesignator()); + return CVariant(this->getTelephonyDesignator()); default: return CValueObject::propertyByIndex(index); } @@ -102,24 +102,24 @@ namespace BlackMisc /* * Index */ - void CCallsign::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + void CCallsign::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { case IndexCallsignString: - this->m_callsign = variant.toString(); + this->m_callsign = variant.toQString(); break; case IndexCallsignStringAsSet: - this->m_callsignAsSet = variant.toString(); + this->m_callsignAsSet = variant.toQString(); break; case IndexTelephonyDesignator: - this->m_telephonyDesignator = variant.toString(); + this->m_telephonyDesignator = variant.toQString(); break; default: return CValueObject::setPropertyByIndex(variant, index); diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h index d4991b8f8..abfda4fdd 100644 --- a/src/blackmisc/avcallsign.h +++ b/src/blackmisc/avcallsign.h @@ -70,10 +70,10 @@ namespace BlackMisc virtual BlackMisc::CIcon toIcon() const override { return convertToIcon(*this); } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Valid callsign? static bool isValidCallsign(const QString &callsign); diff --git a/src/blackmisc/aviomodulator.cpp b/src/blackmisc/aviomodulator.cpp index 197c1754a..5a95f24cb 100644 --- a/src/blackmisc/aviomodulator.cpp +++ b/src/blackmisc/aviomodulator.cpp @@ -13,6 +13,7 @@ #include "blackmisc/avioadfsystem.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" using BlackMisc::PhysicalQuantities::CFrequency; using BlackMisc::PhysicalQuantities::CFrequencyUnit; @@ -34,9 +35,9 @@ namespace BlackMisc /* * Property by index */ - template QVariant CModulator::propertyByIndex(const CPropertyIndex &index) const + template CVariant CModulator::propertyByIndex(const CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { @@ -45,11 +46,11 @@ namespace BlackMisc case IndexStandbyFrequency: return this->getFrequencyStandby().propertyByIndex(index.copyFrontRemoved()); case IndexEnabled: - return QVariant(this->isEnabled()); + return CVariant::from(this->isEnabled()); case IndexInputVolume: - return QVariant(this->getVolumeInput()); + return CVariant::from(this->getVolumeInput()); case IndexOutputVolume: - return QVariant(this->getVolumeOutput()); + return CVariant::from(this->getVolumeOutput()); default: return CValueObject::propertyByIndex(index); } @@ -58,11 +59,11 @@ namespace BlackMisc /* * Property by index */ - template void CModulator::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + template void CModulator::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h index b855a5c08..3ba12817b 100644 --- a/src/blackmisc/aviomodulator.h +++ b/src/blackmisc/aviomodulator.h @@ -90,10 +90,10 @@ namespace BlackMisc void setEnabled(bool enable) { this->m_enabled = enable;} //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! Default constructor diff --git a/src/blackmisc/aviotransponder.cpp b/src/blackmisc/aviotransponder.cpp index 44ec29d4b..abf6ac154 100644 --- a/src/blackmisc/aviotransponder.cpp +++ b/src/blackmisc/aviotransponder.cpp @@ -10,6 +10,7 @@ #include "blackmisc/aviotransponder.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" namespace BlackMisc { @@ -156,36 +157,36 @@ namespace BlackMisc /* * Property */ - QVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const + CVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexMode: - return QVariant(this->getTransponderMode()); + return CVariant::from(static_cast(this->getTransponderMode())); case IndexModeAsString: - return QVariant(this->getModeAsString()); + return CVariant::from(this->getModeAsString()); case IndexTransponderCode: - return QVariant(this->getTransponderCode()); + return CVariant::from(this->getTransponderCode()); case IndexTransponderCodeFormatted: - return QVariant(this->getTransponderCodeFormatted()); + return CVariant::from(this->getTransponderCodeFormatted()); case IndexTransponderCodeAndModeFormatted: - return QVariant(this->getTransponderCodeAndModeFormatted()); + return CVariant::from(this->getTransponderCodeAndModeFormatted()); default: break; } Q_ASSERT_X(false, "CTransponder", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } - void CTransponder::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + void CTransponder::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -195,7 +196,7 @@ namespace BlackMisc this->setTransponderMode(static_cast(variant.toInt())); break; case IndexModeAsString: - this->setTransponderMode(modeFromString(variant.toString())); + this->setTransponderMode(modeFromString(variant.toQString())); break; case IndexTransponderCode: case IndexTransponderCodeFormatted: @@ -205,7 +206,7 @@ namespace BlackMisc } else { - this->setTransponderCode(variant.toString()); + this->setTransponderCode(variant.toQString()); } break; case IndexTransponderCodeAndModeFormatted: diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviotransponder.h index 48d201cc7..ac5ccd3be 100644 --- a/src/blackmisc/aviotransponder.h +++ b/src/blackmisc/aviotransponder.h @@ -143,10 +143,10 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Is valid transponder code? static bool isValidTransponderCode(const QString &transponderCode); diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/coordinategeodetic.cpp index 480f065f2..95ba3b831 100644 --- a/src/blackmisc/coordinategeodetic.cpp +++ b/src/blackmisc/coordinategeodetic.cpp @@ -11,6 +11,7 @@ #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" #include "mathematics.h" +#include "variant.h" #include using namespace BlackMisc::PhysicalQuantities; @@ -111,7 +112,7 @@ namespace BlackMisc /* * Property by index */ - QVariant ICoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant ICoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { if (!index.isMyself()) { @@ -123,9 +124,9 @@ namespace BlackMisc case IndexLongitude: return this->longitude().propertyByIndex(index.copyFrontRemoved()); case IndexLatitudeAsString: - return QVariant(this->latitudeAsString()); + return CVariant(this->latitudeAsString()); case IndexLongitudeAsString: - return QVariant(this->longitudeAsString()); + return CVariant(this->longitudeAsString()); default: break; } @@ -133,30 +134,30 @@ namespace BlackMisc Q_ASSERT_X(false, "ICoordinateGeodetic", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } /* * Property by index */ - QVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexLatitude: return this->m_latitude.propertyByIndex(index.copyFrontRemoved()); case IndexLatitudeAsString: - return QVariant(this->m_latitude.toQString()); + return CVariant(this->m_latitude.toQString()); case IndexLongitude: return this->m_longitude.propertyByIndex(index.copyFrontRemoved()); case IndexLongitudeAsString: - return QVariant(this->m_longitude.toQString()); + return CVariant(this->m_longitude.toQString()); case IndexGeodeticHeight: return this->m_geodeticHeight.propertyByIndex(index.copyFrontRemoved()); case IndexGeodeticHeightAsString: - return QVariant(this->m_geodeticHeight.toQString()); + return CVariant(this->m_geodeticHeight.toQString()); default: if (ICoordinateGeodetic::canHandleIndex(index)) { @@ -169,11 +170,11 @@ namespace BlackMisc /* * Set property as index */ - void CCoordinateGeodetic::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CCoordinateGeodetic::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -189,13 +190,13 @@ namespace BlackMisc this->setLongitude(variant.value()); break; case IndexLatitudeAsString: - this->setLatitude(CLatitude::fromWgs84(variant.toString())); + this->setLatitude(CLatitude::fromWgs84(variant.toQString())); break; case IndexLongitudeAsString: - this->setLongitude(CLongitude::fromWgs84(variant.toString())); + this->setLongitude(CLongitude::fromWgs84(variant.toQString())); break; case IndexGeodeticHeightAsString: - this->m_geodeticHeight.parseFromString(variant.toString()); + this->m_geodeticHeight.parseFromString(variant.toQString()); break; default: CValueObject::setPropertyByIndex(variant, index); diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/coordinategeodetic.h index 5397f9d9c..77b3ac952 100644 --- a/src/blackmisc/coordinategeodetic.h +++ b/src/blackmisc/coordinategeodetic.h @@ -49,7 +49,7 @@ namespace BlackMisc virtual const CLongitude &longitude() const = 0; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! Latitude as string QString latitudeAsString() const { return this->latitude().toQString(true); } @@ -124,10 +124,10 @@ namespace BlackMisc const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const { return this->m_geodeticHeight; } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Switch unit of latitude / longitude CCoordinateGeodetic &switchUnit(const BlackMisc::PhysicalQuantities::CAngleUnit &unit) diff --git a/src/blackmisc/hwjoystickbutton.cpp b/src/blackmisc/hwjoystickbutton.cpp index 6e4b9b31b..45a472714 100644 --- a/src/blackmisc/hwjoystickbutton.cpp +++ b/src/blackmisc/hwjoystickbutton.cpp @@ -9,6 +9,7 @@ #include "hwjoystickbutton.h" #include "blackmiscfreefunctions.h" +#include "variant.h" #include namespace BlackMisc @@ -29,11 +30,11 @@ namespace BlackMisc this->m_buttonIndex = button.m_buttonIndex; } - void CJoystickButton::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + void CJoystickButton::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -53,23 +54,23 @@ namespace BlackMisc } } - QVariant CJoystickButton::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CJoystickButton::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexButton: - return QVariant(this->getButtonIndex()); + return CVariant::from(this->getButtonIndex()); case IndexButtonAsString: - return QVariant(this->getButtonAsString()); + return CVariant::from(this->getButtonAsString()); default: break; } Q_ASSERT_X(false, "CJoystickButton", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } QString CJoystickButton::buttonIndexToString(qint32 buttonIndex) diff --git a/src/blackmisc/hwjoystickbutton.h b/src/blackmisc/hwjoystickbutton.h index abf6ec6a2..6029c6d71 100644 --- a/src/blackmisc/hwjoystickbutton.h +++ b/src/blackmisc/hwjoystickbutton.h @@ -54,10 +54,10 @@ namespace BlackMisc void setButtonObject(const BlackMisc::Hardware::CJoystickButton &button); //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index); + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const CPropertyIndex &index) const; + virtual CVariant propertyByIndex(const CPropertyIndex &index) const; //! Button index to string static QString buttonIndexToString(qint32 buttonIndex); diff --git a/src/blackmisc/hwkeyboardkey.cpp b/src/blackmisc/hwkeyboardkey.cpp index c7fc5f21b..2b63bda95 100644 --- a/src/blackmisc/hwkeyboardkey.cpp +++ b/src/blackmisc/hwkeyboardkey.cpp @@ -10,6 +10,7 @@ #include "hwkeyboardkey.h" #include "blackmiscfreefunctions.h" #include "propertyindex.h" +#include "variant.h" #include namespace BlackMisc @@ -245,40 +246,40 @@ namespace BlackMisc return ks; } - QVariant CKeyboardKey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CKeyboardKey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexModifier1: - return QVariant(static_cast(this->m_modifier1)); + return CVariant::from(static_cast(this->m_modifier1)); case IndexModifier2: - return QVariant(static_cast(this->m_modifier2)); + return CVariant::from(static_cast(this->m_modifier2)); case IndexModifier1AsString: - return QVariant(this->getModifier1AsString()); + return CVariant::from(this->getModifier1AsString()); case IndexModifier2AsString: - return QVariant(this->getModifier2AsString()); + return CVariant::from(this->getModifier2AsString()); case IndexKey: - return QVariant(this->m_qtKey); + return CVariant::from(static_cast(this->m_qtKey)); case IndexKeyAsString: - return QVariant(QString(QChar(this->m_qtKey))); + return CVariant::from(QString(QChar(this->m_qtKey))); case IndexKeyAsStringRepresentation: - return QVariant(this->getKeyAsStringRepresentation()); + return CVariant::from(this->getKeyAsStringRepresentation()); default: break; } Q_ASSERT_X(false, "CKeyboardKey", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } - void CKeyboardKey::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CKeyboardKey::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h index 269403339..9196257db 100644 --- a/src/blackmisc/hwkeyboardkey.h +++ b/src/blackmisc/hwkeyboardkey.h @@ -180,10 +180,10 @@ namespace BlackMisc bool equalsWithRelaxedModifiers(const CKeyboardKey &key) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! Modifier to string static QString modifierToString(Modifier modifier); diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp index 91135798b..665b37e05 100644 --- a/src/blackmisc/namevariantpair.cpp +++ b/src/blackmisc/namevariantpair.cpp @@ -50,20 +50,20 @@ namespace BlackMisc /* * Property by index */ - QVariant CNameVariantPair::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CNameVariantPair::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexName: - return QVariant(this->m_name); + return CVariant(this->m_name); case IndexVariant: - return this->m_variant.toQVariant(); + return this->m_variant; case IndexIcon: - return this->m_icon.toQVariant(); + return this->m_icon.toCVariant(); case IndexPixmap: - return this->m_icon.toPixmap(); + return CVariant(this->m_icon.toPixmap()); default: return CValueObject::propertyByIndex(index); } @@ -72,11 +72,11 @@ namespace BlackMisc /* * Property by index (setter) */ - void CNameVariantPair::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CNameVariantPair::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index 56829b846..72cf7af00 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -58,10 +58,10 @@ namespace BlackMisc bool hasIcon() const; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString() diff --git a/src/blackmisc/nwaircraftmapping.cpp b/src/blackmisc/nwaircraftmapping.cpp index 08e16c53b..31ba85c47 100644 --- a/src/blackmisc/nwaircraftmapping.cpp +++ b/src/blackmisc/nwaircraftmapping.cpp @@ -9,6 +9,7 @@ #include "nwaircraftmapping.h" #include "propertyindex.h" +#include "variant.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; @@ -45,9 +46,9 @@ namespace BlackMisc /* * Property by index */ - QVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { @@ -62,17 +63,17 @@ namespace BlackMisc } Q_ASSERT_X(false, "CAircraftMapping", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } /* * Set property as index */ - void CAircraftMapping::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftMapping::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h index 3fb35f10e..232fa0f65 100644 --- a/src/blackmisc/nwaircraftmapping.h +++ b/src/blackmisc/nwaircraftmapping.h @@ -49,10 +49,10 @@ namespace BlackMisc CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model); //! \copydoc CValueObject::propertyByIndex - QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! ICAO void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; } diff --git a/src/blackmisc/nwaircraftmodel.cpp b/src/blackmisc/nwaircraftmodel.cpp index 131d72e93..4ced84c48 100644 --- a/src/blackmisc/nwaircraftmodel.cpp +++ b/src/blackmisc/nwaircraftmodel.cpp @@ -8,6 +8,7 @@ */ #include "nwaircraftmodel.h" +#include "variant.h" #include namespace BlackMisc @@ -28,17 +29,17 @@ namespace BlackMisc /* * Property by index */ - QVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexModelString: - return QVariant(this->m_modelString); + return CVariant::from(this->m_modelString); break; case IndexIsQueriedModelString: - return QVariant(this->m_queriedModelStringFlag); + return CVariant::from(this->m_queriedModelStringFlag); break; default: return CValueObject::propertyByIndex(index); @@ -49,18 +50,18 @@ namespace BlackMisc /* * Set property as index */ - void CAircraftModel::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftModel::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { case IndexModelString: - this->m_modelString = variant.toString(); + this->m_modelString = variant.toQString(); break; case IndexIsQueriedModelString: this->m_queriedModelStringFlag = variant.toBool(); diff --git a/src/blackmisc/nwaircraftmodel.h b/src/blackmisc/nwaircraftmodel.h index 2c9b71307..b3da8621f 100644 --- a/src/blackmisc/nwaircraftmodel.h +++ b/src/blackmisc/nwaircraftmodel.h @@ -39,10 +39,10 @@ namespace BlackMisc CAircraftModel(const QString &model, bool isQueriedString) : m_modelString(model), m_queriedModelStringFlag(isQueriedString) {} //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Queried model string const QString &getModelString() const { return this->m_modelString; } diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp index 4e063da5b..0fd224290 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/nwclient.cpp @@ -75,16 +75,16 @@ namespace BlackMisc /* * Property by index */ - QVariant CClient::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CClient::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexCapabilities: - return this->m_capabilities.toQVariant(); + return this->m_capabilities.toCVariant(); case IndexCapabilitiesString: - return QVariant(this->getCapabilitiesAsString()); + return CVariant(this->getCapabilitiesAsString()); case IndexCallsign: return this->getCallsign().propertyByIndex(index.copyFrontRemoved()); case IndexUser: @@ -92,15 +92,15 @@ namespace BlackMisc case IndexModel: return this->m_model.propertyByIndex(index.copyFrontRemoved()); case IndexServer: - return QVariant(this->m_server); + return CVariant(this->m_server); case IndexVoiceCapabilities: return this->m_voiceCapabilities.propertyByIndex(index.copyFrontRemoved()); case IndexVoiceCapabilitiesPixmap: - return QVariant(this->m_voiceCapabilities.toPixmap()); + return CVariant::from(this->m_voiceCapabilities.toPixmap()); case IndexVoiceCapabilitiesIcon: - return QVariant(this->m_voiceCapabilities.toIcon().toQVariant()); + return this->m_voiceCapabilities.toIcon().toCVariant(); case IndexVoiceCapabilitiesString: - return QVariant(this->m_voiceCapabilities.toQString(true)); + return CVariant(this->m_voiceCapabilities.toQString(true)); default: return CValueObject::propertyByIndex(index); } @@ -109,11 +109,11 @@ namespace BlackMisc /* * Set property as index */ - void CClient::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CClient::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -126,7 +126,7 @@ namespace BlackMisc this->m_model.setPropertyByIndex(variant, index.copyFrontRemoved());; break; case IndexServer: - this->m_server = variant.toString(); + this->m_server = variant.toQString(); break; case IndexUser: this->m_user.setPropertyByIndex(variant, index.copyFrontRemoved()); diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/nwclient.h index a1e5bed72..53fdc7279 100644 --- a/src/blackmisc/nwclient.h +++ b/src/blackmisc/nwclient.h @@ -112,10 +112,10 @@ namespace BlackMisc virtual CIcon toIcon() const override { return this->m_user.toIcon(); } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString @@ -133,7 +133,13 @@ namespace BlackMisc } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CClient, (o.m_user, o.m_model, o.m_capabilities, o.m_server, o.m_voiceCapabilities)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CClient, ( + o.m_user, + o.m_model, + attr(o.m_capabilities, flags()), + o.m_server, + o.m_voiceCapabilities +)) Q_DECLARE_METATYPE(BlackMisc::Network::CClient) #endif // guard diff --git a/src/blackmisc/nwserver.cpp b/src/blackmisc/nwserver.cpp index 533bdcd67..466317976 100644 --- a/src/blackmisc/nwserver.cpp +++ b/src/blackmisc/nwserver.cpp @@ -10,6 +10,7 @@ #include "nwserver.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" #include namespace BlackMisc @@ -52,41 +53,41 @@ namespace BlackMisc /* * Property by index */ - QVariant CServer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CServer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexAddress: - return QVariant::fromValue(this->m_address); + return CVariant::fromValue(this->m_address); case IndexDescription: - return QVariant::fromValue(this->m_description); + return CVariant::fromValue(this->m_description); case IndexName: - return QVariant::fromValue(this->m_name); + return CVariant::fromValue(this->m_name); case IndexPort: - return QVariant::fromValue(this->m_port); + return CVariant::fromValue(this->m_port); case IndexUser: return this->m_user.propertyByIndex(index.copyFrontRemoved()); case IndexIsAcceptingConnections: - return QVariant::fromValue(this->m_isAcceptingConnections); + return CVariant::fromValue(this->m_isAcceptingConnections); default: break; } Q_ASSERT_X(false, "CServer", "index unknown"); QString m = QString("no property, index ").append(index.toQString()); - return QVariant::fromValue(m); + return CVariant::fromValue(m); } /* * Property by index (setter) */ - void CServer::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CServer::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/nwserver.h index 1fb3b6dbe..0786ed796 100644 --- a/src/blackmisc/nwserver.h +++ b/src/blackmisc/nwserver.h @@ -87,10 +87,10 @@ namespace BlackMisc BlackMisc::CStatusMessageList validate() const; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString() diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/nwuser.cpp index f84d91777..514df5bd9 100644 --- a/src/blackmisc/nwuser.cpp +++ b/src/blackmisc/nwuser.cpp @@ -11,6 +11,7 @@ #include "blackmisc/icon.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" #include namespace BlackMisc @@ -82,20 +83,20 @@ namespace BlackMisc /* * Property by index */ - QVariant CUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexEmail: - return QVariant(this->m_email); + return CVariant(this->m_email); case IndexId: - return QVariant(this->m_id); + return CVariant(this->m_id); case IndexPassword: - return QVariant(this->m_password); + return CVariant(this->m_password); case IndexRealName: - return QVariant(this->m_realname); + return CVariant(this->m_realname); case IndexCallsign: return this->m_callsign.propertyByIndex(index.copyFrontRemoved()); default: @@ -106,11 +107,11 @@ namespace BlackMisc /* * Set property as index */ - void CUser::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CUser::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/nwuser.h index b7e718427..0cbcc8c25 100644 --- a/src/blackmisc/nwuser.h +++ b/src/blackmisc/nwuser.h @@ -118,10 +118,10 @@ namespace BlackMisc virtual BlackMisc::CIcon toIcon() const override { return this->getCallsign().toIcon(); } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; /*! * This and another user exchange missing data. diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp index b43fa329a..fd514523c 100644 --- a/src/blackmisc/pqphysicalquantity.cpp +++ b/src/blackmisc/pqphysicalquantity.cpp @@ -290,26 +290,26 @@ namespace BlackMisc /* * Property */ - template QVariant CPhysicalQuantity::propertyByIndex(const CPropertyIndex &index) const + template CVariant CPhysicalQuantity::propertyByIndex(const CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexValue: - return QVariant(this->m_value); + return CVariant::from(this->m_value); case IndexUnit: - return this->m_unit.toQVariant(); + return this->m_unit.toCVariant(); case IndexValueRounded0DigitsWithUnit: - return QVariant(this->valueRoundedWithUnit(0)); + return CVariant::from(this->valueRoundedWithUnit(0)); case IndexValueRounded1DigitsWithUnit: - return QVariant(this->valueRoundedWithUnit(1)); + return CVariant::from(this->valueRoundedWithUnit(1)); case IndexValueRounded2DigitsWithUnit: - return QVariant(this->valueRoundedWithUnit(2)); + return CVariant::from(this->valueRoundedWithUnit(2)); case IndexValueRounded3DigitsWithUnit: - return QVariant(this->valueRoundedWithUnit(3)); + return CVariant::from(this->valueRoundedWithUnit(3)); case IndexValueRounded6DigitsWithUnit: - return QVariant(this->valueRoundedWithUnit(6)); + return CVariant::from(this->valueRoundedWithUnit(6)); default: return CValueObject::propertyByIndex(index); } @@ -318,11 +318,11 @@ namespace BlackMisc /* * Property */ - template void CPhysicalQuantity::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + template void CPhysicalQuantity::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -332,14 +332,14 @@ namespace BlackMisc this->m_value = variant.toDouble(); break; case IndexUnit: - this->m_unit.convertFromQVariant(variant); + this->m_unit.convertFromCVariant(variant); break; case IndexValueRounded0DigitsWithUnit: case IndexValueRounded1DigitsWithUnit: case IndexValueRounded2DigitsWithUnit: case IndexValueRounded3DigitsWithUnit: case IndexValueRounded6DigitsWithUnit: - this->parseFromString(variant.toString()); + this->parseFromString(variant.toQString()); break; default: CValueObject::setPropertyByIndex(variant, index); diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h index ee6a16df5..a8f58abf1 100644 --- a/src/blackmisc/pqphysicalquantity.h +++ b/src/blackmisc/pqphysicalquantity.h @@ -236,10 +236,10 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! Constructor with double diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index ec9366283..4239be2d6 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -21,7 +21,7 @@ namespace BlackMisc /* * Constructor single value */ - CPropertyIndexVariantMap::CPropertyIndexVariantMap(const CPropertyIndex &index, const QVariant &value) + CPropertyIndexVariantMap::CPropertyIndexVariantMap(const CPropertyIndex &index, const CVariant &value) : m_wildcard(false) { this->addValue(index, value); @@ -125,7 +125,7 @@ namespace BlackMisc /* * Add value */ - void CPropertyIndexVariantMap::addValue(const CPropertyIndex &index, const QVariant &value) + void CPropertyIndexVariantMap::addValue(const CPropertyIndex &index, const CVariant &value) { this->m_values.insert(index, value); } diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 945bfd1b8..8ee1846a7 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -44,13 +44,13 @@ namespace BlackMisc CPropertyIndexVariantMap(bool wildcard = false); //! Single value constructor - CPropertyIndexVariantMap(const CPropertyIndex &index, const QVariant &value); + CPropertyIndexVariantMap(const CPropertyIndex &index, const CVariant &value); //! Destructor virtual ~CPropertyIndexVariantMap() {} //! Add a value - void addValue(const CPropertyIndex &index, const QVariant &value); + void addValue(const CPropertyIndex &index, const CVariant &value); //! Add a value void addValue(const CPropertyIndex &index, const QVariant &value) { this->addValue(index, CVariant(value)); } @@ -58,17 +58,17 @@ namespace BlackMisc //! Add QString as literal, disambiguate as I want to add QString void addValue(const CPropertyIndex &index, const char *str); - //! Add a value as non QVariant + //! Add a value as non CVariant template void addValue(const CPropertyIndex &index, const T &value) { this->m_values.insert(index, CVariant::fromValue(value)); } //! Is empty? bool isEmpty() const { return this->m_values.isEmpty(); } //! Value - QVariant value(const CPropertyIndex &index) const { return this->m_values.value(index).toQVariant(); } + CVariant value(const CPropertyIndex &index) const { return this->m_values.value(index).toCVariant(); } //! Set value - void value(const CPropertyIndex &index, const QVariant &value) { this->m_values.value(index, value); } + void value(const CPropertyIndex &index, const CVariant &value) { this->m_values.value(index, value); } //! Indexes CPropertyIndexList indexes() const; diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp index dd9cf56fb..9952eeacb 100644 --- a/src/blackmisc/setkeyboardhotkey.cpp +++ b/src/blackmisc/setkeyboardhotkey.cpp @@ -9,6 +9,7 @@ #include "setkeyboardhotkey.h" #include "blackmiscfreefunctions.h" +#include "variant.h" #include namespace BlackMisc @@ -39,40 +40,40 @@ namespace BlackMisc m_key = obj.m_key; } - QVariant CSettingKeyboardHotkey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CSettingKeyboardHotkey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexFunction: - return QVariant(m_hotkeyFunction.getFunction()); + return CVariant::from(static_cast(m_hotkeyFunction.getFunction())); case IndexFunctionAsString: - return QVariant(m_hotkeyFunction.getFunctionAsString()); + return CVariant::from(m_hotkeyFunction.getFunctionAsString()); case IndexModifier1: - return QVariant(static_cast(m_key.getModifier1())); + return CVariant::from(static_cast(m_key.getModifier1())); case IndexModifier2: - return QVariant(static_cast(m_key.getModifier2())); + return CVariant::from(static_cast(m_key.getModifier2())); case IndexModifier1AsString: - return QVariant(m_key.getModifier1AsString()); + return CVariant::from(m_key.getModifier1AsString()); case IndexModifier2AsString: - return QVariant(m_key.getModifier2AsString()); + return CVariant::from(m_key.getModifier2AsString()); case IndexKey: - return QVariant(m_key.getKeyAsQtKey()); + return CVariant::from(static_cast(m_key.getKeyAsQtKey())); case IndexKeyAsString: - return QVariant(QString(QChar(m_key.getKeyAsQtKey()))); + return CVariant::from(QString(QChar(m_key.getKeyAsQtKey()))); case IndexKeyAsStringRepresentation: - return QVariant(m_key.getKeyAsStringRepresentation()); + return CVariant::from(m_key.getKeyAsStringRepresentation()); default: return CValueObject::propertyByIndex(index); } } - void CSettingKeyboardHotkey::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CSettingKeyboardHotkey::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 7de68701d..caf9b7a0a 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -82,10 +82,10 @@ namespace BlackMisc static QString toStringRepresentation(int key) { return Hardware::CKeyboardKey::toStringRepresentation(key); } //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 73b100ce5..359684060 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -241,29 +241,29 @@ namespace BlackMisc /* * Property by index */ - QVariant CStatusMessage::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CStatusMessage::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexMessage: - return QVariant(this->m_message); + return CVariant::from(this->m_message); case IndexSeverity: - return QVariant(static_cast(this->m_severity)); + return CVariant::from(static_cast(this->m_severity)); case IndexSeverityAsString: - return QVariant(this->getSeverityAsString()); + return CVariant::from(this->getSeverityAsString()); case IndexTimestamp: - return QVariant(this->m_timestamp); + return CVariant::from(this->m_timestamp); case IndexTimestampFormatted: { if (this->m_timestamp.isNull() || !this->m_timestamp.isValid()) return ""; return this->m_timestamp.toString("HH:mm::ss.zzz"); } case IndexCategories: - return QVariant(this->m_categories.toQString()); + return CVariant::from(this->m_categories.toQString()); case IndexCategoryHumanReadable: - return QVariant(this->getHumanReadableCategory()); + return CVariant::from(this->getHumanReadableCategory()); default: return CValueObject::propertyByIndex(index); } @@ -272,11 +272,11 @@ namespace BlackMisc /* * Set property as index */ - void CStatusMessage::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CStatusMessage::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index 6a1744530..4df907ab6 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -121,10 +121,10 @@ namespace BlackMisc static const QStringList &allSeverityStrings(); //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! To HTML QString toHtml() const; diff --git a/src/blackmisc/testing.cpp b/src/blackmisc/testing.cpp index 8defceebc..93bf2ad90 100644 --- a/src/blackmisc/testing.cpp +++ b/src/blackmisc/testing.cpp @@ -47,15 +47,15 @@ namespace BlackMisc if (byPropertyIndex) { CAtcStation station; - station.setPropertyByIndex(CCallsign(cs).toQVariant(), CAtcStation::IndexCallsign); - station.setPropertyByIndex(user.toQVariant(), CAtcStation::IndexController); - station.setPropertyByIndex(CFrequency(f, CFrequencyUnit::MHz()).toQVariant(), CAtcStation::IndexFrequency); - station.setPropertyByIndex(CLength(50, CLengthUnit::km()).toQVariant(), CAtcStation::IndexRange); - station.setPropertyByIndex(geoPos.toQVariant(), CAtcStation::IndexPosition); - station.setPropertyByIndex(false, CAtcStation::IndexIsOnline); - station.setPropertyByIndex(dtFrom, CAtcStation::IndexBookedFrom); - station.setPropertyByIndex(dtUntil, CAtcStation::IndexBookedUntil); - station.setPropertyByIndex(CLength(index + 1, CLengthUnit::NM()).toQVariant(), CAtcStation::IndexDistance); + station.setPropertyByIndex(CCallsign(cs).toCVariant(), CAtcStation::IndexCallsign); + station.setPropertyByIndex(user.toCVariant(), CAtcStation::IndexController); + station.setPropertyByIndex(CFrequency(f, CFrequencyUnit::MHz()).toCVariant(), CAtcStation::IndexFrequency); + station.setPropertyByIndex(CLength(50, CLengthUnit::km()).toCVariant(), CAtcStation::IndexRange); + station.setPropertyByIndex(geoPos.toCVariant(), CAtcStation::IndexPosition); + station.setPropertyByIndex(CVariant::from(false), CAtcStation::IndexIsOnline); + station.setPropertyByIndex(CVariant::from(dtFrom), CAtcStation::IndexBookedFrom); + station.setPropertyByIndex(CVariant::from(dtUntil), CAtcStation::IndexBookedUntil); + station.setPropertyByIndex(CLength(index + 1, CLengthUnit::NM()).toCVariant(), CAtcStation::IndexDistance); return station; } else @@ -81,11 +81,11 @@ namespace BlackMisc QString r; if (byPropertyIndex) { - r.append(station.propertyByIndex({ CAtcStation::IndexCallsign, CCallsign::IndexString}).toString()); - r.append(station.propertyByIndex({ CAtcStation::IndexController, CUser::IndexRealName}).toString()); - r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLatitudeAsString}).toString()); - r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLongitudeAsString}).toString()); - r.append(station.propertyByIndex({ CAtcStation::IndexDistance, CLength::IndexValueRounded2DigitsWithUnit}).toString()); + r.append(station.propertyByIndex({ CAtcStation::IndexCallsign, CCallsign::IndexString}).toQString()); + r.append(station.propertyByIndex({ CAtcStation::IndexController, CUser::IndexRealName}).toQString()); + r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLatitudeAsString}).toQString()); + r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLongitudeAsString}).toQString()); + r.append(station.propertyByIndex({ CAtcStation::IndexDistance, CLength::IndexValueRounded2DigitsWithUnit}).toQString()); r.append(station.propertyByIndex({ CAtcStation::IndexBookedFrom}).toDateTime().toString("YYYY-mm-dd hh:mm")); r.append(station.propertyByIndex({ CAtcStation::IndexBookedUntil}).toDateTime().toString("YYYY-mm-dd hh:mm")); } diff --git a/src/blackmisc/valueobject.cpp b/src/blackmisc/valueobject.cpp index 889050b5c..e0db3860c 100644 --- a/src/blackmisc/valueobject.cpp +++ b/src/blackmisc/valueobject.cpp @@ -54,11 +54,11 @@ namespace BlackMisc /* * Setter for property by index */ - void CValueObject::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + void CValueObject::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } @@ -70,18 +70,18 @@ namespace BlackMisc /* * By index */ - QVariant CValueObject::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CValueObject::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexIcon: - return this->toIcon().toQVariant(); + return this->toIcon().toCVariant(); case IndexPixmap: - return QVariant(this->toPixmap()); + return CVariant::from(this->toPixmap()); case IndexString: - return QVariant(this->toQString()); + return CVariant(this->toQString()); default: break; } @@ -89,7 +89,7 @@ namespace BlackMisc // not all classes have implemented nesting const QString m = QString("Property by index not found, index: ").append(index.toQString()); qFatal("%s", qPrintable(m)); - return QVariant(m); // avoid compiler warning + return CVariant(m); // avoid compiler warning } /* @@ -98,17 +98,15 @@ namespace BlackMisc QString CValueObject::propertyByIndexAsString(const CPropertyIndex &index, bool i18n) const { // default implementation, requires propertyByIndex - QVariant qv = this->propertyByIndex(index); - return BlackMisc::qVariantToString(qv, i18n); + return this->propertyByIndex(index).toQString(i18n); } /* * Variant equal property index? */ - bool CValueObject::equalsPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const + bool CValueObject::equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const { - const QVariant myValue = this->propertyByIndex(index); - return BlackMisc::equalQVariants(myValue, compareValue); + return this->propertyByIndex(index) == compareValue; } /* @@ -159,7 +157,7 @@ namespace BlackMisc const auto &map = indexMap.map(); for (auto it = map.begin(); it != map.end(); ++it) { - const QVariant value = it.value().toQVariant(); + const CVariant value = it.value().toCVariant(); const CPropertyIndex index = it.key(); if (skipEqualValues) { @@ -206,9 +204,9 @@ namespace BlackMisc for (auto it = map.begin(); it != map.end(); ++it) { // QVariant cannot be compared directly - QVariant p = valueObject.propertyByIndex(it.key()); // from value object - QVariant v = it.value().toQVariant(); // from map - if (!BlackMisc::equalQVariants(p, v)) return false; + CVariant p = valueObject.propertyByIndex(it.key()); // from value object + CVariant v = it.value().toCVariant(); // from map + if (p != v) return false; } return true; } diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 9cf8d229d..fc19dd123 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -200,17 +200,17 @@ namespace BlackMisc virtual QPixmap toPixmap() const; //! Set property by index - virtual void setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index); + virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index); //! Property by index - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! Property by index as String //! \details Intentionally not abstract, avoiding all classes need to implement this method virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const; //! Is given variant equal to value of property index? - virtual bool equalsPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const; + virtual bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const; //! The stored object as CValueObject static const CValueObject *fromQVariant(const QVariant &variant); diff --git a/src/blackmisc/voiceroom.cpp b/src/blackmisc/voiceroom.cpp index 60363a7c5..ee5f21c55 100644 --- a/src/blackmisc/voiceroom.cpp +++ b/src/blackmisc/voiceroom.cpp @@ -10,6 +10,7 @@ #include "voiceroom.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" #include #include #include @@ -30,22 +31,22 @@ namespace BlackMisc /* * Property by index */ - QVariant CVoiceRoom::propertyByIndex(const CPropertyIndex &index) const + CVariant CVoiceRoom::propertyByIndex(const CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexAudioPlaying: - return QVariant(this->isAudioPlaying()); + return CVariant::from(this->isAudioPlaying()); case IndexConnected: - return QVariant(this->isConnected()); + return CVariant::from(this->isConnected()); case IndexChannel: - return QVariant(this->getChannel()); + return CVariant::from(this->getChannel()); case IndexHostname: - return QVariant(this->getHostname()); + return CVariant::from(this->getHostname()); case IndexUrl: - return QVariant(this->getVoiceRoomUrl()); + return CVariant::from(this->getVoiceRoomUrl()); default: return CValueObject::propertyByIndex(index); } @@ -54,11 +55,11 @@ namespace BlackMisc /* * Property by index */ - void CVoiceRoom::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index) + void CVoiceRoom::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } diff --git a/src/blackmisc/voiceroom.h b/src/blackmisc/voiceroom.h index 1508c7ded..65ae0eda1 100644 --- a/src/blackmisc/voiceroom.h +++ b/src/blackmisc/voiceroom.h @@ -87,10 +87,10 @@ namespace BlackMisc bool isAtis() const; //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; //! Protocol prefix "vvl" static const QString &protocol() { static QString p("vvl"); return p; } diff --git a/src/blacksim/fscommon/aircraftcfgentries.cpp b/src/blacksim/fscommon/aircraftcfgentries.cpp index b990d5536..2515d78d4 100644 --- a/src/blacksim/fscommon/aircraftcfgentries.cpp +++ b/src/blacksim/fscommon/aircraftcfgentries.cpp @@ -9,6 +9,7 @@ #include "aircraftcfgentries.h" #include "blackmisc/blackmiscfreefunctions.h" +#include "blackmisc/variant.h" using namespace BlackMisc; @@ -41,24 +42,24 @@ namespace BlackSim /* * Get particular column */ - QVariant CAircraftCfgEntries::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftCfgEntries::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexFilePath: - return QVariant(this->m_filePath); + return CVariant::from(this->m_filePath); case IndexTitle: - return QVariant(this->m_title); + return CVariant::from(this->m_title); case IndexAtcType: - return QVariant(this->m_atcType); + return CVariant::from(this->m_atcType); case IndexAtcModel: - return QVariant(this->m_atcModel); + return CVariant::from(this->m_atcModel); case IndexParkingCode: - return QVariant(this->m_atcParkingCode); + return CVariant::from(this->m_atcParkingCode); case IndexEntryIndex: - return QVariant(this->m_index); + return CVariant::from(this->m_index); default: return CValueObject::propertyByIndex(index); } @@ -67,29 +68,29 @@ namespace BlackSim /* * Set property as index */ - void CAircraftCfgEntries::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftCfgEntries::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { - if (index.isMyself()) { this->convertFromQVariant(variant); return; } + if (index.isMyself()) { this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { case IndexAtcModel: - this->setAtcModel(variant.toString()); + this->setAtcModel(variant.toQString()); break; case IndexAtcType: - this->setAtcType(variant.toString()); + this->setAtcType(variant.toQString()); break; case IndexEntryIndex: this->setIndex(variant.toInt()); break; case IndexFilePath: - this->setFilePath(variant.toString()); + this->setFilePath(variant.toQString()); break; case IndexParkingCode: - this->setAtcParkingCode(variant.toString()); + this->setAtcParkingCode(variant.toQString()); break; case IndexTitle: - this->setTitle(variant.toString()); + this->setTitle(variant.toQString()); break; default: CValueObject::setPropertyByIndex(variant, index); diff --git a/src/blacksim/fscommon/aircraftcfgentries.h b/src/blacksim/fscommon/aircraftcfgentries.h index f7368d280..2fef65c11 100644 --- a/src/blacksim/fscommon/aircraftcfgentries.h +++ b/src/blacksim/fscommon/aircraftcfgentries.h @@ -13,7 +13,6 @@ #define BLACKSIM_FSCOMMON_AIRCRAFTCFGENTRY_H #include "blackmisc/propertyindex.h" -#include namespace BlackSim { @@ -89,10 +88,10 @@ namespace BlackSim void setAtcParkingCode(const QString &parkingCode) { this->m_atcParkingCode = parkingCode; } //! \copydoc CValueObject::propertyByIndex - virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + virtual BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; + virtual void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index) override; protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blacksim/fscommon/aircraftmapping.cpp b/src/blacksim/fscommon/aircraftmapping.cpp index e444bd946..915e8224b 100644 --- a/src/blacksim/fscommon/aircraftmapping.cpp +++ b/src/blacksim/fscommon/aircraftmapping.cpp @@ -104,30 +104,30 @@ namespace BlackSim /* * Get column */ - QVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const + CVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const { - if (index.isMyself()) { return this->toQVariant(); } + if (index.isMyself()) { return this->toCVariant(); } ColumnIndex i = index.frontCasted(); switch (i) { case IndexMappingId: - return QVariant(this->m_mappingId); + return CVariant::from(this->m_mappingId); case IndexProposalId: - return QVariant(m_proposalId); + return CVariant::from(m_proposalId); case IndexAircraftKey: - return QVariant(m_fsAircraftKey); + return CVariant::from(m_fsAircraftKey); case IndexAircraftDesignator: - return QVariant(m_aircraftDesignator); + return CVariant::from(m_aircraftDesignator); case IndexAirlineDesignator: - return QVariant(m_airlineDesignator); + return CVariant::from(m_airlineDesignator); case IndexAircraftCombinedType: - return QVariant(m_aircraftCombinedType); + return CVariant::from(m_aircraftCombinedType); case IndexWakeTurbulenceCategory: - return QVariant(m_wakeTurbulenceCategory); + return CVariant::from(m_wakeTurbulenceCategory); case IndexAirlineColor: - return QVariant(this->m_aircraftColor); + return CVariant::from(this->m_aircraftColor); case IndexLastChanged: - return QVariant(this->getLastChangedFormatted()); + return CVariant::from(this->getLastChangedFormatted()); case IndexSimulatorInfo: return this->m_simulatorInfo.propertyByIndex(index.copyFrontRemoved()); default: @@ -138,47 +138,39 @@ namespace BlackSim /* * Set column's value */ - void CAircraftMapping::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) + void CAircraftMapping::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) { if (index.isMyself()) { - this->convertFromQVariant(variant); + this->convertFromCVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { case IndexMappingId: - { - bool ok = false; - qint32 id = variant.toInt(&ok); - this->m_mappingId = ok ? id : CAircraftMapping::InvalidId; - } + this->m_mappingId = variant.valueOrDefault(CAircraftMapping::InvalidId); break; case IndexProposalId: - { - bool ok = false; - qint32 id = variant.toInt(&ok); - this->m_proposalId = ok ? id : CAircraftMapping::InvalidId; - } + this->m_proposalId = variant.valueOrDefault(CAircraftMapping::InvalidId); break; case IndexAircraftKey: - m_fsAircraftKey = variant.toString(); + m_fsAircraftKey = variant.toQString(); break; case IndexAircraftDesignator: - this->setAircraftDesignator(variant.toString()); + this->setAircraftDesignator(variant.toQString()); break; case IndexAirlineDesignator: - this->setAirlineDesignator(variant.toString()); + this->setAirlineDesignator(variant.toQString()); break; case IndexAircraftCombinedType: - this->setAircraftCombinedType(variant.toString()); + this->setAircraftCombinedType(variant.toQString()); break; case IndexWakeTurbulenceCategory: - this->setWakeTurbulenceCategory(variant.toString()); + this->setWakeTurbulenceCategory(variant.toQString()); break; case IndexAirlineColor: - this->m_aircraftColor = variant.toString(); + this->m_aircraftColor = variant.toQString(); break; default: CValueObject::setPropertyByIndex(variant, index); diff --git a/src/blacksim/fscommon/aircraftmapping.h b/src/blacksim/fscommon/aircraftmapping.h index 59fe7ab93..97a98c9b4 100644 --- a/src/blacksim/fscommon/aircraftmapping.h +++ b/src/blacksim/fscommon/aircraftmapping.h @@ -15,7 +15,6 @@ #include "aircraftcfgentries.h" #include "blacksim/simulatorinfo.h" #include "blackmisc/valueobject.h" -#include #include namespace BlackSim @@ -141,10 +140,10 @@ namespace BlackSim void setSimulatorText(const QString &simulator); //! \copydoc CValueObject::propertyByIndex - QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; //! \copydoc CValueObject::setPropertyByIndex() - void setPropertyByIndex(const QVariant &value, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const BlackMisc::CVariant &value, const BlackMisc::CPropertyIndex &index) override; //! \copydoc CValueObject::getValueHash() virtual uint getValueHash() const override;