[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

- fixed d2asc - needs KInstance now
- equations now get escaped for XML writeout
    - we should consider writing out with QDom instead


  M +3 -0      d2asc.cpp   1.14
  M +6 -4      kstequationcurve.cpp   1.36


--- kdeextragear-2/kst/kst/d2asc.cpp  #1.13:1.14
@@ -2,4 +2,6 @@
 #include <iostream>
 
+#include <kinstance.h>
+
 #include <qptrlist.h>
 #include "kstrvector.h"
@@ -15,4 +17,5 @@ void Usage() {
 
 int main(int argc, char *argv[]) {
+  KInstance inst("d2asc");
   KstDataSourcePtr file;
   int i;

--- kdeextragear-2/kst/kst/kstequationcurve.cpp  #1.35:1.36
@@ -28,4 +28,6 @@
 #include <kdebug.h>
 
+#include <qstylesheet.h>
+
 #include "kstdoc.h"
 #include "kstdatacollection.h"
@@ -211,13 +213,13 @@ void KstEquationCurve::getPoint(int i, d
 void KstEquationCurve::save(QTextStream &ts) {
   ts << " <equation>" << endl;
-  ts << "  <tag>" << _tag << "</tag>" << endl;
-  ts << "  <equation>" << Equation << "</equation>" << endl;
+  ts << "  <tag>" << QStyleSheet::escape(_tag) << "</tag>" << endl;
+  ts << "  <equation>" << QStyleSheet::escape(Equation) << "</equation>" << endl;
   if (_staticX) {
     ts << "  <x0>" << QString::number(_inputVectors[XVECTOR]->min()) << "</x0>" << endl;
     ts << "  <x1>" << QString::number(_inputVectors[XVECTOR]->max()) << "</x1>" << endl;
     ts << "  <ns>" << QString::number(_inputVectors[XVECTOR]->sampleCount()) << "</ns>" << endl;
-    ts << "  <xvtag>" << _inputVectors[XVECTOR]->tagName() << "</xvtag>" << endl;
+    ts << "  <xvtag>" << QStyleSheet::escape(_inputVectors[XVECTOR]->tagName()) << "</xvtag>" << endl;
   } else {
-    ts << "  <xvector>" << _inputVectors[XVECTOR]->tagName() << "</xvector>" << endl;
+    ts << "  <xvector>" << QStyleSheet::escape(_inputVectors[XVECTOR]->tagName()) << "</xvector>" << endl;
     if (DoInterp) {
       ts << "  <interpolate/>" << endl;