Glib callbacks send events through qt.

1 files changed, 42 insertions, 15 deletions

diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index 9bc9e02..2b1397a 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -28,6 +28,8 @@ extern "C" {
 #include <QCoreApplication>
 #include <QThread>
 
+const QEvent::Type MenuModelEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+
 /*!
     \qmltype QMenuModel
     \brief The QMenuModel class implements the base list model for menus
@@ -225,28 +227,37 @@ QVariant QMenuModel::getExtraProperties(MenuNode *node, int row) const
     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);
+    if (e->type() == MenuNodeItemChangeEvent::eventType) {
+        MenuNodeItemChangeEvent *mnice = static_cast<MenuNodeItemChangeEvent*>(e);
 
-        node->commitOperation();
+        QModelIndex index = indexFromNode(mnice->node);
+        if (mnice->removed > 0) {
+            beginRemoveRows(index, mnice->position, mnice->position + mnice->removed - 1);
 
-        endRemoveRows();
-    }
+            mnice->node->commitOperation();
+
+            endRemoveRows();
+        }
+
+        if (mnice->added > 0) {
+            beginInsertRows(index, mnice->position, mnice->position + mnice->added - 1);
+
+            mnice->node->commitOperation();
+
+            endInsertRows();
+        }
+        return true;
 
-    if (added > 0) {
-        beginInsertRows(index, position, position + added - 1);
+    } else if (e->type() == MenuModelEvent::eventType) {
 
-        node->commitOperation();
+        MenuModelEvent *mme = static_cast<MenuModelEvent*>(e);
 
-        endInsertRows();
+        setMenuModel(mme->model);
+        return true;
     }
+    return QAbstractItemModel::event(e);
 }
 
 /*! \internal */
@@ -292,3 +303,19 @@ bool QMenuModel::hasLink(MenuNode *node, int row, const QString &linkType) const
     MenuNode *child = node->child(row);
     return (child && (child->linkType() == linkType));
 }
+
+MenuModelEvent::MenuModelEvent(GMenuModel* _model)
+    : QEvent(MenuModelEvent::eventType),
+      model(_model)
+{
+    if (model) {
+        g_object_ref(model);
+    }
+}
+
+MenuModelEvent::~MenuModelEvent()
+{
+    if (model) {
+        g_object_unref(model);
+    }
+}