[Kst] kdeextragear-2/kst/kst (silent)

[Andrew Walker]

CVS commit by arwalker: 

Cleanup of code.

CVS_SILENT


  M +9 -5      ksthistogram.cpp   1.45
  M +18 -9     kstpsd.cpp   1.17


--- kdeextragear-2/kst/kst/ksthistogram.cpp  #1.44:1.45
@@ -72,8 +72,13 @@ KstHistogram::KstHistogram(const QDomEle
         KST::vectorList.lock().readUnlock();
       } else if (e.tagName() == "NormMode") {
-        if (e.text()=="NUMBER") in_norm_mode = KST_HS_NUMBER;
-        else if (e.text()=="PERCENT") in_norm_mode = KST_HS_PERCENT;
-        else if (e.text()=="FRACTION") in_norm_mode = KST_HS_FRACTION;
-        else if (e.text()=="MAX_ONE") in_norm_mode = KST_HS_MAX_ONE;
+        if (e.text()=="NUMBER") {
+          in_norm_mode = KST_HS_NUMBER;
+        } else if (e.text()=="PERCENT") {
+          in_norm_mode = KST_HS_PERCENT;
+        } else if (e.text()=="FRACTION") {
+          in_norm_mode = KST_HS_FRACTION;
+        } else if (e.text()=="MAX_ONE") {
+          in_norm_mode = KST_HS_MAX_ONE;
+        }
       } else if (e.tagName() == "minX") {
         xmin_in = e.text().toDouble();

--- kdeextragear-2/kst/kst/kstpsd.cpp  #1.16:1.17
@@ -51,13 +51,13 @@ KstPSD::KstPSD(const QString &in_tag, Ks
 KstPSD::KstPSD(const QDomElement &e)
 : KstDataObject(e) {
+  QString in_VUnits;
+  QString in_RUnits;
   QString in_tag;
   KstVectorPtr in_V;
-  double in_freq=60.0;
+  double in_freq = 60.0;
   bool in_average = true;
   bool in_removeMean = true;
   bool in_apodize = true;
   int in_len = 12;
-  QString in_VUnits;
-  QString in_RUnits;
 
   /* parse the DOM tree */
@@ -78,14 +78,23 @@ KstPSD::KstPSD(const QDomElement &e)
         in_freq = e.text().toDouble();
       } else if (e.tagName() == "average") {
-        if (e.text() == "0") in_average = false;
-        else in_average = true;
+        if (e.text() == "0") {
+          in_average = false;
+        } else {
+          in_average = true;
+        }
       } else if (e.tagName() == "fftLen") {
         in_len = e.text().toInt();
       } else if (e.tagName() == "apodize") {
-        if (e.text() == "0") in_apodize = false;
-        else in_apodize = true;
+        if (e.text() == "0") {
+          in_apodize = false;
+        } else {
+          in_apodize = true;
+        }
       } else if (e.tagName() == "removeMean") {
-        if (e.text() == "0") in_removeMean = false;
-        else in_removeMean = true;
+        if (e.text() == "0") {
+          in_removeMean = false;
+        } else {
+          in_removeMean = true;
+        }
       } else if (e.tagName() == "VUnits") {
         in_VUnits = e.text();