flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #314, renamed convertFromQVariant, convertFromJson

Browse Source 
discussion: https://dev.vatsim-germany.org/issues/314#note-19
This commit is contained in:
Klaus Basan
2014-08-24 02:32:44 +02:00
parent f3b68afab5
commit 40b428a315
117 changed files with 324 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/context_settings_impl.cpp
View File

@@ -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()
);
}

2
src/blackmisc/audiodevice.cpp
View File

@@ -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<CAudioDevice>::toTuple(*this));
}

8
src/blackmisc/audiodevice.h
View File

@@ -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();

4
src/blackmisc/audiodevicelist.h
View File

@@ -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();

4
src/blackmisc/avaircraft.cpp
View File

@@ -233,7 +233,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -289,7 +289,7 @@ namespace BlackMisc
/*
* From JSON
*/
void CAircraft::fromJson(const QJsonObject &json)
void CAircraft::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CAircraft>::toMetaTuple(*this));
}

8
src/blackmisc/avaircraft.h
View File

@@ -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;

4
src/blackmisc/avaircrafticao.cpp
View File

@@ -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<CAircraftIcao>::toTuple(*this));
}

8
src/blackmisc/avaircrafticao.h
View File

@@ -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;

4
src/blackmisc/avaircraftlist.h
View File

@@ -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();

2
src/blackmisc/avaircraftsituation.cpp
View File

@@ -148,7 +148,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}

4
src/blackmisc/avaircraftsituation.h
View File

@@ -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; }

4
src/blackmisc/avaircraftsituationlist.h
View File

@@ -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); }
};
}

4
src/blackmisc/avairport.cpp
View File

@@ -94,7 +94,7 @@ namespace BlackMisc
/*
* From Json
*/
void CAirport::fromJson(const QJsonObject &json)
void CAirport::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CAirport>::toMetaTuple(*this));
}
@@ -199,7 +199,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/avairport.h
View File

@@ -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();

2
src/blackmisc/avairporticao.cpp
View File

@@ -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<CAirportIcao>::toTuple(*this));
}

8
src/blackmisc/avairporticao.h
View File

@@ -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();

4
src/blackmisc/avairportlist.h
View File

@@ -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();

4
src/blackmisc/avaltitude.cpp
View File

@@ -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<CAltitude>::toTuple(*this));
}

8
src/blackmisc/avaltitude.h
View File

@@ -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;

4
src/blackmisc/avatcstation.cpp
View File

@@ -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<CAtcStation>::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<ColumnIndex>();
switch (i)
{

8
src/blackmisc/avatcstation.h
View File

@@ -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();

4
src/blackmisc/avatcstationlist.h
View File

@@ -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();

4
src/blackmisc/avcallsign.cpp
View File

@@ -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<CCallsign>::toTuple(*this));
}
@@ -148,7 +148,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/avcallsign.h
View File

@@ -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); }

4
src/blackmisc/avcallsignlist.h
View File

@@ -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();

2
src/blackmisc/avflightplan.cpp
View File

@@ -94,7 +94,7 @@ namespace BlackMisc
return BlackMisc::serializeJson(CFlightPlan::jsonMembers(), TupleConverter<CFlightPlan>::toTuple(*this));
}
void CFlightPlan::fromJson(const QJsonObject &json)
void CFlightPlan::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CFlightPlan::jsonMembers(), TupleConverter<CFlightPlan>::toTuple(*this));
}

8
src/blackmisc/avflightplan.h
View File

@@ -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;

4
src/blackmisc/avheading.cpp
View File

@@ -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<CHeading>::toTuple(*this));
}

8
src/blackmisc/avheading.h
View File

@@ -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();

2
src/blackmisc/avinformationmessage.cpp
View File

@@ -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<CInformationMessage::InformationType>(qRound(json.value("m_type").toDouble()));

8
src/blackmisc/avinformationmessage.h
View File

@@ -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();

4
src/blackmisc/aviocomsystem.cpp
View File

@@ -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<CComSystem>::toTuple(*this));
}

4
src/blackmisc/aviocomsystem.h
View File

@@ -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();

