Merge lp:~nick-dedekind/qmenumodel/QTBUG-32859 into lp:~phablet-team/qmenumodel/trunk

[Nick Dedekind]

Adds qt event spawning to direct glib main loop callbacks.

Adds qt event spawning to direct glib main loop callbacks.
Fixes bug https://bugreports.qt-project.org/browse/QTBUG-32859

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qmenumodel-ci/15/rebuild

review: Approve (continuous-integration)

[lp:~nick-dedekind/qmenumodel/QTBUG-32859]

72. By Nick Dedekind on 2013-08-09

moved events to separate file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-armhf-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qmenumodel-ci/16/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Looks good to me, thanks.

review: Approve

=== modified file 'libqmenumodel/src/CMakeLists.txt'
--- libqmenumodel/src/CMakeLists.txt	2013-01-03 21:38:23 +0000
+++ libqmenumodel/src/CMakeLists.txt	2013-08-09 08:02:09 +0000
@@ -8,6 +8,7 @@
     qdbusobject.cpp
     qdbusmenumodel.cpp
     qdbusactiongroup.cpp
+    qmenumodelevents.cpp
     qstateaction.cpp
 )
 

=== modified file 'libqmenumodel/src/menunode.cpp'
--- libqmenumodel/src/menunode.cpp	2013-01-15 00:22:16 +0000
+++ libqmenumodel/src/menunode.cpp	2013-08-09 08:02:09 +0000
@@ -18,9 +18,11 @@
  */
 
 #include "menunode.h"
+#include "qmenumodelevents.h"
 
 #include <QMetaMethod>
 #include <QDebug>
+#include <QCoreApplication>
 
 MenuNode::MenuNode(const QString &linkType, GMenuModel *model, MenuNode *parent, int pos, QObject *listener)
     : m_model(model),
@@ -242,15 +244,8 @@
     self->m_currentOpAdded = added;
     self->m_currentOpRemoved = removed;
 
-    const QMetaObject *mobj = self->m_listener->metaObject();
-    if (!mobj->invokeMethod(self->m_listener,
-                           "onItemsChanged",
-                           Q_ARG(MenuNode*, self),
-                           Q_ARG(int, position),
-                           Q_ARG(int, removed),
-                           Q_ARG(int, added)))
-    {
-        qWarning() << "Slot 'onItemsChanged(MenuNode*, int, int, int)' not found in" << self->m_listener;
-    }
+    MenuNodeItemChangeEvent mnice(self, position, added, removed);
+    QCoreApplication::sendEvent(self->m_listener, &mnice);
+
     self->commitOperation();
 }

=== modified file 'libqmenumodel/src/qdbusactiongroup.cpp'
--- libqmenumodel/src/qdbusactiongroup.cpp	2012-11-22 19:13:02 +0000
+++ libqmenumodel/src/qdbusactiongroup.cpp	2013-08-09 08:02:09 +0000
@@ -20,6 +20,10 @@
 #include "qdbusactiongroup.h"
 #include "qstateaction.h"
 #include "converter.h"
+#include "qmenumodelevents.h"
+
+// Qt
+#include <QCoreApplication>
 
 extern "C" {
 #include <glib.h>
@@ -53,7 +57,8 @@
 /*! \internal */
 QDBusActionGroup::QDBusActionGroup(QObject *parent)
     :QObject(parent),
-      m_actionGroup(NULL)
+     QDBusObject(this),
+     m_actionGroup(NULL)
 {
 }
 
@@ -184,7 +189,8 @@
 
         gchar **actions = g_action_group_list_actions(m_actionGroup);
         for(guint i=0; i < g_strv_length(actions); i++) {
-            Q_EMIT actionAppear(actions[i]);
+            DBusActionVisiblityEvent dave(actions[i], true);
+            QCoreApplication::sendEvent(this, &dave);
         }
         g_strfreev(actions);
     }
@@ -218,23 +224,49 @@
     }
 }
 
