[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

adding string type to Kst - not usable anywhere yet


  A            kststring.cpp   1.1 [GPL (v2+)]
  A            kststring.h   1.1 [GPL (v2+)]
  M +2 -1      Makefile.am   1.147
  M +3 -0      kstdatacollection.cpp   1.17
  M +4 -0      kstdatacollection.h   1.22
  M +3 -3      kstscalar.cpp   1.29


--- kdeextragear-2/kst/kst/Makefile.am  #1.146:1.147
@@ -22,5 +22,6 @@
         kstdebug.cpp \
         rwlock.cpp \
-        kstscalar.cpp $(PROCPS_COPY)
+        kstscalar.cpp $(PROCPS_COPY) \
+        kststring.cpp
 
 libkst_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)

--- kdeextragear-2/kst/kst/kstdatacollection.cpp  #1.16:1.17
@@ -34,4 +34,7 @@ KstVectorList KST::vectorList;
 KstScalarList KST::scalarList;
 
+/** The list of Strings */
+KstStringList KST::stringList;
+
 /** The list of data objects which are in use */
 KstDataObjectList KST::dataObjectList;

--- kdeextragear-2/kst/kst/kstdatacollection.h  #1.21:1.22
@@ -21,4 +21,5 @@
 #include "kstdataobject.h"
 #include "kstdatasource.h"
+#include "kststring.h"
 
 class QFile;
@@ -34,4 +35,7 @@ namespace KST {
   extern KstScalarList scalarList;
 
+  /** The list of Strings */
+  extern KstStringList stringList;
+
   /** The list of data objects which are in use */
   extern KstDataObjectList dataObjectList;

--- kdeextragear-2/kst/kst/kstscalar.cpp  #1.28:1.29
@@ -26,5 +26,5 @@ static int iAnonymousScalarCounter = 0;
 /** Create the base scalar */
 KstScalar::KstScalar(const QString& in_tag, double val, bool orphan, bool displayable, bool doLock)
-: KstObject(), _orphan(orphan), _displayable(displayable) {
+: KstObject(), _value(val), _orphan(orphan), _displayable(displayable) {
   QString _tag = in_tag;
   if (_tag.isEmpty()) {
@@ -40,5 +40,4 @@ KstScalar::KstScalar(const QString& in_t
   }
   setTagName(_tag);
-  _value = val;
 
   // FIXME: passing in a lock variable indicates a design problem
@@ -53,5 +52,6 @@ KstScalar::KstScalar(const QString& in_t
 
 
-KstScalar::KstScalar(QDomElement& e) : KstObject(), _orphan(false), _displayable(true) {
+KstScalar::KstScalar(QDomElement& e)
+: KstObject(), _orphan(false), _displayable(true) {
   QDomNode n = e.firstChild();
   bool ok;