Created class QStateAction to use as GAction proxy.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/common/qmenumodel.cpp b/src/common/qmenumodel.cpp
index af29ded..accc47d 100644
--- a/src/common/qmenumodel.cpp
+++ b/src/common/qmenumodel.cpp
@@ -183,7 +183,7 @@ QString QMenuModel::parseExtraPropertyName(const QString &name) const
 {
     QString newName(name);
     if (name.startsWith("x-")) {
-        newName = name.right(name.length() - 2);
+        newName = name.mid(2);
     }
     return newName.replace("-", "_");
 }
@@ -196,17 +196,17 @@ QVariant QMenuModel::getExtraProperties(const QModelIndex &index) const
         return QVariant();
     }
 
-    QObject *extra = new QObject(const_cast<QMenuModel*>(this));
+    QVariantMap extra;
     const gchar *attrName = NULL;
     GVariant *value = NULL;
     while (g_menu_attribute_iter_get_next (iter, &attrName, &value)) {
         if (strncmp("x-", attrName, 2) == 0) {
-
-            extra->setProperty(parseExtraPropertyName(attrName).toLatin1(), Converter::parseGVariant(value));
+            extra.insert(parseExtraPropertyName(attrName),
+                         Converter::parseGVariant(value));
         }
     }
 
-    return QVariant::fromValue<QObject*>(extra);
+    return extra;
 }
 
 /*! \internal */