+bool QDBusActionGroup::event(QEvent* e)
+{
+    if (QDBusObject::event(e)) {
+        return true;
+    } else if (e->type() == DBusActionVisiblityEvent::eventType) {
+        DBusActionVisiblityEvent *dave = static_cast<DBusActionVisiblityEvent*>(e);
+
+        if (dave->visible) {
+            Q_EMIT actionAppear(dave->name);
+        } else {
+            Q_EMIT actionVanish(dave->name);
+        }
+    } else if (e->type() == DBusActionStateEvent::eventType) {
+        DBusActionStateEvent *dase = static_cast<DBusActionStateEvent*>(e);
+
+        Q_EMIT actionStateChanged(dase->name, dase->state);
+    }
+    return QObject::event(e);
+}
+
 /*! \internal */
 void QDBusActionGroup::onActionAdded(GDBusActionGroup *, gchar *name, gpointer data)
 {
     QDBusActionGroup *self = reinterpret_cast<QDBusActionGroup*>(data);
-    Q_EMIT self->actionAppear(name);
+
+    DBusActionVisiblityEvent dave(name, true);
+    QCoreApplication::sendEvent(self, &dave);
 }
 
 /*! \internal */
 void QDBusActionGroup::onActionRemoved(GDBusActionGroup *, gchar *name, gpointer data)
 {
     QDBusActionGroup *self = reinterpret_cast<QDBusActionGroup*>(data);
-    Q_EMIT self->actionVanish(name);
+
+    DBusActionVisiblityEvent dave(name, false);
+    QCoreApplication::sendEvent(self, &dave);
 }
 
 /*! \internal */
 void QDBusActionGroup::onActionStateChanged(GDBusActionGroup *, gchar *name, GVariant *value, gpointer data)
 {
     QDBusActionGroup *self = reinterpret_cast<QDBusActionGroup*>(data);
-    Q_EMIT self->actionStateChanged(name, Converter::toQVariant(value));
+
+    DBusActionStateEvent dase(name, Converter::toQVariant(value));
+    QCoreApplication::sendEvent(self, &dase);
 }

=== modified file 'libqmenumodel/src/qdbusactiongroup.h'
--- libqmenumodel/src/qdbusactiongroup.h	2012-10-30 11:51:31 +0000
+++ libqmenumodel/src/qdbusactiongroup.h	2013-08-09 08:02:09 +0000
@@ -69,6 +69,8 @@
     virtual void serviceAppear(GDBusConnection *connection);
     virtual void serviceVanish(GDBusConnection *connection);
 
+    virtual bool event(QEvent* e);
+
 private:
     GActionGroup *m_actionGroup;
     int m_signalActionAddId;
@@ -89,4 +91,4 @@
     static void onActionStateChanged(GDBusActionGroup *ag, gchar *name, GVariant *value, gpointer data);
 };
 
-#endif
+#endif // QDBUSACTIONGROUP_H

=== modified file 'libqmenumodel/src/qdbusmenumodel.cpp'
--- libqmenumodel/src/qdbusmenumodel.cpp	2013-01-03 21:38:23 +0000
+++ libqmenumodel/src/qdbusmenumodel.cpp	2013-08-09 08:02:09 +0000
@@ -22,6 +22,9 @@
 }
 
 #include "qdbusmenumodel.h"
+#include "qmenumodelevents.h"
+
+#include <QCoreApplication>
 
 /*!
     \qmltype QDBusMenuModel
@@ -49,7 +52,8 @@
     \endcode
 */
 QDBusMenuModel::QDBusMenuModel(QObject *parent)
-    : QMenuModel(0, parent)
+    : QMenuModel(0, parent),
+      QDBusObject(this)
 {
 }
 
@@ -83,13 +87,24 @@
 void QDBusMenuModel::stop()
 {
     QDBusObject::disconnect();
-    setMenuModel(NULL);
+
+    MenuModelEvent mme(NULL);
+    QCoreApplication::sendEvent(this, &mme);
+}
+
+bool QDBusMenuModel::event(QEvent* e)
+{
+    if (QDBusObject::event(e)) {
+        return true;
+    }
+    return QMenuModel::event(e);
 }
 
 /*! \internal */
 void QDBusMenuModel::serviceVanish(GDBusConnection *)
 {
-    setMenuModel(NULL);
+    MenuModelEvent mme(NULL);
+    QCoreApplication::sendEvent(this, &mme);
 }
 
 /*! \internal */
