From: Carsten Niehaus <cniehaus@gmx.de>
Date: Thu, 14 Jul 2005 15:05:46 +0000 (+0000)
Subject: Remove the "use common/SI-units." This only makes things complicated
X-Git-Tag: v3.80.2~300^2~75
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=dd771358791cf1a1a64d392072b12dd10df96a23;p=libqmvoc.git

Remove the "use common/SI-units." This only makes things complicated
and nobody really used it. Furthermore, this removes some other no
longer needed strings.


svn path=/trunk/KDE/kdeedu/kalzium/src/element.cpp; revision=434562
---

diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index f308944..50ae3ff 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -108,17 +108,7 @@ const QString Element::adjustRadius( RADIUSTYPE rtype )
 	if ( val <= 0 )
 		v = i18n( "Value unknown" );
 	else
-	{
-		switch ( Prefs::units() )
-		{
-			case 0://use SI-values (meter for length)
-				v = i18n( "%1 is a length", "%1 10<sup>-12</sup> m" ).arg( QString::number( val ) );
-				break;
-			case 1://use picometer, the most common unit for radii
-				v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).arg( QString::number( val ) );
-				break;
-		}
-	}
+		v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).arg( QString::number( val ) );
 	return v;
 }
 
@@ -206,18 +196,7 @@ const QString Element::adjustUnits( const int type )
 		if ( val <= 0 )
 			v = i18n( "Value unknown" );
 		else
-		{
-			v = QString::number( val );
-			switch ( Prefs::units() )
-			{
-				case 0:
-					v = i18n( "%1 g/mol" ).arg( QString::number( val ) );
-					break;
-				case 1:
-					v = i18n( "%1 u" ).arg( QString::number( val ) );
-					break;
-			}
-		}
+			v = i18n( "%1 u" ).arg( QString::number( val ) );
 	}
 	else if ( type == DENSITY ) // its a density
 	{
@@ -227,22 +206,13 @@ const QString Element::adjustUnits( const int type )
 			v = i18n( "Value unknown" );
 		else
 		{
-			switch ( Prefs::units() )
+			if ( boiling() < 295.0 )//gasoline
 			{
-				case 0://use SI (kg per cubic-meter)
-					val *= 1000;
-					v = i18n( "%1 kg/m<sup>3</sup>" ).arg( QString::number( val ) );
-					break;
-				case 1://use more common units
-					if ( boiling() < 295.0 )//gasoline
-					{
-						v = i18n( "%1 g/L" ).arg( QString::number( val ) );
-					}
-					else//liquid or solid
-					{
-						v = i18n( "%1 g/cm<sup>3</sup>" ).arg( QString::number( val ) );
-					}
-					break;
+				v = i18n( "%1 g/L" ).arg( QString::number( val ) );
+			}
+			else//liquid or solid
+			{
+				v = i18n( "%1 g/cm<sup>3</sup>" ).arg( QString::number( val ) );
 			}
 		}
 	}