summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3dcontroller_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 78c6c81c..53560760 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -35,7 +35,7 @@
#include "qabstract3dinputhandler.h"
#include "qabstractdataproxy.h"
#include "q3dscene_p.h"
-#include "customdataitem_p.h"
+#include "qcustom3ditem.h"
#include <QtGui/QLinearGradient>
#include <QtCore/QTime>
@@ -175,7 +175,7 @@ protected:
QVector<QAbstract3DSeries *> m_changedSeriesList;
- QList<CustomDataItem *> m_customItems;
+ QList<QCustom3DItem *> m_customItems;
explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0);
@@ -236,9 +236,9 @@ public:
void requestRender(QOpenGLFramebufferObject *fbo);
- int addCustomItem(const QString &meshFile, const QVector3D &position, const QVector3D &scaling,
- const QQuaternion &rotation, const QImage &textureImage);
- void deleteCustomItem(int index);
+ int addCustomItem(QCustom3DItem *item);
+ void deleteCustomItems();
+ void deleteCustomItem(QCustom3DItem *item);
void deleteCustomItem(const QVector3D &position);
void emitNeedRender();
@@ -321,6 +321,7 @@ private:
void setAxisHelper(QAbstract3DAxis::AxisOrientation orientation, QAbstract3DAxis *axis,
QAbstract3DAxis **axisPtr);
+ friend class AbstractDeclarative;
friend class Bars3DController;
friend class QAbstract3DGraphPrivate;
};