flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #314, fromQVariant / location of toQVariant

Browse Source 
* renamed fromQVariant to convertFromQVariant, the "from" methods imply the object is changed (fromJson, fromString ..)
* implemented fromQVariant - changing the object by QVariant
* moved toQVariant into PQ template
* free function setFromQVariant
This commit is contained in:
Klaus Basan
2014-08-19 01:55:15 +02:00
parent c21a0bb0e4
commit 290abe3693
84 changed files with 478 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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::fromQVariant(v1);
const CValueObject *cs2 = CValueObject::fromQVariant(v2);
const CValueObject *cs1 = CValueObject::convertFromQVariant(v1);
const CValueObject *cs2 = CValueObject::convertFromQVariant(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::fromQVariant(v1);
const CValueObject *cs2 = CValueObject::fromQVariant(v2);
const CValueObject *cs1 = CValueObject::convertFromQVariant(v1);
const CValueObject *cs2 = CValueObject::convertFromQVariant(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::fromQVariant(qv);
const CValueObject *s = CValueObject::convertFromQVariant(qv);
if (s)
{
return s->toQString(i18n);