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

Conflicts:
	src/qgraphicstreeview.cpp

1 files changed, 20 insertions, 20 deletions

diff --git a/src/qgraphicstreeview.h b/src/qgraphicstreeview.h
index 55cf522..d9ad479 100644
--- a/src/qgraphicstreeview.h
+++ b/src/qgraphicstreeview.h
@@ -42,7 +42,7 @@ class QtGraphicsTreeView;
 class QtGraphicsTreeViewPrivate;
 class QtGraphicsTreeViewItemPrivate;
 class QtTreeSelectionManager;
-class QTreeSelections;
+class QtTreeSelections;
 class QtTreeController;
 class QtGraphicsHeader;
 
@@ -54,21 +54,21 @@ class QWidget;
 class QtGraphicsTreeViewItem : public QGraphicsWidget
 {
 public:
-    QtGraphicsTreeViewItem(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view);
+    QtGraphicsTreeViewItem(const QtTreeModelIterator &it, int index, QtGraphicsTreeView *view);
     ~QtGraphicsTreeViewItem();
 
     int index() const;
     void setIndex(int index);
 
-    QTreeModelIterator iterator() const;
-    void setIterator(const QTreeModelIterator &it);
+    QtTreeModelIterator iterator() const;
+    void setIterator(const QtTreeModelIterator &it);
 
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-    virtual QSizeF sizeHint(const QTreeModelIterator &it, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-    virtual QSizeF sizeHint(const QTreeModelIterator &it, int column, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    virtual QSizeF sizeHint(const QtTreeModelIterator &it, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    virtual QSizeF sizeHint(const QtTreeModelIterator &it, int column, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
 
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-    virtual void paintBranches(QPainter *painter, QStyleOptionViewItemV4 *option, const QStack<QTreeModelIterator> &stack);
+    virtual void paintBranches(QPainter *painter, QStyleOptionViewItemV4 *option, const QStack<QtTreeModelIterator> &stack);
     virtual void itemChanged(const QList<int> &roles = QList<int>());
 
     QHash<int, QVariant> data(int column = 0, const QList<int> &roles = QList<int>()) const;
@@ -86,14 +86,14 @@ class QtGraphicsTreeViewItemCreatorBase
 {
 public:
     virtual ~QtGraphicsTreeViewItemCreatorBase() {}
-    virtual QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view) const = 0;
+    virtual QtGraphicsTreeViewItem *create(const QtTreeModelIterator &it, int index, QtGraphicsTreeView *view) const = 0;
 };
 
 template <class T>
 class QtGraphicsTreeViewItemCreator : public QtGraphicsTreeViewItemCreatorBase
 {
 public:
-    inline QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, int index, QtGraphicsTreeView *view) const { return new T(it, index, view); }
+    inline QtGraphicsTreeViewItem *create(const QtTreeModelIterator &it, int index, QtGraphicsTreeView *view) const { return new T(it, index, view); }
 };
 
 
@@ -131,10 +131,10 @@ public:
     qreal maximumHorizontalOffset() const;
     qreal maximumVerticalOffset() const;
 
-    bool isItemExpanded(const QTreeModelIterator &it) const;
+    bool isItemExpanded(const QtTreeModelIterator &it) const;
 
-    void nextItem(QTreeModelIterator &it) const;
-    void previousItem(QTreeModelIterator &it) const;
+    void nextItem(QtTreeModelIterator &it) const;
+    void previousItem(QtTreeModelIterator &it) const;
 
     QRectF disclosureRect(const QRectF &rect) const;
 
@@ -144,27 +144,27 @@ public:
     //const QList<QtGraphicsTreeViewItem*> &viewItems() const;
 
     virtual void doLayout();
-    virtual QTreeModelIterator itemAt(const QPointF &position, QRectF *rect = 0) const;
+    virtual QtTreeModelIterator itemAt(const QPointF &position, QRectF *rect = 0) const;
 
     virtual void initStyleOption(QStyleOptionViewItemV4 *option, QPaintDevice *device = 0) const;
-    virtual void initStyleOption(QStyleOptionViewItemV4 *option, const QTreeModelIterator &it, int column) const;
-    virtual void initStyleOptionState(QStyleOptionViewItemV4 *option, const QTreeModelIterator &it, int column) const;
+    virtual void initStyleOption(QStyleOptionViewItemV4 *option, const QtTreeModelIterator &it, int column) const;
+    virtual void initStyleOptionState(QStyleOptionViewItemV4 *option, const QtTreeModelIterator &it, int column) const;
     void copyStyleOptionState(const QStyleOptionGraphicsItem *source, QStyleOptionViewItemV4 *dest);
 
 public Q_SLOTS:
     void setFirstIndex(int index); // ### flat index - item based scrolling
     void setHorizontalOffset(qreal offset);
     void setVerticalOffset(qreal offset);
-    void setItemExpanded(QTreeModelIterator &it, bool expanded = true);
+    void setItemExpanded(QtTreeModelIterator &it, bool expanded = true);
     void updateLayout();
 
 Q_SIGNALS:
     void firstIndexChanged(int index);
     void horizontalOffsetChanged(qreal offset);
     void verticalOffsetChanged(qreal offset);
-    void itemClicked(QTreeModelIterator &it, Qt::MouseButton button);
-    void itemExpanded(QTreeModelIterator &it, int count);
-    void itemCollapsed(QTreeModelIterator &it, int count);
+    void itemClicked(QtTreeModelIterator &it, Qt::MouseButton button);
+    void itemExpanded(QtTreeModelIterator &it, int count);
+    void itemCollapsed(QtTreeModelIterator &it, int count);
     void layoutChanged();
 
 protected:
@@ -189,7 +189,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_itemsChanged(QtTreeModelBase::iterator_base &it, int count, const QList<int> &roles))
     Q_PRIVATE_SLOT(d_func(), void _q_itemsInserted(QtTreeModelBase::iterator_base &it, int count))
     Q_PRIVATE_SLOT(d_func(), void _q_itemsRemoved(QtTreeModelBase::iterator_base &it, int count))
-    Q_PRIVATE_SLOT(d_func(), void _q_selectionsChanged(const QTreeSelection &selection))
+    Q_PRIVATE_SLOT(d_func(), void _q_selectionsChanged(const QtTreeSelection &selection))
     Q_PRIVATE_SLOT(d_func(), void _q_currentChanged(QtTreeModelBase::iterator_base &current, QtTreeModelBase::iterator_base &previous))
     Q_PRIVATE_SLOT(d_func(), void _q_reset())
 };