diff --git a/samples/blackmisc/samplesjson.cpp b/samples/blackmisc/samplesjson.cpp index 880878913..e9a0b6f02 100644 --- a/samples/blackmisc/samplesjson.cpp +++ b/samples/blackmisc/samplesjson.cpp @@ -31,7 +31,7 @@ namespace BlackMiscTest CLength l(123.456, CLengthUnit::NM()); QJsonObject json = l.toJson(); l = CLength(); //convert back - l.fromJson(json); + l.convertFromJson(json); qDebug() << json << l; qDebug() << "-------"; QDateTime dtFrom = QDateTime::currentDateTimeUtc(); @@ -45,7 +45,7 @@ namespace BlackMiscTest qDebug() << "-------"; station = CAtcStation(); - station.fromJson(json); + station.convertFromJson(json); qDebug() << station; qDebug() << "------- Enter -----"; cin.readLine(); @@ -66,7 +66,7 @@ namespace BlackMiscTest qDebug() << "-------"; aircraft = CAircraft(); - aircraft.fromJson(json); + aircraft.convertFromJson(json); qDebug() << aircraft; qDebug() << "------- Enter -----"; cin.readLine(); @@ -82,7 +82,7 @@ namespace BlackMiscTest cin.readLine(); stations.clear(); - stations.fromJson(json); + stations.convertFromJson(json); qDebug() << stations; cin.readLine(); diff --git a/samples/blackmisc/samplesvariant.cpp b/samples/blackmisc/samplesvariant.cpp index 072a3bee0..3d3ca8736 100644 --- a/samples/blackmisc/samplesvariant.cpp +++ b/samples/blackmisc/samplesvariant.cpp @@ -40,20 +40,20 @@ namespace BlackMiscTest qDebug() << (*ap_angle) << ap_angle->toQVariant().userType(); // This works, because ap is actually heading - ap_heading->fromQVariant(h2.toQVariant()); + ap_heading->convertFromQVariant(h2.toQVariant()); qDebug() << (*ap_heading) << ap_heading->toQVariant().userType(); // This works, angle from variant angle - ap_angle->fromQVariant(a1.toQVariant()); + ap_angle->convertFromQVariant(a1.toQVariant()); qDebug() << (*ap_angle) << ap_angle->toQVariant().userType(); // This gives me an unwanted(!) assert, canConvert is not smart enough to detect upcasting // because CValueObjects are not QObjects - ap_angle->fromQVariant(h2.toQVariant()); + ap_angle->convertFromQVariant(h2.toQVariant()); qDebug() << (*ap_angle) << ap_angle->toQVariant().userType(); // This gives me the intended assert, because I assign angle to heading - ap_heading->fromQVariant(a1.toQVariant()); + ap_heading->convertFromQVariant(a1.toQVariant()); qDebug() << (*ap_heading) << ap_heading->toQVariant().userType(); return 0; diff --git a/src/blackcore/context_settings_impl.cpp b/src/blackcore/context_settings_impl.cpp index 5512f9d9f..489dff688 100644 --- a/src/blackcore/context_settings_impl.cpp +++ b/src/blackcore/context_settings_impl.cpp @@ -50,7 +50,7 @@ namespace BlackCore // init network if (jsonObject.contains(IContextSettings::PathNetworkSettings())) { - this->m_settingsNetwork.fromJson( + this->m_settingsNetwork.convertFromJson( jsonObject.value(IContextSettings::PathNetworkSettings()).toObject() ); } @@ -62,7 +62,7 @@ namespace BlackCore // init audio if (jsonObject.contains(IContextSettings::PathAudioSettings())) { - this->m_settingsAudio.fromJson( + this->m_settingsAudio.convertFromJson( jsonObject.value(IContextSettings::PathAudioSettings()).toObject() ); } @@ -74,7 +74,7 @@ namespace BlackCore // init simulator if (jsonObject.contains(IContextSettings::PathSimulatorSettings())) { - this->m_settingsSimulator.fromJson( + this->m_settingsSimulator.convertFromJson( jsonObject.value(IContextSettings::PathSimulatorSettings()).toObject() ); } @@ -86,7 +86,7 @@ namespace BlackCore // init own members if (jsonObject.contains(IContextSettings::PathHotkeys())) { - this->m_hotkeys.fromJson( + this->m_hotkeys.convertFromJson( jsonObject.value(IContextSettings::PathHotkeys()).toObject() ); } diff --git a/src/blackmisc/audiodevice.cpp b/src/blackmisc/audiodevice.cpp index 1ca4aff29..bb69e2c51 100644 --- a/src/blackmisc/audiodevice.cpp +++ b/src/blackmisc/audiodevice.cpp @@ -145,7 +145,7 @@ namespace BlackMisc /* * From Json */ - void CAudioDevice::fromJson(const QJsonObject &json) + void CAudioDevice::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAudioDevice::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/audiodevice.h b/src/blackmisc/audiodevice.h index 8dd45b977..cdce893f9 100644 --- a/src/blackmisc/audiodevice.h +++ b/src/blackmisc/audiodevice.h @@ -74,14 +74,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/audiodevicelist.h b/src/blackmisc/audiodevicelist.h index 121b32359..d36acb26e 100644 --- a/src/blackmisc/audiodevicelist.h +++ b/src/blackmisc/audiodevicelist.h @@ -47,8 +47,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index f5a350793..432fefaa5 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -233,7 +233,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -289,7 +289,7 @@ namespace BlackMisc /* * From JSON */ - void CAircraft::fromJson(const QJsonObject &json) + void CAircraft::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h index 3d0f6c8ba..0a89c13e7 100644 --- a/src/blackmisc/avaircraft.h +++ b/src/blackmisc/avaircraft.h @@ -55,8 +55,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toIcon() virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); } @@ -228,8 +228,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex() virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/avaircrafticao.cpp index 57e313ebb..70c81991a 100644 --- a/src/blackmisc/avaircrafticao.cpp +++ b/src/blackmisc/avaircrafticao.cpp @@ -157,7 +157,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } @@ -212,7 +212,7 @@ namespace BlackMisc /* * To JSON */ - void CAircraftIcao::fromJson(const QJsonObject &json) + void CAircraftIcao::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAircraftIcao::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/avaircrafticao.h index c81ef6e01..19dfb69b9 100644 --- a/src/blackmisc/avaircrafticao.h +++ b/src/blackmisc/avaircrafticao.h @@ -66,8 +66,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Get ICAO designator, e.g. "B737" const QString &getAircraftDesignator() const { return m_aircraftDesignator; } @@ -148,8 +148,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/avaircraftlist.h b/src/blackmisc/avaircraftlist.h index b972dad2b..3afa11522 100644 --- a/src/blackmisc/avaircraftlist.h +++ b/src/blackmisc/avaircraftlist.h @@ -64,8 +64,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avaircraftsituation.cpp b/src/blackmisc/avaircraftsituation.cpp index aa015a44b..c958da454 100644 --- a/src/blackmisc/avaircraftsituation.cpp +++ b/src/blackmisc/avaircraftsituation.cpp @@ -148,7 +148,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } diff --git a/src/blackmisc/avaircraftsituation.h b/src/blackmisc/avaircraftsituation.h index f02489de6..4ce475fe0 100644 --- a/src/blackmisc/avaircraftsituation.h +++ b/src/blackmisc/avaircraftsituation.h @@ -65,8 +65,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Get position const BlackMisc::Geo::CCoordinateGeodetic &getPosition() const { return this->m_position; } diff --git a/src/blackmisc/avaircraftsituationlist.h b/src/blackmisc/avaircraftsituationlist.h index 3369ed008..61c9d9943 100644 --- a/src/blackmisc/avaircraftsituationlist.h +++ b/src/blackmisc/avaircraftsituationlist.h @@ -54,8 +54,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } }; } diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/avairport.cpp index f9b10af26..90d43ef45 100644 --- a/src/blackmisc/avairport.cpp +++ b/src/blackmisc/avairport.cpp @@ -94,7 +94,7 @@ namespace BlackMisc /* * From Json */ - void CAirport::fromJson(const QJsonObject &json) + void CAirport::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } @@ -199,7 +199,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/avairport.h b/src/blackmisc/avairport.h index a50bcc062..e7e13b9d5 100644 --- a/src/blackmisc/avairport.h +++ b/src/blackmisc/avairport.h @@ -53,8 +53,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Equal operator == bool operator ==(const CAirport &other) const; @@ -134,8 +134,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avairporticao.cpp b/src/blackmisc/avairporticao.cpp index 3f3e41d42..6d91964e7 100644 --- a/src/blackmisc/avairporticao.cpp +++ b/src/blackmisc/avairporticao.cpp @@ -58,7 +58,7 @@ namespace BlackMisc /* * To JSON */ - void CAirportIcao::fromJson(const QJsonObject &json) + void CAirportIcao::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAirportIcao::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avairporticao.h b/src/blackmisc/avairporticao.h index 1828b8622..85b1cbeaa 100644 --- a/src/blackmisc/avairporticao.h +++ b/src/blackmisc/avairporticao.h @@ -39,8 +39,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Is empty? bool isEmpty() const { return this->m_icaoCode.isEmpty(); } @@ -69,8 +69,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avairportlist.h b/src/blackmisc/avairportlist.h index 9be3c9a0b..da53301c1 100644 --- a/src/blackmisc/avairportlist.h +++ b/src/blackmisc/avairportlist.h @@ -55,8 +55,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avaltitude.cpp b/src/blackmisc/avaltitude.cpp index 76433c8d8..83a41b5cd 100644 --- a/src/blackmisc/avaltitude.cpp +++ b/src/blackmisc/avaltitude.cpp @@ -155,9 +155,9 @@ namespace BlackMisc /* * To JSON */ - void CAltitude::fromJson(const QJsonObject &json) + void CAltitude::convertFromJson(const QJsonObject &json) { - CLength::fromJson(json); + CLength::convertFromJson(json); BlackMisc::deserializeJson(json, CAltitude::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avaltitude.h b/src/blackmisc/avaltitude.h index f2e60d94a..5988c0611 100644 --- a/src/blackmisc/avaltitude.h +++ b/src/blackmisc/avaltitude.h @@ -102,14 +102,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::parseFromString(const QString &value) void parseFromString(const QString &value) override; diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/avatcstation.cpp index 35a92b925..aa88c91a6 100644 --- a/src/blackmisc/avatcstation.cpp +++ b/src/blackmisc/avatcstation.cpp @@ -189,7 +189,7 @@ namespace BlackMisc /* * From Json */ - void CAtcStation::fromJson(const QJsonObject &json) + void CAtcStation::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAtcStation::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -364,7 +364,7 @@ namespace BlackMisc */ void CAtcStation::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) { - if (index.isMyself()) { this->fromQVariant(variant); return; } + if (index.isMyself()) { this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h index c8e0895e5..e5edaf59c 100644 --- a/src/blackmisc/avatcstation.h +++ b/src/blackmisc/avatcstation.h @@ -71,8 +71,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toIcon() virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); } @@ -284,8 +284,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avatcstationlist.h b/src/blackmisc/avatcstationlist.h index dfd848888..461d314e4 100644 --- a/src/blackmisc/avatcstationlist.h +++ b/src/blackmisc/avatcstationlist.h @@ -65,8 +65,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index f6472a671..090eb15b5 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -116,7 +116,7 @@ namespace BlackMisc /* * To JSON */ - void CCallsign::fromJson(const QJsonObject &json) + void CCallsign::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CCallsign::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -148,7 +148,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h index 306221303..94ca9d6be 100644 --- a/src/blackmisc/avcallsign.h +++ b/src/blackmisc/avcallsign.h @@ -82,14 +82,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toIcon() virtual BlackMisc::CIcon toIcon() const override { return CCallsign::convertToIcon(*this); } diff --git a/src/blackmisc/avcallsignlist.h b/src/blackmisc/avcallsignlist.h index 9ae371297..63dd07ff9 100644 --- a/src/blackmisc/avcallsignlist.h +++ b/src/blackmisc/avcallsignlist.h @@ -36,8 +36,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avflightplan.cpp b/src/blackmisc/avflightplan.cpp index 37f3972bc..91e525643 100644 --- a/src/blackmisc/avflightplan.cpp +++ b/src/blackmisc/avflightplan.cpp @@ -94,7 +94,7 @@ namespace BlackMisc return BlackMisc::serializeJson(CFlightPlan::jsonMembers(), TupleConverter::toTuple(*this)); } - void CFlightPlan::fromJson(const QJsonObject &json) + void CFlightPlan::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CFlightPlan::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avflightplan.h b/src/blackmisc/avflightplan.h index 548a2d6df..1ea642359 100644 --- a/src/blackmisc/avflightplan.h +++ b/src/blackmisc/avflightplan.h @@ -190,8 +190,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; @@ -199,8 +199,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toIcon virtual CIcon toIcon() const override; diff --git a/src/blackmisc/avheading.cpp b/src/blackmisc/avheading.cpp index fa0683771..da6caf7cc 100644 --- a/src/blackmisc/avheading.cpp +++ b/src/blackmisc/avheading.cpp @@ -111,9 +111,9 @@ namespace BlackMisc /* * To JSON */ - void CHeading::fromJson(const QJsonObject &json) + void CHeading::convertFromJson(const QJsonObject &json) { - CAngle::fromJson(json); + CAngle::convertFromJson(json); BlackMisc::deserializeJson(json, CHeading::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avheading.h b/src/blackmisc/avheading.h index 53ba9db41..6ec9870f0 100644 --- a/src/blackmisc/avheading.h +++ b/src/blackmisc/avheading.h @@ -87,14 +87,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \brief Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avinformationmessage.cpp b/src/blackmisc/avinformationmessage.cpp index 1aa3bb271..59dcaf6dc 100644 --- a/src/blackmisc/avinformationmessage.cpp +++ b/src/blackmisc/avinformationmessage.cpp @@ -119,7 +119,7 @@ namespace BlackMisc /* * To JSON */ - void CInformationMessage::fromJson(const QJsonObject &json) + void CInformationMessage::convertFromJson(const QJsonObject &json) { this->m_message = json.value("m_message").toString(); this->m_type = static_cast(qRound(json.value("m_type").toDouble())); diff --git a/src/blackmisc/avinformationmessage.h b/src/blackmisc/avinformationmessage.h index b10ad777a..91bf36d32 100644 --- a/src/blackmisc/avinformationmessage.h +++ b/src/blackmisc/avinformationmessage.h @@ -58,8 +58,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Equal operator == bool operator ==(const CInformationMessage &other) const; @@ -114,8 +114,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviocomsystem.cpp b/src/blackmisc/aviocomsystem.cpp index fbaa89fe0..fc4427728 100644 --- a/src/blackmisc/aviocomsystem.cpp +++ b/src/blackmisc/aviocomsystem.cpp @@ -86,9 +86,9 @@ namespace BlackMisc /* * To JSON */ - void CComSystem::fromJson(const QJsonObject &json) + void CComSystem::convertFromJson(const QJsonObject &json) { - CModulator::fromJson(json); + CModulator::convertFromJson(json); BlackMisc::deserializeJson(json, CComSystem::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/aviocomsystem.h b/src/blackmisc/aviocomsystem.h index 60d38bc3b..ea8772735 100644 --- a/src/blackmisc/aviocomsystem.h +++ b/src/blackmisc/aviocomsystem.h @@ -79,8 +79,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Members static const QStringList &jsonMembers(); diff --git a/src/blackmisc/aviomodulator.cpp b/src/blackmisc/aviomodulator.cpp index 601a60193..442c08240 100644 --- a/src/blackmisc/aviomodulator.cpp +++ b/src/blackmisc/aviomodulator.cpp @@ -51,7 +51,7 @@ namespace BlackMisc /* * To JSON */ - template void CModulator::fromJson(const QJsonObject &json) + template void CModulator::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CModulator::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -87,7 +87,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h index 1b6585904..4886f0dbf 100644 --- a/src/blackmisc/aviomodulator.h +++ b/src/blackmisc/aviomodulator.h @@ -99,14 +99,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this->derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/aviotransponder.cpp b/src/blackmisc/aviotransponder.cpp index 03f8462cd..2d09b9693 100644 --- a/src/blackmisc/aviotransponder.cpp +++ b/src/blackmisc/aviotransponder.cpp @@ -219,7 +219,7 @@ namespace BlackMisc /* * From Json */ - void CTransponder::fromJson(const QJsonObject &json) + void CTransponder::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CTransponder::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -256,7 +256,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviotransponder.h index 5afe4f9f3..4ad697abf 100644 --- a/src/blackmisc/aviotransponder.h +++ b/src/blackmisc/aviotransponder.h @@ -162,14 +162,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::propertyByIndex virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/avselcal.cpp b/src/blackmisc/avselcal.cpp index dada3239e..0d4551b09 100644 --- a/src/blackmisc/avselcal.cpp +++ b/src/blackmisc/avselcal.cpp @@ -232,7 +232,7 @@ namespace BlackMisc /* * From Json */ - void CSelcal::fromJson(const QJsonObject &json) + void CSelcal::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CSelcal::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/avselcal.h b/src/blackmisc/avselcal.h index dcbd1285d..ad62dfec7 100644 --- a/src/blackmisc/avselcal.h +++ b/src/blackmisc/avselcal.h @@ -43,8 +43,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Is valid? bool isValid() const { return CSelcal::isValidCode(this->m_code); } @@ -70,8 +70,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/avtrack.cpp b/src/blackmisc/avtrack.cpp index dfa8bfee0..7c5c04b19 100644 --- a/src/blackmisc/avtrack.cpp +++ b/src/blackmisc/avtrack.cpp @@ -114,10 +114,10 @@ namespace BlackMisc /* * From Json */ - void CTrack::fromJson(const QJsonObject &json) + void CTrack::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CTrack::jsonMembers(), TupleConverter::toTuple(*this)); - CAngle::fromJson(json); + CAngle::convertFromJson(json); } } // namespace } // namespace diff --git a/src/blackmisc/avtrack.h b/src/blackmisc/avtrack.h index 31c387b2a..274fe0304 100644 --- a/src/blackmisc/avtrack.h +++ b/src/blackmisc/avtrack.h @@ -48,8 +48,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; @@ -80,8 +80,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \brief Register metadata static void registerMetadata(); diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 60fbc3998..8c1a05293 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -199,8 +199,8 @@ bool BlackMisc::equalQVariants(const QVariant &v1, const QVariant &v2) if (v1.userType() != v2.userType()) return false; // I have same types now - const CValueObject *cs1 = CValueObject::convertFromQVariant(v1); - const CValueObject *cs2 = CValueObject::convertFromQVariant(v2); + const CValueObject *cs1 = CValueObject::fromQVariant(v1); + const CValueObject *cs2 = CValueObject::fromQVariant(v2); if (cs1 && cs2) { int c = compare(*cs1, *cs2); @@ -264,8 +264,8 @@ int BlackMisc::compareQVariants(const QVariant &v1, const QVariant &v2) // BlackObject if (v1.type() == QVariant::UserType) { - const CValueObject *cs1 = CValueObject::convertFromQVariant(v1); - const CValueObject *cs2 = CValueObject::convertFromQVariant(v2); + const CValueObject *cs1 = CValueObject::fromQVariant(v1); + const CValueObject *cs2 = CValueObject::fromQVariant(v2); if (cs1 && cs2) { return compare(*cs1, *cs2); @@ -321,7 +321,7 @@ int BlackMisc::compareQVariants(const QVariant &v1, const QVariant &v2) QString BlackMisc::qVariantToString(const QVariant &qv, bool i18n) { if (qv.type() != QVariant::UserType) return qv.toString(); - const CValueObject *s = CValueObject::convertFromQVariant(qv); + const CValueObject *s = CValueObject::fromQVariant(qv); if (s) { return s->toQString(i18n); diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index 91de41a82..c8eea8fcc 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -94,8 +94,8 @@ namespace BlackMisc //! \copydoc BlackMisc::CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant< C >(&derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant< C >(&derived(), variant); } //! \copydoc BlackMisc::CValueObject::getValueHash virtual uint getValueHash() const override { return qHash(&derived()); } @@ -113,8 +113,8 @@ namespace BlackMisc return json; } - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override { QJsonArray array = json.value("containerbase").toArray(); for (auto i = array.begin(); i != array.end(); ++i) diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/coordinategeodetic.cpp index 4eaf1a996..a73e5b6f4 100644 --- a/src/blackmisc/coordinategeodetic.cpp +++ b/src/blackmisc/coordinategeodetic.cpp @@ -119,7 +119,7 @@ namespace BlackMisc /* * To JSON */ - void CCoordinateGeodetic::fromJson(const QJsonObject &json) + void CCoordinateGeodetic::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CCoordinateGeodetic::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -275,7 +275,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/coordinategeodetic.h index 05a980ddc..dde73ba4a 100644 --- a/src/blackmisc/coordinategeodetic.h +++ b/src/blackmisc/coordinategeodetic.h @@ -147,8 +147,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::propertyByIndex virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; @@ -192,8 +192,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index 66b74ecbc..8692c200f 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -210,8 +210,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc BlackMisc::CValueObject::getValueHash virtual uint getValueHash() const override { return qHash(this); } @@ -230,8 +230,8 @@ namespace BlackMisc return json; } - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override { QJsonArray array = json.value("associativecontainerbase").toArray(); for (auto it = array.begin(); it != array.end(); ++it) diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geoearthangle.h index 68c233e80..da04e7ebb 100644 --- a/src/blackmisc/geoearthangle.h +++ b/src/blackmisc/geoearthangle.h @@ -114,8 +114,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/hotkeyfunction.cpp b/src/blackmisc/hotkeyfunction.cpp index b0c3af89f..0fa06b26d 100644 --- a/src/blackmisc/hotkeyfunction.cpp +++ b/src/blackmisc/hotkeyfunction.cpp @@ -52,7 +52,7 @@ namespace BlackMisc } // From Json - void CHotkeyFunction::fromJson(const QJsonObject &json) + void CHotkeyFunction::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h index 9cb8c4a3b..c33baf861 100644 --- a/src/blackmisc/hotkeyfunction.h +++ b/src/blackmisc/hotkeyfunction.h @@ -52,8 +52,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; @@ -61,8 +61,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/hwkeyboardkey.cpp b/src/blackmisc/hwkeyboardkey.cpp index 425a99026..c5a75b097 100644 --- a/src/blackmisc/hwkeyboardkey.cpp +++ b/src/blackmisc/hwkeyboardkey.cpp @@ -35,7 +35,7 @@ namespace BlackMisc return BlackMisc::serializeJson(TupleConverter::toMetaTuple(*this)); } - void CKeyboardKey::fromJson(const QJsonObject &json) + void CKeyboardKey::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } @@ -344,7 +344,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h index fbb265200..41a63bed9 100644 --- a/src/blackmisc/hwkeyboardkey.h +++ b/src/blackmisc/hwkeyboardkey.h @@ -68,8 +68,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; @@ -77,8 +77,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index 518350595..32f5a446a 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -133,7 +133,7 @@ namespace BlackMisc /* * From Json */ - void CIcon::fromJson(const QJsonObject &json) + void CIcon::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CIcon::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index ec5b820db..826e21732 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -62,13 +62,13 @@ namespace BlackMisc virtual QJsonObject toJson() const override; //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/indexvariantmap.h b/src/blackmisc/indexvariantmap.h index 68b7353bf..e810edb1f 100644 --- a/src/blackmisc/indexvariantmap.h +++ b/src/blackmisc/indexvariantmap.h @@ -95,8 +95,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! register metadata static void registerMetadata(); diff --git a/src/blackmisc/mathmatrixbase.cpp b/src/blackmisc/mathmatrixbase.cpp index 83c1b9831..2992be01d 100644 --- a/src/blackmisc/mathmatrixbase.cpp +++ b/src/blackmisc/mathmatrixbase.cpp @@ -249,7 +249,7 @@ namespace BlackMisc /* * From Json */ - template void CMatrixBase::fromJson(const QJsonObject &json) + template void CMatrixBase::convertFromJson(const QJsonObject &json) { QJsonArray jsonArray = json.value("matrix").toArray(); QList list; diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h index 895113198..353e52434 100644 --- a/src/blackmisc/mathmatrixbase.h +++ b/src/blackmisc/mathmatrixbase.h @@ -90,8 +90,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } //! \brief Equal operator == bool operator ==(const ImplMatrix &other) const @@ -248,8 +248,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; private: //! \brief Check range of row / column diff --git a/src/blackmisc/mathvector3dbase.cpp b/src/blackmisc/mathvector3dbase.cpp index 444d8b9a5..9482f4613 100644 --- a/src/blackmisc/mathvector3dbase.cpp +++ b/src/blackmisc/mathvector3dbase.cpp @@ -209,7 +209,7 @@ namespace BlackMisc /* * From Json */ - template void CVector3DBase::fromJson(const QJsonObject &json) + template void CVector3DBase::convertFromJson(const QJsonObject &json) { QJsonArray jsonArray = json.value("vector").toArray(); this->m_i = jsonArray.at(0).toDouble(); @@ -235,7 +235,7 @@ namespace BlackMisc /* * From Json */ - template void CMatrixBase::fromJson(const QJsonObject &json) + template void CMatrixBase::convertFromJson(const QJsonObject &json) { QJsonArray jsonArray = json.value("matrix").toArray(); QList list; diff --git a/src/blackmisc/mathvector3dbase.h b/src/blackmisc/mathvector3dbase.h index 0d9ab058e..2fbdb01a5 100644 --- a/src/blackmisc/mathvector3dbase.h +++ b/src/blackmisc/mathvector3dbase.h @@ -202,14 +202,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp index 334a5dea1..0ed4e360f 100644 --- a/src/blackmisc/namevariantpair.cpp +++ b/src/blackmisc/namevariantpair.cpp @@ -147,7 +147,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -196,7 +196,7 @@ namespace BlackMisc /* * From JSON */ - void CNameVariantPair::fromJson(const QJsonObject &json) + void CNameVariantPair::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index ecc95d2e4..6ee23a835 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -60,8 +60,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); @@ -87,8 +87,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } protected: //! \copydoc CValueObject::convertToQString() diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index bd97ba867..f23a83e1b 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -39,8 +39,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwaircraftmapping.cpp b/src/blackmisc/nwaircraftmapping.cpp index bd9d4a539..f31d267ad 100644 --- a/src/blackmisc/nwaircraftmapping.cpp +++ b/src/blackmisc/nwaircraftmapping.cpp @@ -137,7 +137,7 @@ namespace BlackMisc /* * From Json */ - void CAircraftMapping::fromJson(const QJsonObject &json) + void CAircraftMapping::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAircraftMapping::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -172,7 +172,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h index 0d2196b1f..11abbf833 100644 --- a/src/blackmisc/nwaircraftmapping.h +++ b/src/blackmisc/nwaircraftmapping.h @@ -96,14 +96,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Matches model string? bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const; diff --git a/src/blackmisc/nwaircraftmappinglist.h b/src/blackmisc/nwaircraftmappinglist.h index a035a1d31..97f4b911b 100644 --- a/src/blackmisc/nwaircraftmappinglist.h +++ b/src/blackmisc/nwaircraftmappinglist.h @@ -47,8 +47,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwaircraftmodel.cpp b/src/blackmisc/nwaircraftmodel.cpp index c0e6c0103..a1f6c6e27 100644 --- a/src/blackmisc/nwaircraftmodel.cpp +++ b/src/blackmisc/nwaircraftmodel.cpp @@ -120,7 +120,7 @@ namespace BlackMisc /* * From Json */ - void CAircraftModel::fromJson(const QJsonObject &json) + void CAircraftModel::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAircraftModel::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -153,7 +153,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwaircraftmodel.h b/src/blackmisc/nwaircraftmodel.h index 92406b8dd..ffe4493c0 100644 --- a/src/blackmisc/nwaircraftmodel.h +++ b/src/blackmisc/nwaircraftmodel.h @@ -52,14 +52,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex(int) virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp index abd7cec3c..6820a35c9 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/nwclient.cpp @@ -127,7 +127,7 @@ namespace BlackMisc /* * From Json */ - void CClient::fromJson(const QJsonObject &json) + void CClient::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } @@ -209,7 +209,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/nwclient.h index 7a68ffb6b..5fb26bf0b 100644 --- a/src/blackmisc/nwclient.h +++ b/src/blackmisc/nwclient.h @@ -73,14 +73,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Callsign used with other client const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_user.getCallsign(); } diff --git a/src/blackmisc/nwserver.cpp b/src/blackmisc/nwserver.cpp index acf26ef5c..4c467da83 100644 --- a/src/blackmisc/nwserver.cpp +++ b/src/blackmisc/nwserver.cpp @@ -142,7 +142,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } @@ -201,7 +201,7 @@ namespace BlackMisc /* * From Json */ - void CServer::fromJson(const QJsonObject &json) + void CServer::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CServer::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/nwserver.h index a69649ed8..1fcb0ede7 100644 --- a/src/blackmisc/nwserver.h +++ b/src/blackmisc/nwserver.h @@ -94,14 +94,14 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::propertyByIndex(int) virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/nwserverlist.h b/src/blackmisc/nwserverlist.h index 0ff00d2ca..ff652295b 100644 --- a/src/blackmisc/nwserverlist.h +++ b/src/blackmisc/nwserverlist.h @@ -36,8 +36,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h index 7df82cd5f..9219c8917 100644 --- a/src/blackmisc/nwtextmessage.h +++ b/src/blackmisc/nwtextmessage.h @@ -170,8 +170,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \brief Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwtextmessagelist.h b/src/blackmisc/nwtextmessagelist.h index b4bb5eed0..d686321dd 100644 --- a/src/blackmisc/nwtextmessagelist.h +++ b/src/blackmisc/nwtextmessagelist.h @@ -71,8 +71,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/nwuser.cpp index edaf3d7c5..18b23841a 100644 --- a/src/blackmisc/nwuser.cpp +++ b/src/blackmisc/nwuser.cpp @@ -141,7 +141,7 @@ namespace BlackMisc /* * From JSON */ - void CUser::fromJson(const QJsonObject &json) + void CUser::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CUser::jsonMembers(), TupleConverter::toTuple(*this)); } @@ -194,7 +194,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/nwuser.h index bd3a74351..0afd035cd 100644 --- a/src/blackmisc/nwuser.h +++ b/src/blackmisc/nwuser.h @@ -123,8 +123,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toIcon() virtual BlackMisc::CIcon toIcon() const override { return this->getCallsign().toIcon(); } @@ -132,8 +132,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex(int) virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blackmisc/nwuserlist.h b/src/blackmisc/nwuserlist.h index 40b7ed128..be8d8c2db 100644 --- a/src/blackmisc/nwuserlist.h +++ b/src/blackmisc/nwuserlist.h @@ -30,8 +30,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/nwvoicecapabilites.cpp b/src/blackmisc/nwvoicecapabilites.cpp index 3b79c8d3b..4b04f2676 100644 --- a/src/blackmisc/nwvoicecapabilites.cpp +++ b/src/blackmisc/nwvoicecapabilites.cpp @@ -176,7 +176,7 @@ namespace BlackMisc /* * To JSON */ - void CVoiceCapabilities::fromJson(const QJsonObject &json) + void CVoiceCapabilities::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CVoiceCapabilities::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/nwvoicecapabilities.h b/src/blackmisc/nwvoicecapabilities.h index 41db45ef3..d829624c0 100644 --- a/src/blackmisc/nwvoicecapabilities.h +++ b/src/blackmisc/nwvoicecapabilities.h @@ -66,14 +66,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/pqangle.h b/src/blackmisc/pqangle.h index e00b6f089..ddd727953 100644 --- a/src/blackmisc/pqangle.h +++ b/src/blackmisc/pqangle.h @@ -64,8 +64,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Value as factor of PI (e.g. 0.5PI) double piFactor() const; diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pqbase.h index cc97ae971..2a8a5f272 100644 --- a/src/blackmisc/pqbase.h +++ b/src/blackmisc/pqbase.h @@ -279,8 +279,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp index e15a22cdf..0413a9728 100644 --- a/src/blackmisc/pqphysicalquantity.cpp +++ b/src/blackmisc/pqphysicalquantity.cpp @@ -303,7 +303,7 @@ namespace BlackMisc /* * JSON Object */ - template void CPhysicalQuantity::fromJson(const QJsonObject &json) + template void CPhysicalQuantity::convertFromJson(const QJsonObject &json) { const QString unitSymbol = json.value("unit").toString(); this->setUnitBySymbol(unitSymbol); @@ -345,7 +345,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h index 3d99ee407..0b1d07ab0 100644 --- a/src/blackmisc/pqphysicalquantity.h +++ b/src/blackmisc/pqphysicalquantity.h @@ -209,14 +209,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this->derived()); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Parse to string, with specified separator virtual void parseFromString(const QString &value, CPqString::SeparatorMode mode) diff --git a/src/blackmisc/pqstring.h b/src/blackmisc/pqstring.h index c56b6a12c..bc0ce75f9 100644 --- a/src/blackmisc/pqstring.h +++ b/src/blackmisc/pqstring.h @@ -85,8 +85,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pqunits.h index e5f519567..ef2dc93fc 100644 --- a/src/blackmisc/pqunits.h +++ b/src/blackmisc/pqunits.h @@ -60,8 +60,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CLengthUnit &defaultUnit() { return m(); } @@ -173,8 +173,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CAngleUnit &defaultUnit() { return deg(); } @@ -269,8 +269,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CFrequencyUnit &defaultUnit() { return Hz(); } @@ -358,8 +358,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CMassUnit &defaultUnit() { return kg(); } @@ -457,8 +457,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CPressureUnit &defaultUnit() { return hPa(); } @@ -577,8 +577,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CTemperatureUnit &defaultUnit() { return C(); } @@ -661,8 +661,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CSpeedUnit &defaultUnit() { return m_s(); } @@ -770,8 +770,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CTimeUnit &defaultUnit() { return s(); } @@ -898,8 +898,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Default unit static const CAccelerationUnit &defaultUnit() { return m_s2(); } diff --git a/src/blackmisc/propertyindex.cpp b/src/blackmisc/propertyindex.cpp index 8fc953f74..921c7e872 100644 --- a/src/blackmisc/propertyindex.cpp +++ b/src/blackmisc/propertyindex.cpp @@ -212,7 +212,7 @@ namespace BlackMisc /* * From JSON */ - void CPropertyIndex::fromJson(const QJsonObject &json) + void CPropertyIndex::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CPropertyIndex::jsonMembers(), TupleConverter::toTuple(*this)); this->stringToList(); diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 232db03c7..e578324c6 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -99,14 +99,14 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/setaudio.cpp b/src/blackmisc/setaudio.cpp index 3b7f4105e..ec87c9339 100644 --- a/src/blackmisc/setaudio.cpp +++ b/src/blackmisc/setaudio.cpp @@ -113,7 +113,7 @@ namespace BlackMisc /* * From JSON */ - void CSettingsAudio::fromJson(const QJsonObject &json) + void CSettingsAudio::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CSettingsAudio::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h index d1099cff5..eaab020fe 100644 --- a/src/blackmisc/setaudio.h +++ b/src/blackmisc/setaudio.h @@ -42,8 +42,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Notification flag (play notification?) bool getNotificationFlag(BlackSound::CNotificationSounds::Notification notification) const; @@ -66,8 +66,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Init with meaningful default values void initDefaultValues(); diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp index b6f41cf93..3c5980d68 100644 --- a/src/blackmisc/setkeyboardhotkey.cpp +++ b/src/blackmisc/setkeyboardhotkey.cpp @@ -40,7 +40,7 @@ namespace BlackMisc /* * From Json */ - void CSettingKeyboardHotkey::fromJson(const QJsonObject &json) + void CSettingKeyboardHotkey::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } @@ -163,7 +163,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 28fcf05e2..5ca99fd2a 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -55,8 +55,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; @@ -64,8 +64,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/setkeyboardhotkeylist.h b/src/blackmisc/setkeyboardhotkeylist.h index 842fdac17..c018ca823 100644 --- a/src/blackmisc/setkeyboardhotkeylist.h +++ b/src/blackmisc/setkeyboardhotkeylist.h @@ -45,8 +45,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/setnetwork.cpp b/src/blackmisc/setnetwork.cpp index ed65f8f53..72257de5f 100644 --- a/src/blackmisc/setnetwork.cpp +++ b/src/blackmisc/setnetwork.cpp @@ -116,7 +116,7 @@ namespace BlackMisc /* * From JSON */ - void CSettingsNetwork::fromJson(const QJsonObject &json) + void CSettingsNetwork::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CSettingsNetwork::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index c564e0fbb..11fd61b33 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -66,8 +66,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Value object, traffic network server objects BlackMisc::Network::CServerList getTrafficNetworkServers() const { return m_trafficNetworkServers; } @@ -102,8 +102,8 @@ namespace BlackMisc //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Init with meaningful default values void initDefaultValues(); diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 4fa8bb019..a76153994 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -306,7 +306,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index 5e4bb5381..6ef7146dd 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -87,8 +87,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Type as string const QString &getTypeAsString() const; diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index 7fcf12c70..d9fe871e7 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -41,8 +41,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata of unit and quantity static void registerMetadata(); diff --git a/src/blackmisc/valueobject.cpp b/src/blackmisc/valueobject.cpp index e6c3a961f..3876e4e94 100644 --- a/src/blackmisc/valueobject.cpp +++ b/src/blackmisc/valueobject.cpp @@ -56,7 +56,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } @@ -103,7 +103,7 @@ namespace BlackMisc /* * Return backing streamable object (if any) */ - const CValueObject *CValueObject::convertFromQVariant(const QVariant &variant) + const CValueObject *CValueObject::fromQVariant(const QVariant &variant) { if (!variant.isValid()) return nullptr; QVariant::Type t = variant.type(); diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index a2b4150f1..36e50d940 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -193,13 +193,13 @@ namespace BlackMisc virtual CVariant toCVariant() const { return CVariant(this->toQVariant()); } //! Set from QVariant - virtual void fromQVariant(const QVariant &variant) = 0; + virtual void convertFromQVariant(const QVariant &variant) = 0; //! Contribute to JSON object virtual QJsonObject toJson() const { QJsonObject json; return json;} //! Initialize from JSON object - virtual void fromJson(const QJsonObject &json) { Q_UNUSED(json); } + virtual void convertFromJson(const QJsonObject &json) { Q_UNUSED(json); } //! As icon, not implement by all classes virtual CIcon toIcon() const; @@ -220,7 +220,7 @@ namespace BlackMisc virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const; //! The stored object as CValueObject - static const CValueObject *convertFromQVariant(const QVariant &variant); + static const CValueObject *fromQVariant(const QVariant &variant); protected: //! Default constructor @@ -311,21 +311,21 @@ namespace BlackMisc //! Non member, non friend operator >> for JSON inline const QJsonObject &operator>>(const QJsonObject &json, CValueObject &valueObject) { - valueObject.fromJson(json); + valueObject.convertFromJson(json); return json; } //! Non member, non friend operator >> for JSON inline const QJsonValue &operator>>(const QJsonValue &json, CValueObject &valueObject) { - valueObject.fromJson(json.toObject()); + valueObject.convertFromJson(json.toObject()); return json; } //! Non member, non friend operator >> for JSON inline const QJsonValueRef &operator>>(const QJsonValueRef &json, CValueObject &valueObject) { - valueObject.fromJson(json.toObject()); + valueObject.convertFromJson(json.toObject()); return json; } diff --git a/src/blackmisc/variant.cpp b/src/blackmisc/variant.cpp index d5a899ea2..e1adffc09 100644 --- a/src/blackmisc/variant.cpp +++ b/src/blackmisc/variant.cpp @@ -26,7 +26,7 @@ namespace BlackMisc { if (type() == QVariant::UserType) { - const CValueObject *s = CValueObject::convertFromQVariant(m_v); // FIXME this will return garbage if value is not a CValueObject + const CValueObject *s = CValueObject::fromQVariant(m_v); // FIXME this will return garbage if value is not a CValueObject Q_ASSERT(s); if (s) { @@ -133,7 +133,7 @@ namespace BlackMisc { // value object? const QVariant qv = this->toQVariant(); - const CValueObject *cv = CValueObject::convertFromQVariant(qv); + const CValueObject *cv = CValueObject::fromQVariant(qv); if (cv) { h = cv->getValueHash(); diff --git a/src/blackmisc/voiceroom.cpp b/src/blackmisc/voiceroom.cpp index e3c88e93e..8bad84f84 100644 --- a/src/blackmisc/voiceroom.cpp +++ b/src/blackmisc/voiceroom.cpp @@ -125,7 +125,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } @@ -156,7 +156,7 @@ namespace BlackMisc /* * To JSON */ - void CVoiceRoom::fromJson(const QJsonObject &json) + void CVoiceRoom::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CVoiceRoom::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blackmisc/voiceroom.h b/src/blackmisc/voiceroom.h index 427f57bd5..e87986009 100644 --- a/src/blackmisc/voiceroom.h +++ b/src/blackmisc/voiceroom.h @@ -105,14 +105,14 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override; - //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/voiceroomlist.h b/src/blackmisc/voiceroomlist.h index 1153af546..f8120d2b4 100644 --- a/src/blackmisc/voiceroomlist.h +++ b/src/blackmisc/voiceroomlist.h @@ -38,8 +38,8 @@ namespace BlackMisc //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \brief Register metadata static void registerMetadata(); diff --git a/src/blacksim/fscommon/aircraftcfgentries.cpp b/src/blacksim/fscommon/aircraftcfgentries.cpp index f15f63292..f515ce95a 100644 --- a/src/blacksim/fscommon/aircraftcfgentries.cpp +++ b/src/blacksim/fscommon/aircraftcfgentries.cpp @@ -87,7 +87,7 @@ namespace BlackSim */ void CAircraftCfgEntries::setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) { - if (index.isMyself()) { this->fromQVariant(variant); return; } + if (index.isMyself()) { this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); switch (i) { @@ -176,7 +176,7 @@ namespace BlackSim /* * To JSON */ - void CAircraftCfgEntries::fromJson(const QJsonObject &json) + void CAircraftCfgEntries::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAircraftCfgEntries::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blacksim/fscommon/aircraftcfgentries.h b/src/blacksim/fscommon/aircraftcfgentries.h index e04b1db8b..84dc02fa7 100644 --- a/src/blacksim/fscommon/aircraftcfgentries.h +++ b/src/blacksim/fscommon/aircraftcfgentries.h @@ -105,14 +105,14 @@ namespace BlackSim //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::propertyByIndex virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; diff --git a/src/blacksim/fscommon/aircraftcfgentrieslist.h b/src/blacksim/fscommon/aircraftcfgentrieslist.h index 6b721e188..7059a51f2 100644 --- a/src/blacksim/fscommon/aircraftcfgentrieslist.h +++ b/src/blacksim/fscommon/aircraftcfgentrieslist.h @@ -80,8 +80,8 @@ namespace BlackSim //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Unknown entries static const CAircraftCfgEntries &UnknownCfgEntries() diff --git a/src/blacksim/fscommon/aircraftmapping.cpp b/src/blacksim/fscommon/aircraftmapping.cpp index 402a9a0cc..a61020059 100644 --- a/src/blacksim/fscommon/aircraftmapping.cpp +++ b/src/blacksim/fscommon/aircraftmapping.cpp @@ -255,7 +255,7 @@ namespace BlackSim /* * To JSON */ - void CAircraftMapping::fromJson(const QJsonObject &json) + void CAircraftMapping::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CAircraftMapping::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blacksim/fscommon/aircraftmapping.h b/src/blacksim/fscommon/aircraftmapping.h index c08171f89..5549b6dc5 100644 --- a/src/blacksim/fscommon/aircraftmapping.h +++ b/src/blacksim/fscommon/aircraftmapping.h @@ -195,8 +195,8 @@ namespace BlackSim //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Current UTC timestamp static QString currentUtcTimestamp() @@ -209,8 +209,8 @@ namespace BlackSim //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); diff --git a/src/blacksim/fscommon/aircraftmappinglist.h b/src/blacksim/fscommon/aircraftmappinglist.h index e0d132e6e..c55af145c 100644 --- a/src/blacksim/fscommon/aircraftmappinglist.h +++ b/src/blacksim/fscommon/aircraftmappinglist.h @@ -38,8 +38,8 @@ namespace BlackSim //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! Unknown mapping static const CAircraftMapping &UnknownMapping() diff --git a/src/blacksim/setsimulator.cpp b/src/blacksim/setsimulator.cpp index 20059a26a..134c77076 100644 --- a/src/blacksim/setsimulator.cpp +++ b/src/blacksim/setsimulator.cpp @@ -114,7 +114,7 @@ namespace BlackSim /* * From JSON */ - void CSettingsSimulator::fromJson(const QJsonObject &json) + void CSettingsSimulator::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, TupleConverter::toMetaTuple(*this)); } diff --git a/src/blacksim/setsimulator.h b/src/blacksim/setsimulator.h index c619bd643..2af492987 100644 --- a/src/blacksim/setsimulator.h +++ b/src/blacksim/setsimulator.h @@ -89,14 +89,14 @@ namespace BlackSim //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::registerMetadata static void registerMetadata(); diff --git a/src/blacksim/simulatorinfo.cpp b/src/blacksim/simulatorinfo.cpp index 7417217ff..ef34de23e 100644 --- a/src/blacksim/simulatorinfo.cpp +++ b/src/blacksim/simulatorinfo.cpp @@ -87,7 +87,7 @@ namespace BlackSim return BlackMisc::serializeJson(CSimulatorInfo::jsonMembers(), TupleConverter::toTuple(*this)); } - void CSimulatorInfo::fromJson(const QJsonObject &json) + void CSimulatorInfo::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CSimulatorInfo::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/src/blacksim/simulatorinfo.h b/src/blacksim/simulatorinfo.h index c3b32c2ae..260b6b28e 100644 --- a/src/blacksim/simulatorinfo.h +++ b/src/blacksim/simulatorinfo.h @@ -49,14 +49,14 @@ namespace BlackSim //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! \copydoc CValueObject::convertFromQVariant + virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson virtual QJsonObject toJson() const override; - //! \copydoc CValueObject::fromJson - virtual void fromJson(const QJsonObject &json) override; + //! \copydoc CValueObject::convertFromJson + virtual void convertFromJson(const QJsonObject &json) override; //! Members static const QStringList &jsonMembers(); diff --git a/tests/blackmisc/testcontainers.cpp b/tests/blackmisc/testcontainers.cpp index da3d88dde..acabb0f20 100644 --- a/tests/blackmisc/testcontainers.cpp +++ b/tests/blackmisc/testcontainers.cpp @@ -209,7 +209,7 @@ namespace BlackMiscTest // JSON QJsonObject jsonObject = d1.toJson(); CValueObjectDictionary d4; - d4.fromJson(jsonObject); + d4.convertFromJson(jsonObject); QVERIFY2(d1 == d4, "JSON serialization/deserialization failed"); } diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp index b86303fee..91dd1dfac 100644 --- a/tests/blackmisc/testvalueobject.cpp +++ b/tests/blackmisc/testvalueobject.cpp @@ -117,7 +117,7 @@ namespace BlackMisc { if (index.isMyself()) { - this->fromQVariant(variant); + this->convertFromQVariant(variant); return; } ColumnIndex i = index.frontCasted(); @@ -163,7 +163,7 @@ namespace BlackMisc /* * From Json */ - void CTestValueObject::fromJson(const QJsonObject &json) + void CTestValueObject::convertFromJson(const QJsonObject &json) { BlackMisc::deserializeJson(json, CTestValueObject::jsonMembers(), TupleConverter::toTuple(*this)); } diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h index 843ecc759..3b07448ef 100644 --- a/tests/blackmisc/testvalueobject.h +++ b/tests/blackmisc/testvalueobject.h @@ -64,7 +64,7 @@ namespace BlackMisc virtual QJsonObject toJson() const override; //! \copydoc CValueObject::fromJson - void fromJson(const QJsonObject &json) override; + void convertFromJson(const QJsonObject &json) override; //! Register metadata static void registerMetadata(); @@ -85,7 +85,7 @@ namespace BlackMisc } //! \copydoc CValueObject::fromQVariant - virtual void fromQVariant(const QVariant &variant) override + virtual void convertFromQVariant(const QVariant &variant) override { Q_ASSERT(variant.canConvert()); if (variant.canConvert())