From 0ca199d4f212de9f998b4bc70616f9662134c9ef Mon Sep 17 00:00:00 2001
From: Nick Dedekind <nick.dedekind@canonical.com>
Date: Tue, 11 Nov 2014 14:49:40 +0000
Subject: Allow override of action state parser

---
 libqmenumodel/src/qdbusactiongroup.cpp | 25 +++++++++++++++++++++++--
 libqmenumodel/src/qdbusactiongroup.h   |  8 ++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'libqmenumodel/src')

diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index 0ef907a..b29ece0 100644
--- a/libqmenumodel/src/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
@@ -17,6 +17,7 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
+#include "actionstateparser.h"
 #include "qdbusactiongroup.h"
 #include "qstateaction.h"
 #include "converter.h"
@@ -58,7 +59,8 @@ extern "C" {
 QDBusActionGroup::QDBusActionGroup(QObject *parent)
     :QObject(parent),
      QDBusObject(this),
-     m_actionGroup(NULL)
+     m_actionGroup(NULL),
+     m_actionStateParser(new ActionStateParser(this))
 {
 }
 
@@ -89,7 +91,13 @@ QVariant QDBusActionGroup::actionState(const QString &name)
 {
     QVariant result;
     GVariant *state = g_action_group_get_action_state(m_actionGroup, name.toUtf8().data());
-    result = Converter::toQVariant(state);
+
+    if (m_actionStateParser != NULL) {
+        result = m_actionStateParser->toQVariant(state);
+    } else {
+        result = Converter::toQVariant(state);
+    }
+
     if (state) {
         g_variant_unref(state);
     }
@@ -190,6 +198,19 @@ void QDBusActionGroup::setActionGroup(GDBusActionGroup *ag)
     }
 }
 
+ActionStateParser* QDBusActionGroup::actionStateParser() const
+{
+    return m_actionStateParser;
+}
+
+void QDBusActionGroup::setActionStateParser(ActionStateParser* actionStateParser)
+{
+    if (m_actionStateParser != actionStateParser) {
+        m_actionStateParser = actionStateParser;
+        Q_EMIT actionStateParserChanged(actionStateParser);
+    }
+}
+
 /*! \internal */
 void QDBusActionGroup::clear()
 {
diff --git a/libqmenumodel/src/qdbusactiongroup.h b/libqmenumodel/src/qdbusactiongroup.h
index f369a4e..2953e21 100644
--- a/libqmenumodel/src/qdbusactiongroup.h
+++ b/libqmenumodel/src/qdbusactiongroup.h
@@ -26,6 +26,7 @@
 #include <QVariant>
 
 class QStateAction;
+class ActionStateParser;
 
 typedef char gchar;
 typedef void* gpointer;
@@ -40,6 +41,7 @@ class QDBusActionGroup : public QObject, public QDBusObject
     Q_PROPERTY(QString busName READ busName WRITE setBusName NOTIFY busNameChanged)
     Q_PROPERTY(QString objectPath READ objectPath WRITE setObjectPath NOTIFY objectPathChanged)
     Q_PROPERTY(int status READ status NOTIFY statusChanged)
+    Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
 
 public:
     QDBusActionGroup(QObject *parent=0);
@@ -52,6 +54,9 @@ public:
     Q_INVOKABLE QStateAction *action(const QString &name);
     Q_INVOKABLE QVariant actionState(const QString &name);
 
+    ActionStateParser* actionStateParser() const;
+    void setActionStateParser(ActionStateParser* actionStateParser);
+
 Q_SIGNALS:
     void busTypeChanged(DBusEnums::BusType type);
     void busNameChanged(const QString &busNameChanged);
@@ -60,6 +65,7 @@ Q_SIGNALS:
     void actionAppear(const QString &name);
     void actionVanish(const QString &name);
     void actionStateChanged(const QString &name, QVariant state);
+    void actionStateParserChanged(ActionStateParser* parser);
 
 public Q_SLOTS:
     void start();
@@ -77,6 +83,8 @@ private:
     int m_signalActionRemovedId;
     int m_signalStateChangedId;
 
+    ActionStateParser* m_actionStateParser;
+
     // workaround to support int as busType
     void setIntBusType(int busType);
 
-- 
cgit v1.2.3


From 7dc65fdaebc16de9521ddabec184fafe2132a518 Mon Sep 17 00:00:00 2001
From: Nick Dedekind <nick.dedekind@canonical.com>
Date: Wed, 10 Dec 2014 16:23:27 +0000
Subject: added comment

---
 libqmenumodel/src/qdbusactiongroup.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libqmenumodel/src')

diff --git a/libqmenumodel/src/qdbusactiongroup.h b/libqmenumodel/src/qdbusactiongroup.h
index 2953e21..afb12f2 100644
--- a/libqmenumodel/src/qdbusactiongroup.h
+++ b/libqmenumodel/src/qdbusactiongroup.h
@@ -55,6 +55,7 @@ public:
     Q_INVOKABLE QVariant actionState(const QString &name);
 
     ActionStateParser* actionStateParser() const;
+    // Ownership of the actionStateParser is not passed to this object.
     void setActionStateParser(ActionStateParser* actionStateParser);
 
 Q_SIGNALS:
-- 
cgit v1.2.3