summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-13 10:41:50 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-12-13 10:43:26 +0200
commit3635ba0b4d5d5b146876b0013a7cce73f75b955f (patch)
treeb42c28688ced3f9febc0b2b53da92bb96a2bcde0 /src
parent745bc40a56326760f843a5017f2cf83dd433289b (diff)
Fix a few valgrind errors
Change-Id: Ie7898f26176845561b16d0e385429e2bf92cd8f0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/data/qabstract3dseries.cpp3
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp3
-rw-r--r--src/datavisualization/engine/seriesrendercache.cpp5
3 files changed, 6 insertions, 5 deletions
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 6126d774..2c869574 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -496,7 +496,8 @@ QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries *q, QAbstra
m_visible(true),
m_controller(0),
m_mesh(QAbstract3DSeries::MeshCube),
- m_meshSmooth(false)
+ m_meshSmooth(false),
+ m_colorStyle(Q3DTheme::ColorStyleUniform)
{
}
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 61ab7ed7..38e384ad 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -642,9 +642,6 @@ void Bars3DRenderer::drawSlicedScene()
}
int lastLabel = m_sliceCache->labelItems().size() - 1;
- int seriesCount = 1;
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries))
- seriesCount = m_visibleSeriesList.size();
for (int labelNo = 0; labelNo <= lastLabel; labelNo++) {
// Get labels from first series only
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index 68bf2645..04b2249d 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -29,7 +29,10 @@ const QString smoothString(QStringLiteral("Smooth"));
SeriesRenderCache::SeriesRenderCache()
: m_series(0),
m_object(0),
- m_mesh(QAbstract3DSeries::MeshCube)
+ m_mesh(QAbstract3DSeries::MeshCube),
+ m_baseGradientTexture(0),
+ m_singleHighlightGradientTexture(0),
+ m_multiHighlightGradientTexture(0)
{
}