[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kalzium/src/conversion
From:       Carsten Niehaus <cniehaus () gmx ! de>
Date:       2009-07-24 9:50:49
Message-ID: 1248429049.723565.15434.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1001800 by cniehaus:

Backport a commit made by Aaron in kdereview. I will sync this lib from \
time to time until it moved from kdereview to kdelibs.

 M  +15 -1     converter.cpp  
 M  +2 -15     converter.h  
 M  +4 -3      value.cpp  


--- trunk/KDE/kdeedu/kalzium/src/conversion/converter.cpp #1001799:1001800
@@ -18,11 +18,25 @@
  */
 
 #include "converter.h"
-#include "unit.h"
 
 #include <KGlobal>
 #include <KDebug>
 
+#include "area.h"
+#include "length.h"
+#include "currency.h"
+#include "density.h"
+#include "energy.h"
+#include "fuel_efficiency.h"
+#include "mass.h"
+#include "power.h"
+#include "pressure.h"
+#include "temperature.h"
+#include "timeunit.h"
+#include "unit.h"
+#include "velocity.h"
+#include "volume.h"
+
 namespace Conversion
 {
 
--- trunk/KDE/kdeedu/kalzium/src/conversion/converter.h #1001799:1001800
@@ -20,22 +20,9 @@
 #ifndef CONVERSION_CONVERTER_H
 #define CONVERSION_CONVERTER_H
 
-#include "value.h"
-#include "length.h"
-#include "area.h"
-#include "volume.h"
-#include "temperature.h"
-#include "velocity.h"
-#include "mass.h"
-#include "pressure.h"
-#include "energy.h"
-#include "currency.h"
-#include "power.h"
-#include "timeunit.h"
-#include "fuel_efficiency.h"
-#include "density.h"
+#include <value.h>
 
-#include "plasmaconversion_export.h"
+#include <plasmaconversion_export.h>
 #include <QtCore/QVariant>
 
 namespace Conversion
--- trunk/KDE/kdeedu/kalzium/src/conversion/value.cpp #1001799:1001800
@@ -31,11 +31,12 @@
     : number(n)
     , unit(u)
     {
-    };
+    }
 
     ~Private()
     {
-    };
+        delete unit;
+    }
 
     double number;
     const Unit* unit;
@@ -87,7 +88,7 @@
 const Unit* Value::unit() const
 {
     if (!d->unit) {
-        d->unit = new Unit(Conversion::Converter::self());
+        d->unit = new Unit;
     }
     return d->unit;
 }


[prev in list] [next in list] [prev in thread] [next in thread]