[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Remove obsolete checks in datamode.
Remove unnecessary paint.


  M +107 -112  kst2dplot.cpp   1.341
  M +0 -2      kst2dplot.h   1.132


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.340:1.341
@@ -387,5 +387,4 @@ void Kst2DPlot::commonConstructor(const 
                                 bool x_log,
                                 bool y_log) {
-  _highlighting = false;
   _zoomPaused = false;
   _dirty = true;
@@ -1946,5 +1947,4 @@ void Kst2DPlot::paint(KstPaintType type,
 
     // we might need to redraw the datamode marker.
-    if (!_highlighting) {
       KstTopLevelViewPtr tlv = KstApp::inst()->activeView();
       if (tlv) {
@@ -1961,5 +1961,4 @@ void Kst2DPlot::paint(KstPaintType type,
       }
     }
-  }
 
   KstPlotBase::paint(type, p);
@@ -3013,5 +3012,4 @@ void Kst2DPlot::updateMousePos(QPoint po
 
 void Kst2DPlot::highlightNearestDataPoint(bool bRepaint, QWidget *view, const QPoint& pos) {
-  if (!_highlighting) {
     QRect pr = GetPlotRegion();
     double near_x, near_y;
@@ -3024,5 +3022,4 @@ void Kst2DPlot::highlightNearestDataPoin
     double xmin, ymin, xmax, ymax, xpos, ypos, dx_per_pix;
 
-    _highlighting = true;
     getLScale(xmin, ymin, xmax, ymax);
 
@@ -3131,6 +3128,4 @@ void Kst2DPlot::highlightNearestDataPoin
 
     KstApp::inst()->slotUpdateDataMsg(msg);
-    _highlighting = false;
-  }
 }
 
@@ -4585,5 +4580,5 @@ void Kst2DPlot::dropEvent(QWidget *view,
             }
             setDirty();
-            static_cast<KstViewWidget*>(view)->paint();
+            static_cast<KstViewWidget*>(view)->update(geometry());
           }
         }

--- kdeextragear-2/kst/kst/kst2dplot.h  #1.131:1.132
@@ -390,6 +390,4 @@ private:
   bool _dirty : 1;
   bool _zoomPaused : 1;
-  bool _highlighting : 1; // lock to prevent reentrancy on data mode
-                          // (shouldn't this be avoidable?)
   bool _curveToMarkersRisingDetect : 1;
   bool _curveToMarkersFallingDetect : 1;