[Kst] extragear/graphics/kst/kst/extensions/js

[George Staikos]

SVN commit 467826 by staikos:

fix build of the JS component


 M  +0 -2      Makefile.am  
 M  +3 -15     bind_plot.cpp  
 M  +0 -5      bind_plot.h  
 D             bind_plotlabel.cpp  
 D             bind_plotlabel.h  
 D             bind_plotlabelcollection.cpp  
 D             bind_plotlabelcollection.h  
 M  +0 -2      classindex.xml  
 M  +0 -3      js.cpp  


--- trunk/extragear/graphics/kst/kst/extensions/js/Makefile.am #467825:467826
@@ -59,8 +59,6 @@
 			    bind_debug.cpp \
 			    bind_debuglog.cpp \
 			    bind_debuglogentry.cpp \
-			    bind_plotlabel.cpp \
-			    bind_plotlabelcollection.cpp \
 			    bind_histogramcollection.cpp \
 			    bind_equationcollection.cpp \
 			    bind_powerspectrumcollection.cpp \
--- trunk/extragear/graphics/kst/kst/extensions/js/bind_plot.cpp #467825:467826
@@ -18,7 +18,6 @@
 #include "bind_plot.h"
 #include "bind_curvecollection.h"
 #include "bind_legend.h"
-#include "bind_plotlabelcollection.h"
 
 #include <kst2dplot.h>
 #include <ksttoplevelview.h>
@@ -113,7 +112,6 @@
 
 static PlotProperties plotProperties[] = {
   { "curves", 0L, &KstBindPlot::curves },
-  { "labels", 0L, &KstBindPlot::labels },
   { "legend", 0L, &KstBindPlot::legend },
   { "topLabel", &KstBindPlot::setTopLabel, &KstBindPlot::topLabel },
   { "xLabel", &KstBindPlot::setXLabel, &KstBindPlot::xLabel },
@@ -238,16 +236,6 @@
 }
 
 
-KJS::Value KstBindPlot::labels(KJS::ExecState *exec) const {
-  Kst2DPlotPtr d = makePlot(_d);
-  if (d) {
-    KstReadLocker rl(d);
-    return KJS::Object(new KstBindPlotLabelCollection(exec, d));
-  }
-  return KJS::Null();
-}
-
-
 KJS::Value KstBindPlot::legend(KJS::ExecState *exec) const {
   Kst2DPlotPtr d = makePlot(_d);
   if (d) {
@@ -277,7 +265,7 @@
   Kst2DPlotPtr d = makePlot(_d);
   if (d) {
     KstReadLocker rl(d);
-    return KJS::String(d->TopLabel->text());
+ //   return KJS::String(d->_topLabel);
   }
   return KJS::String();
 }
@@ -302,7 +290,7 @@
   Kst2DPlotPtr d = makePlot(_d);
   if (d) {
     KstReadLocker rl(d);
-    return KJS::String(d->XLabel->text());
+  //  return KJS::String(d->_xLabel);
   }
   return KJS::String();
 }
@@ -327,7 +315,7 @@
   Kst2DPlotPtr d = makePlot(_d);
   if (d) {
     KstReadLocker rl(d);
-    return KJS::String(d->YLabel->text());
+ //   return KJS::String(d->_yLabel);
   }
   return KJS::String();
 }
--- trunk/extragear/graphics/kst/kst/extensions/js/bind_plot.h #467825:467826
@@ -59,11 +59,6 @@
        @description A list of all the Curves used by the plot.
     */
     KJS::Value curves(KJS::ExecState *exec) const;
-    /* @property PlotLabelCollection labels
-       @readonly
-       @description A list of all the Labels used by the plot.
-    */
-    KJS::Value labels(KJS::ExecState *exec) const;
     /* @property Legend legend
        @readonly
        @description The Legend for this plot.
--- trunk/extragear/graphics/kst/kst/extensions/js/classindex.xml #467825:467826
@@ -34,8 +34,6 @@
   <class name="Picture" file="bind_picture"/>
   <class name="PlotCollection" file="bind_plotcollection"/>
   <class name="Plot" file="bind_plot"/>
-  <class name="PlotLabel" file="bind_plotlabel"/>
-  <class name="PlotLabelCollection" file="bind_plotlabelcollection"/>
   <class name="PluginCollection" file="bind_plugincollection"/>
   <class name="Plugin" file="bind_plugin"/>
   <class name="PluginIOCollection" file="bind_pluginiocollection"/>
--- trunk/extragear/graphics/kst/kst/extensions/js/js.cpp #467825:467826
@@ -60,7 +60,6 @@
 #include "bind_matrix.h"
 #include "bind_picture.h"
 #include "bind_plot.h"
-#include "bind_plotlabel.h"
 #include "bind_plugin.h"
 #include "bind_point.h"
 #include "bind_powerspectrum.h"
@@ -141,8 +140,6 @@
 
   new KstBindCurve(exec, &globalObj);
 
-  new KstBindPlotLabel(exec, &globalObj);
-
   new KstBindPlot(exec, &globalObj);
   new KstBindLine(exec, &globalObj);
   new KstBindLabel(exec, &globalObj);