X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_units.cpp;fp=src%2Fbase%2Frs_units.cpp;h=0c193fdc783e8dc61cdd415340bdfd41dc18e6b7;hb=af32602b9d8075080d5805143f1cd47fc10672e1;hp=fd3557d11bfa089cf756ccb2064bc60d1b025510;hpb=7efabf993d0acf72e4f7df5e3ccfa4513b070be6;p=architektonas

diff --git a/src/base/rs_units.cpp b/src/base/rs_units.cpp
index fd3557d..0c193fd 100644
--- a/src/base/rs_units.cpp
+++ b/src/base/rs_units.cpp
@@ -245,89 +245,47 @@ RS2::Unit RS_Units::stringToUnit(const QString & u)
 	RS2::Unit ret = RS2::None;
 
 	if (u == "None")
-	{
 		ret = RS2::None;
-	}
 	else if (u == QObject::tr("Inch"))
-	{
 		ret = RS2::Inch;
-	}
-	else if (u==QObject::tr("Foot"))
-	{
+	else if (u == QObject::tr("Foot"))
 		ret = RS2::Foot;
-	}
-	else if (u==QObject::tr("Mile"))
-	{
+	else if (u == QObject::tr("Mile"))
 		ret = RS2::Mile;
-	}
-	else if (u==QObject::tr("Millimeter"))
-	{
+	else if (u == QObject::tr("Millimeter"))
 		ret = RS2::Millimeter;
-	}
-	else if (u==QObject::tr("Centimeter"))
-	{
+	else if (u == QObject::tr("Centimeter"))
 		ret = RS2::Centimeter;
-	}
-	else if (u==QObject::tr("Meter"))
-	{
+	else if (u == QObject::tr("Meter"))
 		ret = RS2::Meter;
-	}
-	else if (u==QObject::tr("Kilometer"))
-	{
+	else if (u == QObject::tr("Kilometer"))
 		ret = RS2::Kilometer;
-	}
-	else if (u==QObject::tr("Microinch"))
-	{
+	else if (u == QObject::tr("Microinch"))
 		ret = RS2::Microinch;
-	}
-	else if (u==QObject::tr("Mil"))
-	{
+	else if (u == QObject::tr("Mil"))
 		ret = RS2::Mil;
-	}
-	else if (u==QObject::tr("Yard"))
-	{
+	else if (u == QObject::tr("Yard"))
 		ret = RS2::Yard;
-	}
-	else if (u==QObject::tr("Angstrom"))
-	{
+	else if (u == QObject::tr("Angstrom"))
 		ret = RS2::Angstrom;
-	}
-	else if (u==QObject::tr("Nanometer"))
-	{
+	else if (u == QObject::tr("Nanometer"))
 		ret = RS2::Nanometer;
-	}
-	else if (u==QObject::tr("Micron"))
-	{
+	else if (u == QObject::tr("Micron"))
 		ret = RS2::Micron;
-	}
-	else if (u==QObject::tr("Decimeter"))
-	{
+	else if (u == QObject::tr("Decimeter"))
 		ret = RS2::Decimeter;
-	}
-	else if (u==QObject::tr("Decameter"))
-	{
+	else if (u == QObject::tr("Decameter"))
 		ret = RS2::Decameter;
-	}
-	else if (u==QObject::tr("Hectometer"))
-	{
+	else if (u == QObject::tr("Hectometer"))
 		ret = RS2::Hectometer;
-	}
-	else if (u==QObject::tr("Gigameter"))
-	{
+	else if (u == QObject::tr("Gigameter"))
 		ret = RS2::Gigameter;
-	}
-	else if (u==QObject::tr("Astro"))
-	{
+	else if (u == QObject::tr("Astro"))
 		ret = RS2::Astro;
-	}
-	else if (u==QObject::tr("Lightyear"))
-	{
+	else if (u == QObject::tr("Lightyear"))
 		ret = RS2::Lightyear;
-	}
-	else if (u==QObject::tr("Parsec"))
-	{
+	else if (u == QObject::tr("Parsec"))
 		ret = RS2::Parsec;
-	}
 
 	return ret;
 }
@@ -470,37 +428,37 @@ QString RS_Units::formatLinear(double length, RS2::Unit unit, RS2::LinearFormat
         unitString = unitToSign(unit);
 }*/
 
-    // barbarian display: show as fraction:
-    switch (format)
+	// Barbarian display: Show as fraction:
+	switch (format)
 	{
-    case RS2::Scientific:
-        ret = formatScientific(length, unit, prec, showUnit);
-        break;
+	case RS2::Scientific:
+		ret = formatScientific(length, unit, prec, showUnit);
+		break;
 
-    case RS2::Decimal:
-        ret = formatDecimal(length, unit, prec, showUnit);
-        break;
+	case RS2::Decimal:
+		ret = formatDecimal(length, unit, prec, showUnit);
+		break;
 
-    case RS2::Engineering:
-        ret = formatEngineering(length, unit, prec, showUnit);
-        break;
+	case RS2::Engineering:
+		ret = formatEngineering(length, unit, prec, showUnit);
+		break;
 
-    case RS2::Architectural:
-        ret = formatArchitectural(length, unit, prec, showUnit);
-        break;
+	case RS2::Architectural:
+		ret = formatArchitectural(length, unit, prec, showUnit);
+		break;
 
-    case RS2::Fractional:
-        ret = formatFractional(length, unit, prec, showUnit);
-        break;
+	case RS2::Fractional:
+		ret = formatFractional(length, unit, prec, showUnit);
+		break;
 
-    default:
-        RS_DEBUG->print(RS_Debug::D_WARNING,
+	default:
+		RS_DEBUG->print(RS_Debug::D_WARNING,
 			"RS_Units::formatLinear: Unknown format");
-        ret = "";
-        break;
-    }
+		ret = "";
+		break;
+	}
 
-    return ret;
+	return ret;
 }
 
 /**