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

[Adam Treat]

SVN commit 638602 by treat:

* RasterOp -> CompositionMode
      CopyROP = CompositionMode_Source
      XorROP = CompositionMode_Xor
      NotROP = CompositionMode_Destination
      SetROP = CompositionMode_Source


 M  +7 -7      kst2dplot.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/kst2dplot.cpp #638601:638602
@@ -2219,10 +2219,10 @@
 
 void Kst2DPlot::drawGraphicSelectionAt(QPainter& p, const QPoint& pos) {
   if (PlotRegion.contains(pos)) {
-    p.setRasterOp(Qt::XorROP);
+    p.setCompositionMode(QPainter::CompositionMode_Xor);
     p.setPen(QPen(QColor("gray"), 1));
     p.drawRect(pos.x() - 2, pos.y() - 2, 4, 4);
-    p.setRasterOp(Qt::CopyROP);
+    p.setCompositionMode(QPainter::CompositionMode_Source);
   }
 }
 
@@ -2247,10 +2247,10 @@
   }
 
   if (PlotRegion.contains(X1, Y1)) {
-    p.setRasterOp(Qt::XorROP);
+    p.setCompositionMode(QPainter::CompositionMode_Xor);
     p.setPen(QPen(QColor("gray"), 1));
     p.drawEllipse(X1 - 3, Y1 - 3, 6, 6);
-    p.setRasterOp(Qt::CopyROP);
+    p.setCompositionMode(QPainter::CompositionMode_Source);
   }
 }
 
@@ -2267,11 +2267,11 @@
   int Y1 = d2i(_m_Y * y + _b_Y) + position().y();
 
   if (PlotRegion.contains(X1, Y1)) {
-    p.setRasterOp(Qt::XorROP);
+    p.setCompositionMode(QPainter::CompositionMode_Xor);
     p.setPen(QPen(QColor("gray"), 1));
     p.drawLine(X1 - 3, Y1, X1 + 4, Y1);
     p.drawLine(X1, Y1 - 3, X1, Y1 + 4);
-    p.setRasterOp(Qt::CopyROP);
+    p.setCompositionMode(QPainter::CompositionMode_Source);
   }
 }
 
@@ -2391,7 +2391,7 @@
     }
 
     if (p.makingMask()) {
-      p.setRasterOp(Qt::SetROP);
+      p.setCompositionMode(QPainter::CompositionMode_Source);
       KstPlotBase::paintSelf(p, bounds);
     } else {
       const QRegion clip(clipRegion());