Merge lp:~fboucault/unity-2d/qsortfilter_rolenames_propagation into lp:unity-2d/3.0

[Florian Boucault]

[backend] QSortFilterProxyModel: workaround for lack of roleNames change propagation.

[Florian Boucault (fboucault)]

This change depends on a newer libqtdee available from the PPA.

[lp:~fboucault/unity-2d/qsortfilter_rolenames_propagation]

634. By Florian Boucault on 2011-07-15

Added warning.

[Gerry Boland (gerboland)]

Looks good, accepted.

review: Approve

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-04-28 13:09:25 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-07-15 10:59:29 +0000
@@ -22,10 +22,10 @@
 {
 }
 
-void
-QSortFilterProxyModelQML::updateRoleNames()
+void QSortFilterProxyModelQML::setRoleNames(const QHash<int,QByteArray> &roleNames)
 {
-    setRoleNames(((QAbstractItemModel*)sourceModel())->roleNames());
+    QSortFilterProxyModel::setRoleNames(roleNames);
+    Q_EMIT roleNamesChanged(roleNames);
 }
 
 QObject*
@@ -51,10 +51,19 @@
         sourceModel()->disconnect(this);
     }
 
+    /* Workaround for limitation of QAbstractProxyModel: if sourceModel's
+       roleNames changes, the QAbstractProxyModel's roleNames are not updated
+       to reflect that change.
+       As a consequence it works around Qt bug http://bugreports.qt.nokia.com/browse/QTBUG-20405
+    */
+    bool hasRoleNamesChangedSignal;
+    hasRoleNamesChangedSignal = connect(itemModel, SIGNAL(roleNamesChanged(QHash<int,QByteArray>)), SLOT(setRoleNames(QHash<int,QByteArray>)));
+    if (!hasRoleNamesChangedSignal) {
+        UQ_WARNING << "received a sourceModel that does not notify of changes of its roleNames";
+    }
+    setRoleNames(itemModel->roleNames());
+
     setSourceModel(itemModel);
-
-    connect(itemModel, SIGNAL(modelAboutToBeReset()), SLOT(updateRoleNames()));
-    connect(itemModel, SIGNAL(modelReset()), SLOT(updateRoleNames()));
 }
 
 QVariantMap

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-03-23 14:04:23 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-07-15 10:59:29 +0000
@@ -37,8 +37,10 @@
     /* setters */
     void setSourceModelQObject(QObject *model);
 
-private Q_SLOTS:
-    void updateRoleNames();
+    Q_SLOT void setRoleNames(const QHash<int,QByteArray> &roleNames);
+
+Q_SIGNALS:
+    void roleNamesChanged(const QHash<int,QByteArray> &);
 };
 
 #endif // QSORTFILTERPROXYMODELQML_H