[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Reset line style after use.
Remove unused variable.

CCMAIL: 95022-done at bugs.kde.org


  M +7 -7      kst2dplot.cpp   1.314


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.313:1.314
@@ -5066,5 +5066,4 @@ void Kst2DPlot::plotCurves(QPainter& p,
   KstBaseCurvePtr c;
   QRegion clipRegion;
-  QRect clipRect;
   double maxY = 0.0, minY = 0.0;
   double rX, rY, rEX, rEY;
@@ -5078,6 +5077,5 @@ void Kst2DPlot::plotCurves(QPainter& p,
   clipRegion = p.clipRegion();
   clipping = p.hasClipping();
-  p.setClipRegion(QRegion(int(Lx), int(Ly), int(Hx-Lx), int(Hy-Ly), 
-                          QRegion::Rectangle));
+  p.setClipRegion(QRegion(int(Lx), int(Ly), int(Hx-Lx), int(Hy-Ly), QRegion::Rectangle));
 
   for (int i_curve = 0; i_curve < (int)Curves.count(); i_curve++) {
@@ -5104,8 +5102,4 @@ void Kst2DPlot::plotCurves(QPainter& p,
       }
 
-      p.setPen(QPen(c->color(),
-                    (c->lineWidth() < penWidth ? penWidth : c->lineWidth()),
-                    style));
-
       if (c->hasLines()) {
         QPointArray points(MAX_NUM_POLYLINES);
@@ -5116,4 +5110,8 @@ void Kst2DPlot::plotCurves(QPainter& p,
         int i0Start = i0;
 
+        p.setPen(QPen(c->color(),
+                    (c->lineWidth() < penWidth ? penWidth : c->lineWidth()),
+                    style));
+
 // Optimize - isnan seems expensive, at least in gcc debug mode
 //            cachegrind backs this up.
@@ -5365,4 +5363,6 @@ void Kst2DPlot::plotCurves(QPainter& p,
           overlap = false;
         }
+
+        p.setPen(QPen(c->color(), (c->lineWidth() < penWidth ? penWidth : c->lineWidth())));
       } // end if c->hasLines()