[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

compilation fixes


  M +2 -1      Makefile.am   1.20
  M +1 -1      kstdataobject.cpp   1.3
  M +1 -1      kstdataobject.h   1.4
  M +2 -3      kstplugin.cpp   1.16
  M +1 -1      kstvector.cpp   1.12
  M +4 -4      kstvector.h   1.13


--- kdeextragear-2/kst/kst/Makefile.am  #1.19:1.20
@@ -13,4 +13,5 @@
         readdata.c \
         creaddata.c \
+        kstdataobject.cpp \
         kstvector.cpp \
         kstrvector.cpp \
@@ -20,5 +21,5 @@
 
 kst_SOURCES = \
-        kstdataobject.cpp\
+        kstdataobject.cpp \
         kstplugin.cpp \
         kstpluginlist.cpp \

--- kdeextragear-2/kst/kst/kstdataobject.cpp  #1.2:1.3
@@ -1,4 +1,4 @@
 /***************************************************************************
-                          kstbasecurve.h: base curve type for kst
+                  kstdataobject.cpp: base class for data objects
                              -------------------
     begin                : May 20, 2003

--- kdeextragear-2/kst/kst/kstdataobject.h  #1.3:1.4
@@ -1,4 +1,4 @@
 /***************************************************************************
-                          kstbasecurve.h: base curve type for kst
+                   kstdataobject.h: base class for data objects
                              -------------------
     begin                : May 20, 2003

--- kdeextragear-2/kst/kst/kstplugin.cpp  #1.15:1.16
@@ -145,6 +145,5 @@ KstUpdateType KstPlugin::update(int upda
 
   for (unsigned i = 0; i < inArrayCnt; i++) {
-    int sz = 1;
-    inVectors[i] = _inputVectors.at(i)->data();
+    inVectors[i] = _inputVectors.at(i)->rawData();
     inArrayLens[i] = _inputVectors.at(i)->numSamples();
   }
@@ -155,5 +154,5 @@ KstUpdateType KstPlugin::update(int upda
 
   for (unsigned i = 0; i < outArrayCnt; i++) {
-    outVectors[i] = _outputVectors.atS(i)->data();
+    outVectors[i] = _outputVectors.atS(i)->rawData();
     outArrayLens[i] = 1;
   }

--- kdeextragear-2/kst/kst/kstvector.cpp  #1.11:1.12
@@ -31,5 +31,5 @@ KstScalarList *KstVector::ScalarList = 0
 
 /** Create a vector */
-KstVector::KstVector() {
+KstVector::KstVector() : KstDataObject() {
   Sum2 = 0;
   //ScalarList = 0L;

--- kdeextragear-2/kst/kst/kstvector.h  #1.12:1.13
@@ -16,4 +16,7 @@
  ***************************************************************************/
 
+#ifndef KSTVECTOR_H
+#define KSTVECTOR_H
+
 #include <qstring.h>
 #include <qdom.h>
@@ -21,7 +24,4 @@
 #include "kstdataobject.h"
 
-#ifndef KSTVECTOR_H
-#define KSTVECTOR_H
-
 class KstScalar;
 class KstScalarList;
@@ -101,5 +101,5 @@ public:
   void insertScalarsInList(); //KstScalarList &s_list);
 
-  double *data() const { return V; }
+  double *rawData() const { return V; }
 
   static void setScalarList(KstScalarList *slist);