Rework VisualItemModel into VisualItemModel & VisualDataModel

QFXVisualModel provides a base class for visual models.
QFxVisualDataModel provides a visual model for Qt item view models.
QFxVisualItemModel provides a model of QFxItems.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index e9b836d..4af8af9 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -73,12 +73,12 @@ QFxFlowView::QFxFlowView()
     setAcceptedMouseButtons(Qt::LeftButton);
 }
 
-QFxVisualItemModel *QFxFlowView::model() const
+QFxVisualModel *QFxFlowView::model() const
 {
     return m_model;
 }
 
-void QFxFlowView::setModel(QFxVisualItemModel *m)
+void QFxFlowView::setModel(QFxVisualModel *m)
 {
     m_model = m;
     refresh();
diff --git a/src/declarative/extra/qfxflowview.h b/src/declarative/extra/qfxflowview.h
index c2b30a3..2d7a8bd 100644
--- a/src/declarative/extra/qfxflowview.h
+++ b/src/declarative/extra/qfxflowview.h
@@ -51,21 +51,21 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QFxVisualItemModel;
+class QFxVisualModel;
 class QFxFlowViewValue;
 class QFxFlowViewAttached;
 class Q_DECLARATIVE_EXPORT QFxFlowView : public QFxItem
 {
     Q_OBJECT
-    Q_PROPERTY(QFxVisualItemModel *model READ model WRITE setModel)
+    Q_PROPERTY(QFxVisualModel *model READ model WRITE setModel)
     Q_PROPERTY(int column READ columns WRITE setColumns)
     Q_PROPERTY(bool vertical READ vertical WRITE setVertical)
 
 public:
     QFxFlowView();
 
-    QFxVisualItemModel *model() const;
-    void setModel(QFxVisualItemModel *);
+    QFxVisualModel *model() const;
+    void setModel(QFxVisualModel *);
 
     int columns() const;
     void setColumns(int);
@@ -86,7 +86,7 @@ private:
     void reflowDrag(const QPointF &);
     void clearTimeLine();
     int m_columns;
-    QFxVisualItemModel *m_model;
+    QFxVisualModel *m_model;
     QList<QFxItem *> m_items;
     bool m_vertical;
     void moveItem(QFxItem *item, const QPointF &);