respect the energie-unit in HEAD as well

svn path=/trunk/kdeedu/kalzium/src/element.cpp; revision=380063

diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index a32be67fc2a3a4652905fc376616dfc01776fad1..27df2b6776add24ad825d0e0be9678251ab627d2 100644 (file)
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -98,8 +98,17 @@ const QString Element::adjustUnits( const int type )
                        v = i18n( "Value unknown" );
                else 
                {
-                       v = QString::number( val );
-                       v.append( "eV" );
+                       if ( Prefs::energies() == 0 )
+                       {
+                               val*=96.6;
+                               v = QString::number( val );
+                               v.append( "kj/mol" );
+                       }
+                       else // use electronvolt
+                       {
+                               v = QString::number( val );
+                               v.append( "eV" );
+                       }
                }
        }
        else if ( type == BOILINGPOINT || type == MELTINGPOINT ) // convert a temperature