return correct enum name

Fixes #68
This commit is contained in:
Michael Zanetti 2014-12-13 15:56:00 +01:00 committed by Michael Zanetti
parent fc0fd70cf1
commit c57773883d

View File

@ -61,7 +61,7 @@ QVariantMap JsonTypes::s_rule;
void JsonTypes::init() void JsonTypes::init()
{ {
// BasicTypes // BasicTypes
s_basicType = enumToStrings(JsonTypes::staticMetaObject, "BasicTypes"); s_basicType = enumToStrings(JsonTypes::staticMetaObject, "BasicType");
s_stateOperator = enumToStrings(Types::staticMetaObject, "StateOperator"); s_stateOperator = enumToStrings(Types::staticMetaObject, "StateOperator");
s_valueOperator = enumToStrings(Types::staticMetaObject, "ValueOperator"); s_valueOperator = enumToStrings(Types::staticMetaObject, "ValueOperator");
s_createMethod = enumToStrings(DeviceClass::staticMetaObject, "CreateMethod"); s_createMethod = enumToStrings(DeviceClass::staticMetaObject, "CreateMethod");
@ -184,6 +184,7 @@ QPair<bool, QString> JsonTypes::report(bool status, const QString &message)
QVariantList JsonTypes::enumToStrings(const QMetaObject &metaObject, const QString &enumName) QVariantList JsonTypes::enumToStrings(const QMetaObject &metaObject, const QString &enumName)
{ {
int enumIndex = metaObject.indexOfEnumerator(enumName.toLatin1().data()); int enumIndex = metaObject.indexOfEnumerator(enumName.toLatin1().data());
Q_ASSERT_X(enumIndex >= 0, "JsonTypes", QString("Enumerator %1 not found in %2").arg(enumName).arg(metaObject.className()).toLocal8Bit());
QMetaEnum metaEnum = metaObject.enumerator(enumIndex); QMetaEnum metaEnum = metaObject.enumerator(enumIndex);
QVariantList enumStrings; QVariantList enumStrings;