From 2d050cddb8a4aa3ada8f956e071efed9d53898fd Mon Sep 17 00:00:00 2001
From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Date: Thu, 3 Jan 2013 18:38:23 -0300
Subject: Implmeneted QMenuModel as tree model.

---
 libqmenumodel/src/menunode.h | 70 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 libqmenumodel/src/menunode.h

(limited to 'libqmenumodel/src/menunode.h')

diff --git a/libqmenumodel/src/menunode.h b/libqmenumodel/src/menunode.h
new file mode 100644
index 0000000..d7a893c
--- /dev/null
+++ b/libqmenumodel/src/menunode.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 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:
+ *      Renato Araujo Oliveira Filho <renato@canonical.com>
+ */
+
+#ifndef MENULI_H
+#define MENUNODE_H
+
+#include <QObject>
+#include <QPointer>
+#include <QMap>
+#include <QVariant>
+
+extern "C" {
+#include <gio/gio.h>
+}
+
+class MenuNode
+{
+public:
+    MenuNode(const QString &linkType, GMenuModel *model, MenuNode *parent, int pos, QObject *listener);
+    ~MenuNode();
+
+    int position() const;
+    MenuNode *parent() const;
+    GMenuModel *model() const;
+    QString linkType() const;
+
+    void connect(QObject *listener);
+    void disconnect();
+    int size() const;
+    MenuNode *child(int pos) const;
+
+    void insertChild(MenuNode *child, int pos);
+    int childPosition(GMenuModel *item)  const;
+    int childPosition(const MenuNode *item) const;
+
+    int depth() const;
+    void change(int start, int added, int removed);
+    MenuNode *find(GMenuModel *item);
+
+    static MenuNode *create(GMenuModel *model, int pos, MenuNode *parent=0, QObject *listener=0);
+
+private:
+    GMenuModel *m_model;
+    QMap<int, MenuNode*> m_children;
+    MenuNode* m_parent;
+    int m_size;
+    QObject *m_listener;
+    gulong m_signalChangedId;
+    QString m_linkType;
+
+    static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data);
+};
+
+#endif
-- 
cgit v1.2.3


From 33147e96ae17a01a3f025a5b7b78bff7943b4851 Mon Sep 17 00:00:00 2001
From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Date: Thu, 10 Jan 2013 15:54:35 -0300
Subject: Fixed item removal and insertion. Removed debug messages. Fixed tests
 to work with new tree model structure.

---
 libqmenumodel/src/menunode.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libqmenumodel/src/menunode.h')

diff --git a/libqmenumodel/src/menunode.h b/libqmenumodel/src/menunode.h
index d7a893c..21fc5bc 100644
--- a/libqmenumodel/src/menunode.h
+++ b/libqmenumodel/src/menunode.h
@@ -53,6 +53,9 @@ public:
     void change(int start, int added, int removed);
     MenuNode *find(GMenuModel *item);
 
+    int realPosition(int row) const;
+    void commitOperation();
+
     static MenuNode *create(GMenuModel *model, int pos, MenuNode *parent=0, QObject *listener=0);
 
 private:
@@ -63,6 +66,9 @@ private:
     QObject *m_listener;
     gulong m_signalChangedId;
     QString m_linkType;
+    int m_currentOpPosition;
+    int m_currentOpAdded;
+    int m_currentOpRemoved;
 
     static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data);
 };
-- 
cgit v1.2.3