4
src/blackmisc/aviomodulator.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackMisc
/*
* To JSON
*/
template <class AVIO> void CModulator<AVIO>::fromJson(const QJsonObject &json)
template <class AVIO> void CModulator<AVIO>::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CModulator::jsonMembers(), TupleConverter<CModulator>::toTuple(*this));
}
@@ -87,7 +87,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/aviomodulator.h
View File

@@ -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;

4
src/blackmisc/aviotransponder.cpp
View File

@@ -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<CTransponder>::toTuple(*this));
}
@@ -256,7 +256,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/aviotransponder.h
View File

@@ -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;

2
src/blackmisc/avselcal.cpp
View File

@@ -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<CSelcal>::toTuple(*this));
}

8
src/blackmisc/avselcal.h
View File

@@ -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();

4
src/blackmisc/avtrack.cpp
View File

@@ -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<CTrack>::toTuple(*this));
CAngle::fromJson(json);
CAngle::convertFromJson(json);
}
} // namespace
} // namespace

8
src/blackmisc/avtrack.h
View File

@@ -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();

10
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -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);

8
src/blackmisc/containerbase.h
View File

@@ -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<T> >(&derived(), variant); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant< C<T> >(&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)

4
src/blackmisc/coordinategeodetic.cpp
View File

@@ -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<CCoordinateGeodetic>::toTuple(*this));
}
@@ -275,7 +275,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/coordinategeodetic.h
View File

@@ -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();

8
src/blackmisc/dictionary.h
View File

@@ -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)

4
src/blackmisc/geoearthangle.h
View File

@@ -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();

2
src/blackmisc/hotkeyfunction.cpp
View File

@@ -52,7 +52,7 @@ namespace BlackMisc
}
// From Json
void CHotkeyFunction::fromJson(const QJsonObject &json)
void CHotkeyFunction::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CHotkeyFunction>::toMetaTuple(*this));
}

8
src/blackmisc/hotkeyfunction.h
View File

@@ -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();

4
src/blackmisc/hwkeyboardkey.cpp
View File

@@ -35,7 +35,7 @@ namespace BlackMisc
return BlackMisc::serializeJson(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
void CKeyboardKey::fromJson(const QJsonObject &json)
void CKeyboardKey::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
@@ -344,7 +344,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/hwkeyboardkey.h
View File

@@ -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();

2
src/blackmisc/icon.cpp
View File

@@ -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<CIcon>::toTuple(*this));
}

6
src/blackmisc/icon.h
View File

@@ -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();

4
src/blackmisc/indexvariantmap.h
View File

@@ -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();

2
src/blackmisc/mathmatrixbase.cpp
View File

@@ -249,7 +249,7 @@ namespace BlackMisc
/*
* From Json
*/
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::fromJson(const QJsonObject &json)
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::convertFromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("matrix").toArray();
QList<double> list;

8
src/blackmisc/mathmatrixbase.h
View File

@@ -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<ImplMatrix>(derived(), variant); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant<ImplMatrix>(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

4
src/blackmisc/mathvector3dbase.cpp
View File

@@ -209,7 +209,7 @@ namespace BlackMisc
/*
* From Json
*/
template <class ImplVector> void CVector3DBase<ImplVector>::fromJson(const QJsonObject &json)
template <class ImplVector> void CVector3DBase<ImplVector>::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 <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::fromJson(const QJsonObject &json)
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::convertFromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("matrix").toArray();
QList<double> list;

8
src/blackmisc/mathvector3dbase.h
View File

@@ -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<ImplVector>(derived(), variant); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant<ImplVector>(derived(), variant); }
//! Register metadata
static void registerMetadata();

4
src/blackmisc/namevariantpair.cpp
View File

@@ -147,7 +147,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -196,7 +196,7 @@ namespace BlackMisc
/*
* From JSON
*/
void CNameVariantPair::fromJson(const QJsonObject &json)
void CNameVariantPair::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CNameVariantPair>::toMetaTuple(*this));
}

8
src/blackmisc/namevariantpair.h
View File

@@ -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()

4
src/blackmisc/namevariantpairlist.h
View File

@@ -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();

4
src/blackmisc/nwaircraftmapping.cpp
View File

