flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #626 Warnings in case CVariant convertFromJson or unmarshallFromDbus gets an unregistered type name.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-04-02 16:29:11 +01:00
parent 91db47c628
commit 79121e0088
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/variant.cpp
View File

@@ -145,7 +145,7 @@ namespace BlackMisc
switch (typeId)
{
case QVariant::Invalid: m_v.clear(); break;
case QVariant::Invalid: CLogMessage(this).warning("Invalid type for fromJson: %1") << typeName; m_v.clear(); break;
case QVariant::Int: m_v.setValue(json.value("value").toInt()); break;
case QVariant::UInt: m_v.setValue<uint>(json.value("value").toInt()); break;
case QVariant::Bool: m_v.setValue(json.value("value").toBool()); break;
@@ -244,7 +244,7 @@ namespace BlackMisc
* \internal
*/
//! @{
QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType);
QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType, const QString &typeName);
QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type);
//! @}
@@ -260,7 +260,7 @@ namespace BlackMisc
}
else
{
*this = fixQVariantFromDbusArgument(dbusVar.variant(), QMetaType::type(qPrintable(typeName)));
*this = fixQVariantFromDbusArgument(dbusVar.variant(), QMetaType::type(qPrintable(typeName)), typeName);
}
}
@@ -347,8 +347,13 @@ namespace BlackMisc
return toIcon().toPixmap();
}
QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType)
QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType, const QString &typeName)
{
if (localUserType == static_cast<int>(QVariant::Invalid))
{
CLogMessage(&variant).warning("Invalid type for unmarshall: %1") << typeName;
}
// my business?
if (!variant.canConvert<QDBusArgument>()) { return variant; }