summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-01 14:18:39 +0200
committerNoel Grandin <noel@peralex.com>2016-09-05 08:21:46 +0200
commit4442d226438c1f558021b2df9fe6e540e72cbc7e (patch)
treed505be371a0b5a87b692c98cb6d871f7944a8ab2 /vcl
parent619d5fceada2df7c7bc915cea51779fd115d0fcd (diff)
convert OutDevSupportType to scoped enum
Change-Id: I7a1e4448dfff0ea6909149533d228829d980796c
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpgdi.cxx4
-rw-r--r--vcl/quartz/salgdicommon.cxx4
-rw-r--r--vcl/source/outdev/line.cxx4
-rw-r--r--vcl/source/outdev/polygon.cxx6
-rw-r--r--vcl/source/outdev/polyline.cxx4
-rw-r--r--vcl/source/outdev/transparent.cxx4
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx4
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx2
-rw-r--r--vcl/win/gdi/salgdi2.cxx4
9 files changed, 18 insertions, 18 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index e3218f649606..f26a8d6733ea 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1400,8 +1400,8 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const
{
switch (eType)
{
- case OutDevSupport_TransparentRect:
- case OutDevSupport_B2DDraw:
+ case OutDevSupportType::TransparentRect:
+ case OutDevSupportType::B2DDraw:
return true;
}
return false;
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 907bf087c1b1..aae7eff14868 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1892,8 +1892,8 @@ bool AquaSalGraphics::supportsOperation( OutDevSupportType eType ) const
bool bRet = false;
switch( eType )
{
- case OutDevSupport_TransparentRect:
- case OutDevSupport_B2DDraw:
+ case OutDevSupportType::TransparentRect:
+ case OutDevSupportType::B2DDraw:
bRet = true;
break;
default:
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index a04dd802ee96..c12e1e6e98f3 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -115,7 +115,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
// #i101598# support AA and snap for lines, too
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw)
- && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
+ && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw)
&& ROP_OVERPAINT == GetRasterOp()
&& IsLineColor())
{
@@ -159,7 +159,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const LineInfo& rInfo )
{
const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw)
- && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
+ && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw)
&& ROP_OVERPAINT == GetRasterOp()
&& IsLineColor());
basegfx::B2DPolyPolygon aFillPolyPolygon;
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 612e93716bb1..8c7a58339b60 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -64,7 +64,7 @@ void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly )
// use b2dpolygon drawing if possible
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
ROP_OVERPAINT == GetRasterOp() &&
(IsLineColor() || IsFillColor()))
{
@@ -177,7 +177,7 @@ void OutputDevice::DrawPolygon( const tools::Polygon& rPoly )
// use b2dpolygon drawing if possible
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
ROP_OVERPAINT == GetRasterOp() &&
(IsLineColor() || IsFillColor()))
{
@@ -280,7 +280,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
InitFillColor();
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
ROP_OVERPAINT == GetRasterOp() &&
(IsLineColor() || IsFillColor()))
{
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index ff89d7b8d3ec..77971000dbfc 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -213,7 +213,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon,
InitFillColor();
const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
ROP_OVERPAINT == GetRasterOp() &&
IsLineColor());
@@ -313,7 +313,7 @@ bool OutputDevice::DrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon,
const bool bTryAA( bBypassAACheck ||
((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
ROP_OVERPAINT == GetRasterOp() &&
IsLineColor()));
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 4376e39d0b4e..c8cfebd522c7 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -233,7 +233,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
InitFillColor();
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
- mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
+ mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
(ROP_OVERPAINT == GetRasterOp()) )
{
// b2dpolygon support not implemented yet on non-UNX platforms
@@ -305,7 +305,7 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly
static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA");
if( !pDisableNative &&
- mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
+ mpGraphics->supportsOperation( OutDevSupportType::B2DDraw )
#if defined UNX && ! defined MACOSX && ! defined IOS
&& GetBitCount() > 8
#endif
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 602c3f7294a2..2080210c66a8 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -254,8 +254,8 @@ bool X11SalGraphics::supportsOperation( OutDevSupportType eType ) const
bool bRet = false;
switch( eType )
{
- case OutDevSupport_TransparentRect:
- case OutDevSupport_B2DDraw:
+ case OutDevSupportType::TransparentRect:
+ case OutDevSupportType::B2DDraw:
{
XRenderPeer& rPeer = XRenderPeer::GetInstance();
const SalDisplay* pSalDisp = GetDisplay();
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 4df3ab349c50..bbcb5a5fd56f 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -436,7 +436,7 @@ void GenPspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
bool GenPspGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTransparency*/ )
{
- // TODO: implement and advertise OutDevSupport_B2DDraw support
+ // TODO: implement and advertise OutDevSupportType::B2DDraw support
return false;
}
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 8514e73c1523..3a49ac592dde 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -45,10 +45,10 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
switch( eType )
{
- case OutDevSupport_TransparentRect:
+ case OutDevSupportType::TransparentRect:
bRet = mbVirDev || mbWindow;
break;
- case OutDevSupport_B2DDraw:
+ case OutDevSupportType::B2DDraw:
bRet = bAllowForTest;
break;
default: break;