[Kst] branches/work/kst/portto4/kst/src/libkst

[Mike Fenton]

SVN commit 733144 by fenton:

Add Save/Restore for Scalars.


 M  +2 -0      builtinprimitives.cpp  
 M  +2 -0      libkst.pro  
 M  +1 -0      scalar.cpp  
 M  +2 -0      scalar.h  
 A             scalarfactory.cpp   [License: GPL (v2+)]
 A             scalarfactory.h   [License: GPL (v2+)]


--- branches/work/kst/portto4/kst/src/libkst/builtinprimitives.cpp #733143:733144
@@ -11,6 +11,7 @@
 
 #include "builtinprimitives.h"
 #include "vectorfactory.h"
+#include "scalarfactory.h"
 
 namespace Kst {
   namespace Builtins {
@@ -19,6 +20,7 @@
       new GeneratedVectorFactory();
       new EditableVectorFactory();
       new DataVectorFactory();
+      new ScalarFactory();
     }
   }
 }
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #733143:733144
@@ -28,6 +28,7 @@
     #  Needs porting, but is unused anyway
     #timezones.cpp \
     scalar.cpp \
+    scalarfactory.cpp \
     # $(PROCPS_COPY) \
     $$PROCPS \
     string_kst.cpp \
@@ -79,6 +80,7 @@
     datamatrix.h \
     datavector.h \
     scalar.h \
+    scalarfactory.h \
     sharedptr.h \
     generatedmatrix.h \
     string_kst.h \
--- branches/work/kst/portto4/kst/src/libkst/scalar.cpp #733143:733144
@@ -28,6 +28,7 @@
 static bool dirtyScalars = false;
 
 const QString Scalar::staticTypeString = I18N_NOOP("Scalar");
+const QString Scalar::staticTypeTag = I18N_NOOP("scalar");
 
 bool Scalar::scalarsDirty() {
   // Should use a mutex, but let's play with fire to be fast
--- branches/work/kst/portto4/kst/src/libkst/scalar.h #733143:733144
@@ -41,11 +41,13 @@
 
     virtual ~Scalar();
 
+    friend class ScalarFactory;
     friend class ObjectStore;
 
   public:
     virtual const QString& typeString() const;
     static const QString staticTypeString;
+    static const QString staticTypeTag;
 
     /* return true if any scalars are dirty at the moment */
     static bool scalarsDirty();