From: Carsten Niehaus <cniehaus@gmx.de>
Date: Thu, 19 Oct 2006 16:28:45 +0000 (+0000)
Subject: Pluggin memleaks and now using qDeleteAll
X-Git-Tag: v3.80.2~7
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=aed0b7993761b6016e62fbffd21dc4690a053697;p=libqmvoc.git

Pluggin memleaks and now using qDeleteAll

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=597220
---

diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp
index cde1f72..9c9e6d3 100644
--- a/libscience/chemicaldataobject.cpp
+++ b/libscience/chemicaldataobject.cpp
@@ -28,9 +28,16 @@ class ChemicalDataObjectPrivate
 		QVariant m_errorValue;
 		ChemicalDataObject::BlueObelisk m_type;
 		ChemicalDataObject::BlueObeliskUnit m_unit;
+
+    ~ChemicalDataObjectPrivate();
 };
 
-ChemicalDataObject::ChemicalDataObject( const QVariant& v, BlueObelisk type, const QVariant& errorValue ) : d(new ChemicalDataObjectPrivate()) 
+ChemicalDataObjectPrivate::~ChemicalDataObjectPrivate()
+{
+}
+
+ChemicalDataObject::ChemicalDataObject( const QVariant& v, BlueObelisk type, const QVariant& errorValue ) 
+: d(new ChemicalDataObjectPrivate()) 
 {
 	d->m_value = v;
 	d->m_errorValue = errorValue;
@@ -47,7 +54,6 @@ ChemicalDataObject::ChemicalDataObject() : d(new ChemicalDataObjectPrivate())
 
 bool ChemicalDataObject::operator==( const int v ) const
 {
-	kDebug() << "ChemicalDataObject::operator==() with int" << endl;
 	if ( d->m_value.type() != QVariant::Int )	
 		return false;
 	
@@ -56,7 +62,6 @@ bool ChemicalDataObject::operator==( const int v ) const
 
 bool ChemicalDataObject::operator==( const bool v ) const
 {
-	kDebug() << "ChemicalDataObject::operator==() with bool" << endl;
 	if ( d->m_value.type() != QVariant::Bool )	
 		return false;
 	
@@ -65,7 +70,6 @@ bool ChemicalDataObject::operator==( const bool v ) const
 
 bool ChemicalDataObject::operator==( const double v ) const
 {
-	kDebug() << "ChemicalDataObject::operator==() with double" << endl;
 	if ( d->m_value.type() != QVariant::Double )	
 		return false;
 	
@@ -74,7 +78,6 @@ bool ChemicalDataObject::operator==( const double v ) const
 
 bool ChemicalDataObject::operator==( const QString& v ) const
 {
-	kDebug() << "ChemicalDataObject::operator==() with QString" << endl;
 	if ( d->m_value.type() != QVariant::String )	
 		return false;
 
diff --git a/libscience/element.cpp b/libscience/element.cpp
index 111d0a7..dee1442 100644
--- a/libscience/element.cpp
+++ b/libscience/element.cpp
@@ -47,6 +47,10 @@ QString Element::dataAsString(ChemicalDataObject::BlueObelisk type) const
 
 Element::~Element()
 {
+    qDeleteAll(dataList);
+
+    delete m_spectrum;
+    m_spectrum = 0;
 }
 
 void Element::addData( ChemicalDataObject*o )
diff --git a/libscience/isotope.cpp b/libscience/isotope.cpp
index 20712e0..85bb3cc 100644
--- a/libscience/isotope.cpp
+++ b/libscience/isotope.cpp
@@ -30,6 +30,21 @@ Isotope::Isotope()
 
 Isotope::~Isotope()
 {
+		delete m_parentElementSymbol;
+		delete m_mass;
+		delete m_identifier;
+		delete m_spin;
+		delete m_magmoment;
+		delete m_abundance; 
+		delete m_halflife;
+		delete m_ecdecay;
+		delete m_betaplusdecay;
+		delete m_betaminusdecay; 
+		delete m_alphadecay;
+		delete m_eclikeliness;
+		delete m_betapluslikeliness;
+		delete m_betaminuslikeliness; 
+		delete m_alphalikeliness;
 }
 
 void Isotope::addData( ChemicalDataObject* o )
diff --git a/libscience/isotope.h b/libscience/isotope.h
index b90aede..8b12afa 100644
--- a/libscience/isotope.h
+++ b/libscience/isotope.h
@@ -42,7 +42,7 @@ class EDUSCIENCE_EXPORT Isotope
 		/**
 		 * Destructor
 		 */
-		virtual ~Isotope();
+		~Isotope();
 
 		/**
 		 * This struct stores the information how the nucleons in the 
diff --git a/libscience/spectrum.cpp b/libscience/spectrum.cpp
index 0793ed9..9bad5c5 100644
--- a/libscience/spectrum.cpp
+++ b/libscience/spectrum.cpp
@@ -98,4 +98,7 @@ QList<double> Spectrum::wavelengths( double min, double max )
 	return list;
 }
 
-
+Spectrum::~Spectrum()
+{
+    qDeleteAll( m_peaklist );
+}
diff --git a/libscience/spectrum.h b/libscience/spectrum.h
index 5f64103..e4cdd37 100644
--- a/libscience/spectrum.h
+++ b/libscience/spectrum.h
@@ -43,7 +43,7 @@ class EDUSCIENCE_EXPORT Spectrum
 		/**
 		 * public destructor
 		 */
-		~Spectrum(){};
+		~Spectrum();
 
 		/**
 		 * a peak is one line in the spectrum of an element