From 1e9cf635d3074b82759b0edab44ba4549af5085e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2016 17:29:10 +0200 Subject: UnityMenuModel add support for activating and changing state with a variant string parameter --- libqmenumodel/src/unitymenumodel.cpp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'libqmenumodel/src/unitymenumodel.cpp') diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index 70412a4..6e9a5f7 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -715,6 +715,40 @@ void UnityMenuModel::activate(int index, const QVariant& parameter) } } +static QVariant parseVariantString(const QString& string) +{ + QVariant qvariant; + GVariant *gvariant; + GError *error = NULL; + + if (string.isEmpty()) { + return qvariant; + } + + gvariant = g_variant_parse (NULL, string.toStdString().c_str(), NULL, NULL, &error); + + if (error) { + qWarning() << "Impossible to parse" << string << "as variant string:"<< error->message; + g_error_free (error); + return qvariant; + } + + qvariant = Converter::toQVariant(gvariant); + g_variant_unref (gvariant); + + return qvariant; +} + +void UnityMenuModel::activateByVariantString(int index, const QString& parameter) +{ + activate(index, parseVariantString(parameter)); +} + +void UnityMenuModel::changeStateByVariantString(int index, const QString& parameter) +{ + changeState(index, parseVariantString(parameter)); +} + void UnityMenuModel::changeState(int index, const QVariant& parameter) { GSequenceIter *it; -- cgit v1.2.3