[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

We want to remember the line width even if lines are disabled as the line width (now called weight) also impacts the point size. Also, we want to store line and point settings (even if not currently used) as they still give the last used setting, which the user might want to retain across sessions.

CCMAIL: 98560-done at bugs.kde.org


  M +10 -8     kstvcurve.cpp   1.58


--- kdeextragear-2/kst/kst/kstvcurve.cpp  #1.57:1.58
@@ -16,9 +16,12 @@
  ***************************************************************************/
 
+// includes for Qt
+#include <qstylesheet.h>
+
+// includes for KDE
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <qstylesheet.h>
-
+// application specific includes
 #include "dialoglauncher.h"
 #include "kstcolorsequence.h"
@@ -71,5 +74,4 @@ KstVCurve::KstVCurve(QDomElement &e)
   setPointDensity(0);
 
-  /* parse the DOM tree */
   QDomNode n = e.firstChild();
   while( !n.isNull() ) {
@@ -390,16 +392,16 @@ void KstVCurve::save(QTextStream &ts, co
   if (HasLines) {
     ts << l2 << "<hasLines/>" << endl;
+  }
     ts << l2 << "<lineWidth>" << LineWidth << "</lineWidth>" << endl;
     ts << l2 << "<lineStyle>" << LineStyle << "</lineStyle>" << endl;
-  }
   if (HasPoints) {
     ts << l2 << "<hasPoints/>" << endl;
+  }
     ts << l2 << "<pointType>" << Point.type() << "</pointType>" << endl;
     ts << l2 << "<pointDensity>" << PointDensity << "</pointDensity>" << endl;
-  }
   if (HasBars) {
     ts << l2 << "<hasBars/>" << endl;
-    ts << l2 << "<barStyle>" << BarStyle << "</barStyle>" << endl;
   }
+  ts << l2 << "<barStyle>" << BarStyle << "</barStyle>" << endl;
   if (_ignoreAutoScale) {
     ts << l2 << "<ignoreAutoScale/>" << endl;