ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

return correct enum name 

Fixes #68
pull/135/head
Michael Zanetti 2014-12-13 15:56:00 +01:00 committed by Michael Zanetti
parent fc0fd70cf1
commit c57773883d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/jsonrpc/jsontypes.cpp
View File

@ -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<bool, QString> 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;