Merge lp:~tiagosh/dee-qt/dee-qt-local-models into lp:dee-qt/0.2

[Tiago Salem Herrmann]

This MR implements a new method that makes libqtdee able to handle local models.
This is needed by unity-2d, as the new Home Lens implementation uses a local model instead of a remote/shared one.

[lp:~tiagosh/dee-qt/dee-qt-local-models]

62. By Tiago Salem Herrmann on 2012-01-31

remove white space and change void by DeeModel for setModel()

63. By Tiago Salem Herrmann on 2012-01-31

remove wrong casting

64. By Tiago Salem Herrmann on 2012-01-31

fix DeeModel forward declaration

[Michal Hruby (mhr3)]

28 - g_object_unref(m_deeModel);
29 + if (!m_isLocal)
30 + g_object_unref(m_deeModel);

Please don't do that, take a reference on the model even if it's a local model.

46 + m_deeModel = model;

Looks like here is a good place to do that ("m_deeModel = (DeeModel*)g_object_ref (model);")

review: Needs Fixing

[Gerry Boland (gerboland)]

I'm getting critical warnings of the form:

[CRITICAL] dee: dee_model_get_first_iter: assertion `DEE_IS_MODEL (self)' failed
[CRITICAL] dee: dee_model_get_last_iter: assertion `DEE_IS_MODEL (self)' failed
[CRITICAL] dee: dee_sequence_model_set_row: assertion `iter != NULL' failed

when using the local models lens. Some incorrect data seems to be coming out also.

I'm compiling against libdee-1.0-4 version 1.0.0+bzr340ubuntu0+224

This backtrace might help: https://pastebin.canonical.com/59428/ (got with G_DEBUG=fatal_criticals gdb unity-2d-shell)

I've had a little chat with Michal (mhr3) about it, but nothing obvious wrong struck him unfortunately.

review: Needs Fixing

[lp:~tiagosh/dee-qt/dee-qt-local-models]

65. By Tiago Salem Herrmann on 2012-02-03

take the model reference

66. By Tiago Salem Herrmann on 2012-02-07

rename roles for local model too and emit proper signals

[Albert Astals Cid (aacid)]

Should we on DeeListModel::setModel(DeeModel *model) disconnect from model even if the new one is null?

review: Needs Fixing

[Tiago Salem Herrmann (tiagosh)]

yes, you are right, just updated the branch.
Thanks.

[lp:~tiagosh/dee-qt/dee-qt-local-models]

67. By Tiago Salem Herrmann on 2012-02-10

disconnect from the previous model if the new model is NULL

[Albert Astals Cid (aacid)]

Looks good

review: Approve

=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2012-01-04 23:52:05 +0000
+++ deelistmodel.cpp	2012-02-10 13:29:16 +0000
@@ -71,6 +71,7 @@
     ~DeeListModelPrivate();
 
     void connectToDeeModel();
+    void connectToDeeModel(DeeModel *model);
     void disconnectFromDeeModel();
     void createRoles();
 
@@ -84,9 +85,10 @@
     DeeModel* m_deeModel;
     QString m_name;
     int m_count;
+    bool m_isLocal;
 };
 
-DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0)
+DeeListModelPrivate::DeeListModelPrivate(DeeListModel* parent) : m_parent(parent), m_deeModel(NULL), m_count(0), m_isLocal(false)
 {
 }
 
@@ -124,6 +126,24 @@
         g_signal_connect(m_deeModel, "row-removed", G_CALLBACK(onRowRemoved), m_parent);
         g_signal_connect(m_deeModel, "row-changed", G_CALLBACK(onRowChanged), m_parent);
     }
+    m_isLocal = false;
+}
+
+void
+DeeListModelPrivate::connectToDeeModel(DeeModel *model)
+{
+    disconnectFromDeeModel();
+
+    m_deeModel = (DeeModel*)g_object_ref (model);
+    g_signal_connect(m_deeModel, "row-added", G_CALLBACK(onRowAdded), m_parent);
+    g_signal_connect(m_deeModel, "row-removed", G_CALLBACK(onRowRemoved), m_parent);
+    g_signal_connect(m_deeModel, "row-changed", G_CALLBACK(onRowChanged), m_parent);
+    m_isLocal = true;
+    createRoles();
+    m_count = dee_model_get_n_rows(m_deeModel);
+    m_parent->reset();
+    Q_EMIT m_parent->countChanged();
+
 }
 
 void
@@ -251,13 +271,28 @@
     }
 }
 
+void
+DeeListModel::setModel(DeeModel *model)
+{
+    if (model != NULL) {
+        d->connectToDeeModel(model);
+    } else {
+        d->disconnectFromDeeModel();
+    }
+}
+
+
 bool
 DeeListModel::synchronized() const
 {
     if (d->m_deeModel == NULL) {
         return false;
     } else {
-        return dee_shared_model_is_synchronized(DEE_SHARED_MODEL(d->m_deeModel));
+        if (d->m_isLocal) {
+            return true;
+        } else {
+            return dee_shared_model_is_synchronized(DEE_SHARED_MODEL(d->m_deeModel));
+        }
     }
 }
 

=== modified file 'deelistmodel.h'
--- deelistmodel.h	2011-07-27 22:16:14 +0000
+++ deelistmodel.h	2012-02-10 13:29:16 +0000
@@ -23,6 +23,7 @@
 #include <QtCore/QAbstractListModel>
 
 class DeeListModelPrivate;
+typedef struct _DeeModel DeeModel;
 class __attribute__ ((visibility ("default"))) DeeListModel : public QAbstractListModel
 {
     friend class DeeListModelPrivate;
@@ -50,6 +51,7 @@
 
     /* setters */
     void setName(const QString& name);
+    void setModel(DeeModel* model);
 
 Q_SIGNALS:
     void nameChanged(const QString&);