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

[Mike Fenton]

SVN commit 721563 by fenton:

Conversion of KstVCurve to Kst::VCurve, KstLineStyle to Kst::LineStyle
and KstImage to Kst::Image and associated changes.


 M  +6 -6      libkstapp/curvedialog.cpp  
 M  +1 -1      libkstapp/plotitem.cpp  
 M  +1 -1      libkstmath/colorsequence.cpp  
 M  +2 -2      libkstmath/colorsequence.h  
 M  +2 -2      libkstmath/curvehint.cpp  
 M  +1 -1      libkstmath/defaultnames.cpp  
 A             libkstmath/image.cpp   libkstmath/kstimage.cpp#721549 [License: GPL (v2+)]
 A             libkstmath/image.h   libkstmath/kstimage.h#721549 [License: GPL (v2+)]
 D             libkstmath/kstimage.cpp  
 D             libkstmath/kstimage.h  
 D             libkstmath/kstlinestyle.cpp  
 D             libkstmath/kstlinestyle.h  
 D             libkstmath/kstvcurve.cpp  
 D             libkstmath/kstvcurve.h  
 M  +6 -6      libkstmath/libkstmath.pro  
 A             libkstmath/linestyle.cpp   libkstmath/kstlinestyle.cpp#721549 [License: GPL (v2+)]
 A             libkstmath/linestyle.h   libkstmath/kstlinestyle.h#721549 [License: GPL (v2+)]
 A             libkstmath/vcurve.cpp   libkstmath/kstvcurve.cpp#721549 [License: GPL (v2+)]
 A             libkstmath/vcurve.h   libkstmath/kstvcurve.h#721549 [License: GPL (v2+)]


--- branches/work/kst/portto4/kst/src/libkstapp/curvedialog.cpp #721562:721563
@@ -13,7 +13,7 @@
 
 #include "dialogpage.h"
 
-#include "kstvcurve.h"
+#include "vcurve.h"
 
 #include "view.h"
 #include "plotitem.h"
@@ -106,7 +106,7 @@
 }
 
 
-CurveDialog::CurveDialog(Kst::ObjectPtr dataObject, QWidget *parent)
+CurveDialog::CurveDialog(ObjectPtr dataObject, QWidget *parent)
   : DataDialog(dataObject, parent) {
 
   if (editMode() == Edit)
@@ -130,9 +130,9 @@
 }
 
 
-Kst::ObjectPtr CurveDialog::createNewDataObject() const {
+ObjectPtr CurveDialog::createNewDataObject() const {
   //FIXME Eli, how should I construct this tag??
-  KstVCurvePtr curve = new KstVCurve(tagName(),
+  VCurvePtr curve = new VCurve(tagName(),
                                      _curveTab->xVector(),
                                      _curveTab->yVector(),
                                      _curveTab->xError(),
@@ -162,11 +162,11 @@
 
   plotItem->addRenderItem(vectorCurve);
 
-  return Kst::ObjectPtr(curve.data());
+  return ObjectPtr(curve.data());
 }
 
 
-Kst::ObjectPtr CurveDialog::editExistingDataObject() const {
+ObjectPtr CurveDialog::editExistingDataObject() const {
   qDebug() << "editExistingDataObject" << endl;
   return 0;
 }
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #721562:721563
@@ -19,7 +19,7 @@
 #include "mainwindow.h"
 #include "tabwidget.h"
 
-#include "kstvcurve.h"
+#include "vcurve.h"
 #include "datacollection.h"
 #include "dataobjectcollection.h"
 #include "vectorcurverenderitem.h"
--- branches/work/kst/portto4/kst/src/libkstmath/colorsequence.cpp #721562:721563
@@ -65,7 +65,7 @@
 }
 
 
-QColor ColorSequence::next(const KstVCurveList& curves, const QColor& badColor) {
+QColor ColorSequence::next(const VCurveList& curves, const QColor& badColor) {
   QColor color;
   int dark_factor;
   int ptrMin;
--- branches/work/kst/portto4/kst/src/libkstmath/colorsequence.h #721562:721563
@@ -13,7 +13,7 @@
 #define _COLORSEQUENCE_H
 
 #include <qcolor.h>
-#include "kstvcurve.h"
+#include "vcurve.h"
 #include "kst_export.h"
 
 class KPalette;
@@ -26,7 +26,7 @@
     KST_EXPORT void createPalette();
     static KST_EXPORT QColor next();
     static KST_EXPORT QColor next(const QColor& badColor);
-    static KST_EXPORT QColor next(const KstVCurveList& Curves, const QColor& badColor);
+    static KST_EXPORT QColor next(const VCurveList& Curves, const QColor& badColor);
     static KST_EXPORT bool colorsTooClose(const QColor& color, const QColor& badColor);
     static KST_EXPORT ColorMode colorMode();
     static KST_EXPORT void setColorMode(ColorMode mode);
--- branches/work/kst/portto4/kst/src/libkstmath/curvehint.cpp #721562:721563
@@ -13,7 +13,7 @@
 #include "curvehint.h"
 #include "datacollection.h"
 #include "kstrelation.h"
-#include "kstvcurve.h"
+#include "vcurve.h"
 
 #include <qdebug.h>
 
@@ -56,7 +56,7 @@
     return 0L;
   }
 
-  return new KstVCurve(tag, x, y, 0L, 0L, 0L, 0L, color);
+  return new VCurve(tag, x, y, 0L, 0L, 0L, 0L, color);
 }
 
 }
--- branches/work/kst/portto4/kst/src/libkstmath/defaultnames.cpp #721562:721563
@@ -20,7 +20,7 @@
 #include "defaultnames.h"
 #include "histogram.h"
 #include "kstpsd.h"
-#include "kstvcurve.h"
+#include "vcurve.h"
 
 #include <qregexp.h>
 #include "kst_i18n.h"
--- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #721562:721563
@@ -33,9 +33,9 @@
     kstpsd.cpp \
     kstrelation.cpp \
     curvepointsymbol.cpp \
-    kstlinestyle.cpp \
-    kstvcurve.cpp \
-    kstimage.cpp \
+    linestyle.cpp \
+    vcurve.cpp \
+    image.cpp \
     defaultnames.cpp \
     histogram.cpp \
     equation.cpp \
@@ -72,14 +72,14 @@
     defaultnames.h \
     equation.h \
     histogram.h \
-    kstimage.h \
-    kstlinestyle.h \
+    image.h \
+    linestyle.h \
     kstobjectdefaults.h \
     kstpainter.h \
     kstplotdefines.h \
     kstpsd.h \
     kstsettings.h \
-    kstvcurve.h \
+    vcurve.h \
     labelparser.h \
     objectfactory.h \
     psdcalculator.h \