diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-01 15:48:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | a881fd7e66294ada222e1d618a7d47a0549a2342 (patch) | |
| tree | cb928eb75f73e36ec3c93a44f2901617476e7fc8 /vcl/workben | |
| parent | 8c5d90adaf1813c8f3a65487044b8fbe80f8bc85 (diff) | |
convert RasterOp to scoped enum
Change-Id: I136423c105316c9b5b18e64d04a248fd7ac5590b
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 12 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 1b983bcd2f3a..ced001f178a2 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -625,37 +625,37 @@ void outDevGrind(vcl::RenderContext& rTarget) { rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_OVERPAINT ); + rTarget.SetRasterOp( RasterOp::OverPaint ); rTarget.SetClipRegion(); grindFunc( rTarget, iter, nTurns, "w/o clip, w/o xor" ); rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_OVERPAINT ); + rTarget.SetRasterOp( RasterOp::OverPaint ); rTarget.SetClipRegion( vcl::Region( aClipRect ) ); grindFunc( rTarget, iter, nTurns, "with rect clip, w/o xor" ); rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_OVERPAINT ); + rTarget.SetRasterOp( RasterOp::OverPaint ); rTarget.SetClipRegion( vcl::Region( aClipPoly ) ); grindFunc( rTarget, iter, nTurns, "with complex clip, w/o xor" ); rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_XOR ); + rTarget.SetRasterOp( RasterOp::Xor ); rTarget.SetClipRegion(); grindFunc( rTarget, iter, nTurns, "w/o clip, with xor" ); rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_XOR ); + rTarget.SetRasterOp( RasterOp::Xor ); rTarget.SetClipRegion( vcl::Region( aClipRect ) ); grindFunc( rTarget, iter, nTurns, "with rect clip, with xor" ); rTarget.SetLineColor( Color(COL_BLACK) ); rTarget.SetFillColor( Color(COL_GREEN) ); - rTarget.SetRasterOp( ROP_XOR ); + rTarget.SetRasterOp( RasterOp::Xor ); rTarget.SetClipRegion( vcl::Region( aClipPoly ) ); grindFunc( rTarget, iter, nTurns, "with complex clip, with xor" ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 81df47ab87f3..c301bd75b71f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -625,9 +625,9 @@ public: aTextRect.Left()+1, aTextRect.Top()+1, aTextRect.Right()-1, aTextRect.Bottom()-1); rDev.SetLineColor(COL_WHITE); - rDev.SetRasterOp(ROP_XOR); + rDev.SetRasterOp(RasterOp::Xor); rDev.DrawRect(aInnerRect); - rDev.SetRasterOp(ROP_OVERPAINT); + rDev.SetRasterOp(RasterOp::OverPaint); } // DX array rendering @@ -640,9 +640,9 @@ public: aTop.Move(pItems[j], 0); aBottom.Move(pItems[j], aTextRect.GetHeight()); rDev.SetLineColor(COL_RED); - rDev.SetRasterOp(ROP_XOR); + rDev.SetRasterOp(RasterOp::Xor); rDev.DrawLine(aTop,aBottom); - rDev.SetRasterOp(ROP_OVERPAINT); + rDev.SetRasterOp(RasterOp::OverPaint); } delete[] pItems; @@ -1154,7 +1154,7 @@ public: AntialiasingFlags nFlags = rDev.GetAntialiasing(); rDev.SetAntialiasing(nFlags & ~AntialiasingFlags::EnableB2dDraw); - rDev.SetRasterOp( ROP_XOR ); + rDev.SetRasterOp( RasterOp::Xor ); rCtx.mpDemoRenderer->drawThumbs(rDev, r, true); |