Merge branch 'master' of git@scm.dev.nokia.troll.no:research/itemviews-ng

Conflicts:
	src/qgraphicslistview.h

1 files changed, 30 insertions, 16 deletions

diff --git a/src/qgraphicslistview.h b/src/qgraphicslistview.h
index 17829c6..bf3aa17 100644
--- a/src/qgraphicslistview.h
+++ b/src/qgraphicslistview.h
@@ -24,6 +24,8 @@
 #ifndef QTGRAPHICSLISTVIEW_H
 #define QTGRAPHICSLISTVIEW_H
 
+#include "qitemviewsglobal.h"
+
 #include <QtGui/qgraphicswidget.h>
 
 QT_BEGIN_HEADER
@@ -83,26 +85,38 @@ public:
 };
 
 template <class T>
-class Q_ITEMVIEWSNG_EXPORT QtGraphicsListViewItemCreator : public QtGraphicsListViewItemCreatorBase
+class QtGraphicsListViewItemCreator : public QtGraphicsListViewItemCreatorBase
 {
 public:
-    inline QGraphicsObject *create(int index, QtGraphicsListView *view)
-    {
-        return new T(index, view);
-    }
-    inline QGraphicsObject *reassign(int index, QGraphicsObject *item, QtGraphicsListView *view)
-    {
-        Q_UNUSED(view);
-        static_cast<T*>(item)->setIndex(index);
-        return item;
-    }
-    inline void update(int index, QGraphicsObject *item, const QList<int> &roles)
-    {
-        Q_UNUSED(index);
-        static_cast<T*>(item)->itemChanged(roles);
-    }
+    ~QtGraphicsListViewItemCreator();
+    QGraphicsObject *create(int index, QtGraphicsListView *view);
+    QGraphicsObject *reassign(int index, QGraphicsObject *item, QtGraphicsListView *view);
+    void update(int index, QGraphicsObject *item, const QList<int> &roles);
 };
 
+template <class T>
+QtGraphicsListViewItemCreator<T>::~QtGraphicsListViewItemCreator()
+{}
+
+template <class T>
+inline QGraphicsObject *QtGraphicsListViewItemCreator<T>::create(int index, QtGraphicsListView *view)
+{ return new T(index, view); }
+
+template <class T>
+inline QGraphicsObject *QtGraphicsListViewItemCreator<T>::reassign(int index, QGraphicsObject *item, QtGraphicsListView *view)
+{
+	Q_UNUSED(view);
+	static_cast<T*>(item)->setIndex(index);
+	return item;
+}
+
+template <class T>
+inline void QtGraphicsListViewItemCreator<T>::update(int index, QGraphicsObject *item, const QList<int> &roles)
+{
+	Q_UNUSED(index);
+	static_cast<T*>(item)->itemChanged(roles);
+}
+
 class Q_ITEMVIEWSNG_EXPORT QtGraphicsListView : public QGraphicsWidget
 {
     Q_OBJECT