Refactor item model mapping and proxies

- Introduced new handler for item models. Instance of this is
  owned by item model proxies.
- Introduced abstract mapping class to enable moving a lot of
  duplicate code to the new handler.
- Changed ownership handling of mapping objects to be in line
  with proxies and axes, though there is no default mapping
  at this time. Need to reconsider the default case more.
- Made item model const so it is clear that we do not own it.

The documentation is not yet up to date.

Change-Id: Ie961da29340743fdaa9293d7d4ace9577def9102
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h
index 7ca3b64b..377cd1e7 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavis3d/data/qitemmodelbardatamapping.h
@@ -20,20 +20,21 @@
 #define QITEMMODELBARDATAMAPPING_H
 
 #include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVis3D/qabstractdatamapping.h>
 #include <QStringList>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 class QItemModelBarDataMappingPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelBarDataMapping : public QObject
+class QT_DATAVIS3D_EXPORT QItemModelBarDataMapping : public QAbstractDataMapping
 {
     Q_OBJECT
-    Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole NOTIFY mappingChanged)
-    Q_PROPERTY(QString columnRole READ columnRole WRITE setColumnRole NOTIFY mappingChanged)
-    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged)
-    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories NOTIFY mappingChanged)
-    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories NOTIFY mappingChanged)
+    Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole)
+    Q_PROPERTY(QString columnRole READ columnRole WRITE setColumnRole)
+    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole)
+    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories)
+    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories)
 
 public:
     explicit QItemModelBarDataMapping(QObject *parent = 0);
@@ -63,14 +64,14 @@ public:
                const QString &valueRole, const QStringList &rowCategories,
                const QStringList &columnCategories);
 
-signals:
-    void mappingChanged();
+protected:
+    QItemModelBarDataMappingPrivate *dptr();
+    const QItemModelBarDataMappingPrivate *dptrc() const;
 
 private:
-    QScopedPointer<QItemModelBarDataMappingPrivate> d_ptr;
+    Q_DISABLE_COPY(QItemModelBarDataMapping)
 };
 
-
 QT_DATAVIS3D_END_NAMESPACE
 
 #endif