From b0fa490532581411a63796c9fed5d27e157ba5e8 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 10 Jan 2014 07:58:19 +0200 Subject: Remove hacky delete from multigraph Change-Id: I2969a3e30dc4f83801837b6ffa0897749364b361 Reviewed-by: Miikka Heikkinen --- tests/multigraphs/data.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 70fcbad4..e70a01df 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -90,21 +90,10 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, } Data::~Data() -{ // HACK: The current context needs to be destroyed last - // TODO: Fix properly in datavis code somehow - if (m_mode == Surface) { - delete m_scatter; - delete m_bars; - delete m_surface; - } else if (m_mode == Bars) { - delete m_scatter; - delete m_surface; - delete m_bars; - } else { - delete m_bars; - delete m_surface; - delete m_scatter; - } +{ + delete m_bars; + delete m_surface; + delete m_scatter; delete m_widget; delete m_scatterDataArray; // only portion of this array is set to graph } -- cgit v1.2.3