From c0ceceb244662ab7740e3eb83724886f7b4745df Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Fri, 7 Jun 2013 21:19:16 -0700 Subject: [PATCH] [bluemonkey] fixed set Property --- examples/bluemonkey/bluemonkeyconfig | 8 ++++---- plugins/bluemonkey/bluemonkey.cpp | 14 +++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/examples/bluemonkey/bluemonkeyconfig b/examples/bluemonkey/bluemonkeyconfig index 67006b3..02243e5 100644 --- a/examples/bluemonkey/bluemonkeyconfig +++ b/examples/bluemonkey/bluemonkeyconfig @@ -12,10 +12,10 @@ { "name" : "Bluemonkey Sink", "path" : "/usr/lib/automotive-message-broker/bluemonkeyplugin.so", - "authSettings" : "/etc/ambd/authSettings.js", - "ircSettings" : "/etc/ambd/ircSettings.js", - "config" : "/etc/ambd/config.js", - "customPrograms" : "/etc/ambd/customPrograms.js" + "authSettings" : "authSettings.js", + "ircSettings" : "ircSettings.js", + "config" : "config.js", + "customPrograms" : "customPrograms.js" } ] diff --git a/plugins/bluemonkey/bluemonkey.cpp b/plugins/bluemonkey/bluemonkey.cpp index 58923c5..fa3f357 100644 --- a/plugins/bluemonkey/bluemonkey.cpp +++ b/plugins/bluemonkey/bluemonkey.cpp @@ -209,10 +209,18 @@ QVariant Property::value() void Property::setValue(QVariant v) { - QJsonDocument doc; - doc.fromVariant(v); + if(v.type() == QVariant::List || v.type() == QVariant::Map) + { + + QJsonDocument doc = QJsonDocument::fromVariant(v); + + QString json = doc.toJson(); + + mValue->fromString(json.toStdString()); + } - mValue->fromString(doc.toJson().data()); + else + mValue->fromString(v.toString().toStdString()); AsyncSetPropertyRequest request; request.property = mValue->name; -- 2.7.4