diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-27 15:07:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 08:46:11 +0200 |
| commit | 29093aedee6969a5ea5c3d19d19fb40dbdd811e7 (patch) | |
| tree | 153706e0e86a691d26e4f73f74fd3ccfa33786b0 /src | |
| parent | d3224ad22a38264aaae81e96384182aee7c1053f (diff) | |
Remove unused notify signal.
With changes to how VisualDataModel attached objects are created the
model property is now always populated on construction and the
modelChanged signal is unnecessary.
Change-Id: Id02c4115e19900a2937031ca70b7cba34ff13d3a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickvisualdatamodel.cpp | 7 | ||||
| -rw-r--r-- | src/quick/items/qquickvisualdatamodel_p.h | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp index 63b4d58b6d..bd4f66f6fa 100644 --- a/src/quick/items/qquickvisualdatamodel.cpp +++ b/src/quick/items/qquickvisualdatamodel.cpp @@ -1883,7 +1883,6 @@ int QQuickVisualDataModelAttachedMetaObject::metaCall(QObject *object, QMetaObje QQuickVisualDataModelAttached::QQuickVisualDataModelAttached(QObject *parent) : m_cacheItem(0) , m_previousGroups(0) - , m_modelChanged(false) { QQml_setParent_noEvent(this, parent); } @@ -1892,7 +1891,6 @@ QQuickVisualDataModelAttached::QQuickVisualDataModelAttached( QQuickVisualDataModelItem *cacheItem, QObject *parent) : m_cacheItem(cacheItem) , m_previousGroups(cacheItem->groups) - , m_modelChanged(false) { QQml_setParent_noEvent(this, parent); if (QVDMIncubationTask *incubationTask = m_cacheItem->incubationTask) { @@ -2008,11 +2006,6 @@ bool QQuickVisualDataModelAttached::isUnresolved() const void QQuickVisualDataModelAttached::emitChanges() { - if (m_modelChanged) { - m_modelChanged = false; - emit modelChanged(); - } - const int groupChanges = m_previousGroups ^ m_cacheItem->groups; m_previousGroups = m_cacheItem->groups; diff --git a/src/quick/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h index fc29336d6c..1a8541f43c 100644 --- a/src/quick/items/qquickvisualdatamodel_p.h +++ b/src/quick/items/qquickvisualdatamodel_p.h @@ -192,7 +192,7 @@ class QQuickVisualDataModelAttachedMetaObject; class QQuickVisualDataModelAttached : public QObject { Q_OBJECT - Q_PROPERTY(QQuickVisualDataModel *model READ model NOTIFY modelChanged) + Q_PROPERTY(QQuickVisualDataModel *model READ model CONSTANT) Q_PROPERTY(QStringList groups READ groups WRITE setGroups NOTIFY groupsChanged) Q_PROPERTY(bool isUnresolved READ isUnresolved NOTIFY unresolvedChanged) public: @@ -214,7 +214,6 @@ public: void emitUnresolvedChanged() { emit unresolvedChanged(); } Q_SIGNALS: - void modelChanged(); void groupsChanged(); void unresolvedChanged(); @@ -223,7 +222,6 @@ public: int m_previousGroups; int m_currentIndex[QQuickListCompositor::MaximumGroupCount]; int m_previousIndex[QQuickListCompositor::MaximumGroupCount]; - bool m_modelChanged; friend class QQuickVisualDataModelAttachedMetaObject; }; |