diff options
Diffstat (limited to 'src/modules/system/libkvisystem.cpp')
| -rw-r--r-- | src/modules/system/libkvisystem.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index c1d8f08a0..850891dbb 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -573,24 +573,28 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) QString szRetType; foreach(QVariant v, reply.arguments()) { +#if(QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) switch(v.type()) +#else + switch(v.typeId()) +#endif { - case QVariant::Bool: + case QMetaType::Bool: c->returnValue()->setInteger(v.toBool() ? 1 : 0); break; - case QVariant::String: + case QMetaType::QString: c->returnValue()->setString(v.toString()); break; - case QVariant::ByteArray: + case QMetaType::QByteArray: c->returnValue()->setString(v.toByteArray().data()); break; - case QVariant::UInt: + case QMetaType::UInt: c->returnValue()->setInteger(v.toUInt()); break; - case QVariant::Int: + case QMetaType::Int: c->returnValue()->setInteger(v.toInt()); break; - case QVariant::StringList: + case QMetaType::QStringList: { QStringList csl(v.toStringList()); KviKvsArray * arry = new KviKvsArray(); @@ -603,7 +607,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) c->returnValue()->setArray(arry); break; } - case QVariant::Invalid: + case QMetaType::UnknownType: //method returns void c->returnValue()->setString(""); break; |