rename for disentangling AA and B2D use in VCL drawing

This renames AntialiasingFlags::EnableB2dDraw to just Enable,
and the AntiAliasB2DDraw names to just AntiAlias. This is
in preparation for a second commit that will actually separate
the AA and B2D functionality of these flags.

Change-Id: I9cc215c5752dfabce41e00e19d9074fc8dc3d4de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103416
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

6 files changed, 22 insertions, 22 deletions

diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 427f77f12d53..0ddf0344ea73 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -37,12 +37,12 @@ namespace vclcanvas
         // #i95645#
 #if defined( MACOSX )
         // use AA on VCLCanvas for Mac
-        maVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw | maVDev->GetAntialiasing() );
+        maVDev->SetAntialiasing( AntialiasingFlags::Enable | maVDev->GetAntialiasing() );
 #else
         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
         // is not required to do AA. It would need to be adapted to use it correctly
         // (especially gradient painting). This will need extra work.
-        maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
+        maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~AntialiasingFlags::Enable);
 #endif
     }
 
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 0072a807ea31..4ac6d1a7b95e 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -76,7 +76,7 @@ namespace vclcanvas
         {
             // VDev content is more current than bitmap - copy contents before!
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            mpVDev->SetAntialiasing( AntialiasingFlags::Enable );
             const Point aEmptyPoint;
             *maBitmap = mpVDev->GetBitmapEx( aEmptyPoint,
                                              mpVDev->GetOutputSizePixel() );
@@ -97,7 +97,7 @@ namespace vclcanvas
         if( mbVDevContentIsCurrent && mpVDev )
         {
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            mpVDev->SetAntialiasing( AntialiasingFlags::Enable );
             aSize = mpVDev->GetOutputSizePixel();
         }
 
@@ -123,12 +123,12 @@ namespace vclcanvas
         // #i95645#
 #if defined( MACOSX )
         // use AA on VCLCanvas for Mac
-        mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw | mpVDev->GetAntialiasing() );
+        mpVDev->SetAntialiasing( AntialiasingFlags::Enable | mpVDev->GetAntialiasing() );
 #else
         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
         // is not required to do AA. It would need to be adapted to use it correctly
         // (especially gradient painting). This will need extra work.
-        mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
+        mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~AntialiasingFlags::Enable);
 #endif
     }
 
@@ -141,7 +141,7 @@ namespace vclcanvas
         {
             // fill with bitmap content
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            mpVDev->SetAntialiasing( AntialiasingFlags::Enable );
             const Point aEmptyPoint;
             mpVDev->DrawBitmapEx( aEmptyPoint, *maBitmap );
         }
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 5cc5f3c42b73..2e8476649e3d 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -149,7 +149,7 @@ namespace vclcanvas
     {
         mp2ndOutDevProvider = rOutDev;
         mp2ndOutDevProvider->getOutDev().EnableMapMode( false );
-        mp2ndOutDevProvider->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        mp2ndOutDevProvider->getOutDev().SetAntialiasing( AntialiasingFlags::Enable );
     }
 
     void CanvasHelper::clear()
@@ -162,7 +162,7 @@ namespace vclcanvas
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
 
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
         rOutDev.SetLineColor( COL_WHITE );
         rOutDev.SetFillColor( COL_WHITE );
         rOutDev.SetClipRegion();
@@ -176,7 +176,7 @@ namespace vclcanvas
 
         rOutDev2.SetDrawMode( DrawModeFlags::Default );
         rOutDev2.EnableMapMode( false );
-        rOutDev2.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev2.SetAntialiasing( AntialiasingFlags::Enable );
         rOutDev2.SetLineColor( COL_WHITE );
         rOutDev2.SetFillColor( COL_WHITE );
         rOutDev2.SetClipRegion();
@@ -880,7 +880,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
 
         // TODO(F2): Support alpha vdev canvas here
         const Point aEmptyPoint(0,0);
@@ -910,7 +910,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
 
         Bitmap aBitmap( rOutDev.GetBitmapEx(aRect.TopLeft(),
                                           aRect.GetSize()).GetBitmap() );
@@ -960,7 +960,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
 
         const Size aBmpSize( rOutDev.GetOutputSizePixel() );
 
@@ -1004,7 +1004,7 @@ namespace vclcanvas
         OutputDevice* p2ndOutDev = nullptr;
 
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
 
         if( mp2ndOutDevProvider )
             p2ndOutDev = &mp2ndOutDevProvider->getOutDev();
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 028ea1174f3c..8ac5a7e62d42 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -151,7 +151,7 @@ namespace vclcanvas
                 {
                     mpOutDev->Push();
                     mpOutDev->EnableMapMode(false);
-                    mpOutDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+                    mpOutDev->SetAntialiasing( AntialiasingFlags::Enable );
                 }
             }
 
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 552bf2c6c514..0c1a454c3260 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -87,7 +87,7 @@ namespace vclcanvas
             // wouldn't save much render time, and b) will clutter
             // scrolled sprite content outside this area)
             rOutDev.EnableMapMode( false );
-            rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
             rOutDev.SetClipRegion(vcl::Region(rRequestedArea));
 
             // repaint affected sprite directly to output device (at
@@ -274,7 +274,7 @@ namespace vclcanvas
 
             // flush to screen
             rOutDev.EnableMapMode( false );
-            rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
             rOutDev.SetClipRegion();
             rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize,
                                 aEmptyPoint, aOutDevSize,
@@ -516,7 +516,7 @@ namespace vclcanvas
 
         // paint background
         maVDev->EnableMapMode( false );
-        maVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        maVDev->SetAntialiasing( AntialiasingFlags::Enable );
         maVDev->SetClipRegion();
         maVDev->DrawOutDev( aEmptyPoint, aOutputSize,
                             aOutputPosition, aOutputSize,
@@ -543,7 +543,7 @@ namespace vclcanvas
 
         // flush to screen
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+        rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
         rOutDev.DrawOutDev( aOutputPosition, aOutputSize,
                             aEmptyPoint, aOutputSize,
                             *maVDev );
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 01994f55c0d6..f123b31e4cfb 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -47,12 +47,12 @@ namespace vclcanvas
         // #i95645#
 #if defined( MACOSX )
         // use AA on VCLCanvas for Mac
-        mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw | mpBackBuffer->getOutDev().GetAntialiasing() );
+        mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::Enable | mpBackBuffer->getOutDev().GetAntialiasing() );
 #else
         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
         // is not required to do AA. It would need to be adapted to use it correctly
         // (especially gradient painting). This will need extra work.
-        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
+        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~AntialiasingFlags::Enable);
 #endif
     }
 
@@ -116,7 +116,7 @@ namespace vclcanvas
 
             const ::Point aEmptyPoint;
             mpBackBuffer->getOutDev().EnableMapMode( false );
-            mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+            mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::Enable );
             WriteDIB(mpBackBuffer->getOutDev().GetBitmapEx(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false);
         }