[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Fix compile errors.


  M +2 -12     kst2dplot.cpp   1.344
  M +1 -2      kst2dplot.h   1.134


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.343:1.344
@@ -1312,5 +1312,5 @@ double Kst2DPlot::convertTimeDiffValueTo
 
 
-void Kst2DPlot::convertJDToDateString(QString& label, uint& length, KstXAxisDisplay display, KstXAxisTimeZone zone, double dJD) {
+void Kst2DPlot::convertJDToDateString(QString& label, uint& length, KstXAxisDisplay display, double dJD) {
   QDate date;
   QRect pr = GetPlotRegion();
@@ -1344,14 +1344,4 @@ void Kst2DPlot::convertJDToDateString(QS
   }
 
-  //
-  // correction for the timezone
-  //
-  switch (zone) {
-    case X_AXIS_TIME_ZONE_UTC:
-      break;
-    case X_AXIS_TIME_ZONE_LOCAL:
-      break;
-  }
-  
   double j2 = dJDDay + 1524.0;
   double j3 = floor(6680.0 + ( (j2 - 2439870.0) - 122.1 )/365.25);
@@ -1491,5 +1481,5 @@ void Kst2DPlot::convertTimeValueToString
     case X_AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS:
     case X_AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS:
-      convertJDToDateString(label, length, _xAxisDisplay, _xAxisTimeZone, value);
+      convertJDToDateString(label, length, _xAxisDisplay, value);
       break;
     case X_AXIS_DISPLAY_JD:

--- kdeextragear-2/kst/kst/kst2dplot.h  #1.133:1.134
@@ -366,5 +366,5 @@ private:
   double convertTimeValueToJD(double valueIn);
   double convertTimeDiffValueToDays(double diffIn);
-  void convertJDToDateString(QString& label, uint& length, KstXAxisDisplay display, KstXAxisTimeZone zone, double dJD);
+  void convertJDToDateString(QString& label, uint& length, KstXAxisDisplay display, double dJD);
   void convertTimeValueToString(QString& label, uint& length, double z, bool isLog);
   void convertDiffTimevalueToString(QString& label, double zbase, double zvalue, bool isLog, double scale);
@@ -405,5 +405,4 @@ private:
   KstXAxisInterpretation _xAxisInterpretation;
   KstXAxisDisplay _xAxisDisplay;
-  KstXAxisTimeZone _xAxisTimeZone;
   
   KstScaleModeType _xScaleMode, _yScaleMode;