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

Removed warning from fixQVariantFromDbusArgument.

Browse Source 
@MS: Please crosscheck. In the past function was only called with QDBusArgument.
Now called from CVariant sometimes with standard variant types (QString, int).
Expected?
This commit is contained in:
Klaus Basan
2014-12-17 19:05:45 +01:00
parent bfced2ad42
commit 95df9edd52
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -187,12 +187,14 @@ uint BlackMisc::calculateHash(const QList<int> &values, const char *className)
*/ */
QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int localUserType) QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int localUserType)
{ {
if (variant.canConvert<QDBusArgument>()) // my business?
{ if (!variant.canConvert<QDBusArgument>()) { return variant; }
// complex, user type // complex, user type
// it has to be made sure, that the cast works // it has to be made sure, that the cast works
const QDBusArgument arg = variant.value<QDBusArgument>(); const QDBusArgument arg = variant.value<QDBusArgument>();
if (localUserType < static_cast<int>(QVariant::UserType)) const int userType = static_cast<int>(QVariant::UserType);
if (localUserType < userType)
{ {
// complex Qt type, e.g. QDateTime // complex Qt type, e.g. QDateTime
return BlackMisc::complexQtTypeFromDbusArgument(arg, localUserType); return BlackMisc::complexQtTypeFromDbusArgument(arg, localUserType);
@@ -206,10 +208,9 @@ QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int loc
meta->unmarshall(arg, valueVariant.data()); meta->unmarshall(arg, valueVariant.data());
return valueVariant; return valueVariant;
} }
Q_ASSERT_X(false, "fixQVariantFromDbusArgument", "no meta");
return valueVariant;
} }
}
qWarning() << "fixQVariantFromDbusArgument called with unsupported type";
return variant;
} }
/* /*