Data proxy implementation for bars.

Old QDataSet can be used with custom QOldDataProxy. This will be
removed entirely once we have a viable variant based proxy to use,
as it provides no real additional value over just using default
proxy directly.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h
index 325f9004..e822d79f 100644
--- a/src/datavis3d/engine/drawer_p.h
+++ b/src/datavis3d/engine/drawer_p.h
@@ -56,11 +56,11 @@
 #include "q3dbars.h"
 #include "theme_p.h"
 #include "labelitem_p.h"
+#include "qabstractdataitem.h"
 #include <QFont>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
-class QDataItem;
 class ShaderHelper;
 class ObjectHelper;
 class TextureHelper;
@@ -82,7 +82,7 @@ public:
 
     void drawObject(ShaderHelper *shader, ObjectHelper *object, GLuint textureId = 0,
                     GLuint depthTextureId = 0);
-    void drawLabel(const QDataItem &item, const LabelItem &label,
+    void drawLabel(const QAbstractDataItem &item, const LabelItem &label,
                    const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                    const QVector3D &positionComp, const QVector3D &rotation, GLfloat maxHeight,
                    SelectionMode mode, ShaderHelper *shader, ObjectHelper *object,
@@ -91,8 +91,8 @@ public:
                    LabelPosition position = LabelOver,
                    Qt::AlignmentFlag alignment = Qt::AlignCenter);
 
-    void generateLabelTexture(QDataItem *item);
-    void generateLabelItem(LabelItem *item, const QString &text);
+    void generateLabelTexture(QAbstractDataItem *item);
+    void generateLabelItem(LabelItem &item, const QString &text);
 
 Q_SIGNALS:
     void drawerChanged();