@@ -98,8 +113,10 @@
     GMenuModel *model = G_MENU_MODEL(g_dbus_menu_model_get(connection,
                                                            busName().toUtf8().data(),
                                                            objectPath().toUtf8().data()));
-    setMenuModel(model);
-    //setModel take care of the ref
+
+    MenuModelEvent mme(model);
+    QCoreApplication::sendEvent(this, &mme);
+    //event handling takes care of the ref
     g_object_unref(model);
 }
 

=== modified file 'libqmenumodel/src/qdbusmenumodel.h'
--- libqmenumodel/src/qdbusmenumodel.h	2012-10-11 08:54:49 +0000
+++ libqmenumodel/src/qdbusmenumodel.h	2013-08-09 08:02:09 +0000
@@ -49,6 +49,8 @@
     virtual void serviceAppear(GDBusConnection *connection);
     virtual void serviceVanish(GDBusConnection *connection);
 
+    virtual bool event(QEvent* e);
+
 private:
     // workaround to support int as busType
     void setIntBusType(int busType);

=== modified file 'libqmenumodel/src/qdbusobject.cpp'
--- libqmenumodel/src/qdbusobject.cpp	2012-10-30 12:06:35 +0000
+++ libqmenumodel/src/qdbusobject.cpp	2013-08-09 08:02:09 +0000
@@ -23,8 +23,10 @@
 }
 
 #include "qdbusobject.h"
+#include "qmenumodelevents.h"
 
 #include <QDebug>
+#include <QCoreApplication>
 
 /*!
     \qmltype QDBusObject
@@ -73,8 +75,9 @@
     \endlist
 */
 
