From 7e60f8e728bf908b814934b25a030551619a416d Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 28 Jul 2009 16:53:17 +1000
Subject: qmlAttachedProperties should return the actual attached object type.

---
 src/declarative/fx/qfxgridview.cpp | 2 +-
 src/declarative/fx/qfxgridview.h   | 3 ++-
 src/declarative/fx/qfxlistview.cpp | 2 +-
 src/declarative/fx/qfxlistview.h   | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index a91ddc6..9bd1c21 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1421,7 +1421,7 @@ void QFxGridView::refill()
 }
 
 
-QObject *QFxGridView::qmlAttachedProperties(QObject *obj)
+QFxGridViewAttached *QFxGridView::qmlAttachedProperties(QObject *obj)
 {
     return QFxGridViewAttached::properties(obj);
 }
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 8f443e1..d45eddb 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 class QFxVisualItemModel;
+class QFxGridViewAttached;
 class QFxGridViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
 {
@@ -109,7 +110,7 @@ public:
     int cellHeight() const;
     void setCellHeight(int);
 
-    static QObject *qmlAttachedProperties(QObject *);
+    static QFxGridViewAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void countChanged();
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index f300d1e..bf8e289 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1640,7 +1640,7 @@ void QFxListView::destroyingItem(QFxItem *item)
     d->unrequestedItems.remove(item);
 }
 
-QObject *QFxListView::qmlAttachedProperties(QObject *obj)
+QFxListViewAttached *QFxListView::qmlAttachedProperties(QObject *obj)
 {
     return QFxListViewAttached::properties(obj);
 }
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 2a70af0..04b45cd 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QFxVisualItemModel;
+class QFxListViewAttached;
 class QFxListViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
 {
@@ -116,7 +117,7 @@ public:
     void setSectionExpression(const QString &);
     QString currentSection() const;
 
-    static QObject *qmlAttachedProperties(QObject *);
+    static QFxListViewAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void countChanged();
-- 
cgit v0.12