From c57773883d41ac3eec7386362d4dc94cc415597f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 13 Dec 2014 15:56:00 +0100 Subject: [PATCH] return correct enum name Fixes #68 --- server/jsonrpc/jsontypes.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/jsonrpc/jsontypes.cpp b/server/jsonrpc/jsontypes.cpp index d195857c..98596869 100644 --- a/server/jsonrpc/jsontypes.cpp +++ b/server/jsonrpc/jsontypes.cpp @@ -61,7 +61,7 @@ QVariantMap JsonTypes::s_rule; void JsonTypes::init() { // BasicTypes - s_basicType = enumToStrings(JsonTypes::staticMetaObject, "BasicTypes"); + s_basicType = enumToStrings(JsonTypes::staticMetaObject, "BasicType"); s_stateOperator = enumToStrings(Types::staticMetaObject, "StateOperator"); s_valueOperator = enumToStrings(Types::staticMetaObject, "ValueOperator"); s_createMethod = enumToStrings(DeviceClass::staticMetaObject, "CreateMethod"); @@ -184,6 +184,7 @@ QPair JsonTypes::report(bool status, const QString &message) QVariantList JsonTypes::enumToStrings(const QMetaObject &metaObject, const QString &enumName) { 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); QVariantList enumStrings;