-QDBusObject::QDBusObject()
-    :m_watchId(0),
+QDBusObject::QDBusObject(QObject* listener)
+    :m_listener(listener),
+     m_watchId(0),
      m_busType(DBusEnums::None),
      m_status(DBusEnums::Disconnected)
 {
@@ -181,14 +184,34 @@
 {
     QDBusObject *self = reinterpret_cast<QDBusObject*>(data);
 
-    self->serviceAppear(connection);
-    self->setStatus(DBusEnums::Connected);
+    if (self->m_listener) {
+        DbusObjectServiceEvent dose(connection, true);
+        QCoreApplication::sendEvent(self->m_listener, &dose);
+    }
 }
 
 void QDBusObject::onServiceVanished(GDBusConnection *connection, const gchar *, gpointer data)
 {
-    QDBusObject *self = reinterpret_cast<QDBusObject*>(data);    
-
-    self->setStatus(DBusEnums::Connecting);
-    self->serviceVanish(connection);
+    QDBusObject *self = reinterpret_cast<QDBusObject*>(data);
+
+    if (self->m_listener) {
+        DbusObjectServiceEvent dose(connection, false);
+        QCoreApplication::sendEvent(self->m_listener, &dose);
+    }
+}
+
+bool QDBusObject::event(QEvent* e)
+{
+    if (e->type() == DbusObjectServiceEvent::eventType) {
+        DbusObjectServiceEvent *dose = static_cast<DbusObjectServiceEvent*>(e);
+        if (dose->visible) {
+            serviceAppear(dose->connection);
+            setStatus(DBusEnums::Connected);
+        } else {
+            setStatus(DBusEnums::Connecting);
+            serviceVanish(dose->connection);
+        }
+        return true;
+    }
+    return false;
 }

=== modified file 'libqmenumodel/src/qdbusobject.h'
--- libqmenumodel/src/qdbusobject.h	2012-10-10 07:41:24 +0000
+++ libqmenumodel/src/qdbusobject.h	2013-08-09 08:02:09 +0000
@@ -32,7 +32,7 @@
 class QDBusObject
 {
 public:
-    QDBusObject();
+    QDBusObject(QObject* listener);
     ~QDBusObject();
 
     DBusEnums::BusType busType() const;
@@ -59,7 +59,11 @@
     virtual void objectPathChanged(const QString &objectPath) = 0;
     virtual void statusChanged(DBusEnums::ConnectionStatus status) = 0;
 
+    // This is not a Qbject, but we are passed events from superclass qobjects.
+    virtual bool event(QEvent* e);
+
 private:
+    QObject* m_listener;
     guint m_watchId;
     DBusEnums::BusType m_busType;
     QString m_busName;

=== modified file 'libqmenumodel/src/qmenumodel.cpp'
--- libqmenumodel/src/qmenumodel.cpp	2013-05-23 08:44:41 +0000
+++ libqmenumodel/src/qmenumodel.cpp	2013-08-09 08:02:09 +0000
@@ -25,6 +25,8 @@
 #include "qmenumodel.h"
 #include "menunode.h"
 #include "converter.h"
+#include "qmenumodelevents.h"
+
 #include <QCoreApplication>
 #include <QThread>
 
@@ -225,28 +227,37 @@
     return extra;
 }
 
-/*! \internal */
-void QMenuModel::onItemsChanged(MenuNode *node,
-                                int position,
-                                int removed,
-                                int added)
+bool QMenuModel::event(QEvent* e)
 {
-    QModelIndex index = indexFromNode(node);
-    if (removed > 0) {
-        beginRemoveRows(index, position, position + removed - 1);
-
-        node->commitOperation();
-
-        endRemoveRows();
-    }
-
-    if (added > 0) {
-        beginInsertRows(index, position, position + added - 1);
-
-        node->commitOperation();
-
-        endInsertRows();
-    }
+    if (e->type() == MenuNodeItemChangeEvent::eventType) {
+        MenuNodeItemChangeEvent *mnice = static_cast<MenuNodeItemChangeEvent*>(e);
+
+        QModelIndex index = indexFromNode(mnice->node);
+        if (mnice->removed > 0) {
+            beginRemoveRows(index, mnice->position, mnice->position + mnice->removed - 1);
+
+            mnice->node->commitOperation();
+
+            endRemoveRows();
+        }
+
+        if (mnice->added > 0) {
+            beginInsertRows(index, mnice->position, mnice->position + mnice->added - 1);
+
+            mnice->node->commitOperation();
+
+            endInsertRows();
+        }
+        return true;
+
+    } else if (e->type() == MenuModelEvent::eventType) {
+
+        MenuModelEvent *mme = static_cast<MenuModelEvent*>(e);
+
+        setMenuModel(mme->model);
+        return true;
+    }
+    return QAbstractItemModel::event(e);
 }
 
 /*! \internal */

=== modified file 'libqmenumodel/src/qmenumodel.h'
--- libqmenumodel/src/qmenumodel.h	2013-01-03 21:38:23 +0000
+++ libqmenumodel/src/qmenumodel.h	2013-08-09 08:02:09 +0000
@@ -52,14 +52,13 @@
 Q_SIGNALS:
     void countChanged();
 
-public Q_SLOTS:
-    void onItemsChanged(MenuNode *node, int position, int removed, int added);
-
 protected:
     QMenuModel(GMenuModel *other=0, QObject *parent=0);
     void setMenuModel(GMenuModel *model);
     GMenuModel *menuModel() const;
 
+    virtual bool event(QEvent* e);
+
 private:
     MenuNode *m_root;
 

=== added file 'libqmenumodel/src/qmenumodelevents.cpp'
--- libqmenumodel/src/qmenumodelevents.cpp	1970-01-01 00:00:00 +0000
+++ libqmenumodel/src/qmenumodelevents.cpp	2013-08-09 08:02:09 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nicholas Dedekind <[e-mail]
+ */
+
+extern "C" {
+#include <glib-object.h>
+#include <gio/gio.h>
+}
+
+#include "qmenumodelevents.h"
+
+const QEvent::Type MenuNodeItemChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type DBusActionStateEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type DBusActionVisiblityEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type MenuModelEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type DbusObjectServiceEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+
+MenuNodeItemChangeEvent::MenuNodeItemChangeEvent(MenuNode* _node, int _position, int _removed, int _added)
+    : QEvent(MenuNodeItemChangeEvent::eventType),
+      node(_node),
+      position(_position),
+      removed(_removed),
+      added(_added)
+{}
+
+
+DBusActionEvent::DBusActionEvent(const QString& _name, QEvent::Type type)
+    : QEvent(type),
+      name(_name)
+{
+}
+
+
+DBusActionVisiblityEvent::DBusActionVisiblityEvent(const QString& _name, bool _visible)
+    : DBusActionEvent(_name, DBusActionVisiblityEvent::eventType),
+      visible(_visible)
+{
+}
+
+
+DBusActionStateEvent::DBusActionStateEvent(const QString& _name, const QVariant& _state)
+    : DBusActionEvent(_name, DBusActionStateEvent::eventType),
+      state(_state)
+{
+}
+
+
+DbusObjectServiceEvent::DbusObjectServiceEvent(GDBusConnection* _connection, bool _visible)
+    : QEvent(DbusObjectServiceEvent::eventType),
+      connection(_connection),
+      visible(_visible)
+{
+    if (connection) {
+        g_object_ref(connection);
+    }
+}
+
+
+DbusObjectServiceEvent::~DbusObjectServiceEvent()
+{
+    if (connection) {
+        g_object_unref(connection);
+    }
+}
+
+
+MenuModelEvent::MenuModelEvent(GMenuModel* _model)
+    : QEvent(MenuModelEvent::eventType),
+      model(_model)
+{
+    if (model) {
+        g_object_ref(model);
+    }
+}
+
+MenuModelEvent::~MenuModelEvent()
+{
+    if (model) {
+        g_object_unref(model);
+    }
+}

=== added file 'libqmenumodel/src/qmenumodelevents.h'
--- libqmenumodel/src/qmenumodelevents.h	1970-01-01 00:00:00 +0000
+++ libqmenumodel/src/qmenumodelevents.h	2013-08-09 08:02:09 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nicholas Dedekind <[e-mail]
+ */
+
+#ifndef QMENUMODELEVENTS_H
+#define QMENUMODELEVENTS_H
+
+#include <QEvent>
+#include <QVariant>
+
+class MenuNode;
+typedef struct _GDBusConnection GDBusConnection;
+typedef struct _GMenuModel GMenuModel;
+
+/* Event for a connection update for a dbus object */
+class DbusObjectServiceEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+    DbusObjectServiceEvent(GDBusConnection* connection, bool visible);
+    ~DbusObjectServiceEvent();
+
+    GDBusConnection* connection;
+    bool visible;
+};
+
+/* Event for an update to the gmenumodel */
+class MenuModelEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+
+    MenuModelEvent(GMenuModel *model);
+    ~MenuModelEvent();
+
+    GMenuModel *model;
+};
+
+/* Event for a GAction (base) */
+class DBusActionEvent : public QEvent
+{
+public:
+    QString name;
+
+protected:
+    DBusActionEvent(const QString& name, QEvent::Type type);
+};
+
+/* Event for a GAction add/remove */
+class DBusActionVisiblityEvent : public DBusActionEvent
+{
+public:
+    static const QEvent::Type eventType;
+    DBusActionVisiblityEvent(const QString& name, bool visible);
+
+    bool visible;
+};
+
+/* Event for a GAction state value update */
+class DBusActionStateEvent : public DBusActionEvent
+{
+public:
+    static const QEvent::Type eventType;
+
+    DBusActionStateEvent(const QString& name, const QVariant& state);
+
+    QVariant state;
+};
+
+/* Event for changing gmenumodel entries */
+class MenuNodeItemChangeEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+
+    MenuNodeItemChangeEvent(MenuNode* node, int position, int removed, int added);
+
+    MenuNode* node;
+    int position;
+    int removed;
+    int added;
+};
+
+#endif //QMENUMODELEVENTS_H