Bring new data proxies to maps

Maps now has the basic QMapDataProxy and the specialized
QItemModelMapDataProxy to choose from.

Removed the last vestiges of old QDataSet and related classes.

Bunch of misc fixes also included.

Change-Id: I3993ac2a669b818f89bd771ea9dc8b7e458c4b8c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 5 insertions, 18 deletions

diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index 165a3e89..2fd4c043 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -55,8 +55,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
 
 class Maps3DController;
 class Q3DMapsPrivate;
-class QDataItem;
-class QDataRow;
+class QMapDataProxy;
 
 class QT_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow
 {
@@ -79,22 +78,6 @@ public:
     explicit Q3DMaps();
     ~Q3DMaps();
 
-    // Add data item. New data item is appended to old data.
-    // ownership of data is transferred
-    bool addDataItem(QDataItem *dataItem);
-
-    // Add data set. New data is appended to old data.
-    // ownership of data is transferred
-    bool addData(const QVector<QDataItem*> &data);
-    // ownership of data is transferred
-    bool addData(const QDataRow &data);
-
-    // Add data set. Old data is deleted.
-    // ownership of data is transferred
-    bool setData(const QVector<QDataItem*> &data);
-    // ownership of data is transferred
-    bool setData(QDataRow *data);
-
     void setWidth(const int width);
     void setHeight(const int height);
 
@@ -156,6 +139,10 @@ public:
     ShadowQuality setShadowQuality(ShadowQuality quality);
     ShadowQuality shadowQuality();
 
+    // Sets the data proxy. Assumes ownership of the data proxy. Deletes old proxy.
+    void setDataProxy(QMapDataProxy *proxy);
+    QMapDataProxy *dataProxy();
+
 protected:
     void render();