@@ -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<CAircraftMapping>::toTuple(*this));
}
@@ -172,7 +172,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/nwaircraftmapping.h
View File

@@ -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;

4
src/blackmisc/nwaircraftmappinglist.h
View File

@@ -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();

4
src/blackmisc/nwaircraftmodel.cpp
View File

@@ -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<CAircraftModel>::toTuple(*this));
}
@@ -153,7 +153,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/nwaircraftmodel.h
View File

@@ -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;

4
src/blackmisc/nwclient.cpp
View File

@@ -127,7 +127,7 @@ namespace BlackMisc
/*
* From Json
*/
void CClient::fromJson(const QJsonObject &json)
void CClient::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CClient>::toMetaTuple(*this));
}
@@ -209,7 +209,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/nwclient.h
View File

@@ -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(); }

4
src/blackmisc/nwserver.cpp
View File

@@ -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<CServer>::toTuple(*this));
}

8
src/blackmisc/nwserver.h
View File

@@ -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;

4
src/blackmisc/nwserverlist.h
View File

@@ -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();

4
src/blackmisc/nwtextmessage.h
View File

@@ -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();

4
src/blackmisc/nwtextmessagelist.h
View File

@@ -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();

4
src/blackmisc/nwuser.cpp
View File

@@ -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<CUser>::toTuple(*this));
}
@@ -194,7 +194,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/nwuser.h
View File

@@ -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;

4
src/blackmisc/nwuserlist.h
View File

@@ -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();

2
src/blackmisc/nwvoicecapabilites.cpp
View File

@@ -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<CVoiceCapabilities>::toTuple(*this));
}

8
src/blackmisc/nwvoicecapabilities.h
View File

@@ -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();

4
src/blackmisc/pqangle.h
View File

@@ -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;

4
src/blackmisc/pqbase.h
View File

@@ -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

4
src/blackmisc/pqphysicalquantity.cpp
View File

@@ -303,7 +303,7 @@ namespace BlackMisc
/*
* JSON Object
*/
template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::fromJson(const QJsonObject &json)
template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::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<ColumnIndex>();

8
src/blackmisc/pqphysicalquantity.h
View File

@@ -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<PQ>(derived(), variant); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant<PQ>(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)

4
src/blackmisc/pqstring.h
View File

@@ -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();

36
src/blackmisc/pqunits.h
View File

@@ -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(); }

2
src/blackmisc/propertyindex.cpp
View File

@@ -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<CPropertyIndex>::toTuple(*this));
this->stringToList();

8
src/blackmisc/propertyindex.h
View File

@@ -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();

2
src/blackmisc/setaudio.cpp
View File

@@ -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<CSettingsAudio>::toTuple(*this));
}

8
src/blackmisc/setaudio.h
View File

@@ -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();

4
src/blackmisc/setkeyboardhotkey.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackMisc
/*
* From Json
*/
void CSettingKeyboardHotkey::fromJson(const QJsonObject &json)
void CSettingKeyboardHotkey::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CSettingKeyboardHotkey>::toMetaTuple(*this));
}
@@ -163,7 +163,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

8
src/blackmisc/setkeyboardhotkey.h
View File

@@ -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();

4
src/blackmisc/setkeyboardhotkeylist.h
View File

@@ -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();

2
src/blackmisc/setnetwork.cpp
View File

@@ -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<CSettingsNetwork>::toTuple(*this));
}

8
src/blackmisc/setnetwork.h
View File

@@ -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();

2
src/blackmisc/statusmessage.cpp
View File

@@ -306,7 +306,7 @@ namespace BlackMisc
{
if (index.isMyself())
{
this->fromQVariant(variant);
this->convertFromQVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();

4
src/blackmisc/statusmessage.h
View File

@@ -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;

4
src/blackmisc/statusmessagelist.h
View File

@@ -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();

4
src/blackmisc/valueobject.cpp
View File

@@ -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();

12
src/blackmisc/valueobject.h
View File

@@ -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;
}

4
src/blackmisc/variant.cpp
View File

@@ -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();

4
src/blackmisc/voiceroom.cpp
View File

@@ -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<CVoiceRoom>::toTuple(*this));
}

Some files were not shown because too many files have changed in this diff Show More