summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/data
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-04 08:33:05 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-04 08:35:49 +0300
commit8023f5bc0a490c2c1250194d483270ec6131b730 (patch)
tree2d66ecd1f4893591723a6fb8cac18170add83d9a /src/datavis3d/data
parentdd3a2d591cfd775311f54425220263b1aa2f3798 (diff)
Removed the unused renderer pointer from render items
Change-Id: I16bad8a75050dac2563b347ab42dd1a6dd324cae Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/data')
-rw-r--r--src/datavis3d/data/barrenderitem.cpp2
-rw-r--r--src/datavis3d/data/barrenderitem_p.h4
-rw-r--r--src/datavis3d/data/scatterrenderitem.cpp4
-rw-r--r--src/datavis3d/data/scatterrenderitem_p.h4
4 files changed, 1 insertions, 13 deletions
diff --git a/src/datavis3d/data/barrenderitem.cpp b/src/datavis3d/data/barrenderitem.cpp
index c004ed22..3240d19d 100644
--- a/src/datavis3d/data/barrenderitem.cpp
+++ b/src/datavis3d/data/barrenderitem.cpp
@@ -23,7 +23,6 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
BarRenderItem::BarRenderItem()
: AbstractRenderItem(),
- m_renderer(0),
m_value(0),
m_height(0.0f),
m_sliceLabelItem(0)
@@ -33,7 +32,6 @@ BarRenderItem::BarRenderItem()
BarRenderItem::BarRenderItem(const BarRenderItem &other)
: AbstractRenderItem(other)
{
- m_renderer = other.m_renderer;
m_value = other.m_value;
m_position = other.m_position;
m_height = other.m_height;
diff --git a/src/datavis3d/data/barrenderitem_p.h b/src/datavis3d/data/barrenderitem_p.h
index e35cef08..b1331b18 100644
--- a/src/datavis3d/data/barrenderitem_p.h
+++ b/src/datavis3d/data/barrenderitem_p.h
@@ -61,11 +61,7 @@ public:
void setSliceLabel(const QString &label);
QString &sliceLabel(); // Formats label if not previously formatted
- // TODO should be in abstract, but currently there is no abstract renderer
- inline void setRenderer(Bars3DRenderer *renderer) { m_renderer = renderer; }
-
protected:
- Bars3DRenderer *m_renderer;
qreal m_value;
QPoint m_position; // x = row, y = column
GLfloat m_height;
diff --git a/src/datavis3d/data/scatterrenderitem.cpp b/src/datavis3d/data/scatterrenderitem.cpp
index 4e6fbe9b..4a6fdfd7 100644
--- a/src/datavis3d/data/scatterrenderitem.cpp
+++ b/src/datavis3d/data/scatterrenderitem.cpp
@@ -23,15 +23,13 @@
QT_DATAVIS3D_BEGIN_NAMESPACE
ScatterRenderItem::ScatterRenderItem()
- : AbstractRenderItem(),
- m_renderer(0)
+ : AbstractRenderItem()
{
}
ScatterRenderItem::ScatterRenderItem(const ScatterRenderItem &other)
: AbstractRenderItem(other)
{
- m_renderer = other.m_renderer;
m_position = other.m_position;
}
diff --git a/src/datavis3d/data/scatterrenderitem_p.h b/src/datavis3d/data/scatterrenderitem_p.h
index cf63ae50..dd708f59 100644
--- a/src/datavis3d/data/scatterrenderitem_p.h
+++ b/src/datavis3d/data/scatterrenderitem_p.h
@@ -48,11 +48,7 @@ public:
//inline void setSize(qreal size);
//inline qreal size() const { return m_size; }
- // TODO should be in abstract, but currently there is no abstract renderer
- inline void setRenderer(Scatter3DRenderer *renderer) { m_renderer = renderer; }
-
protected:
- Scatter3DRenderer *m_renderer;
QVector3D m_position;
//qreal m_size; // TODO in case we need a fourth variable that adjusts scatter item size