rename ImpBitmap methods

to match underlying SalBitmap methods, in preparation for getting rid of
ImpBitmap

Change-Id: I14200ef53b1fdb8c1fa94d7d09319187cdfb3996
Reviewed-on: https://gerrit.libreoffice.org/52949
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 51 insertions, 52 deletions

diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 3281c741370d..57fb240f23b1 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -53,23 +53,23 @@ public:
 
     SalBitmap*          ImplGetSalBitmap() const { return mpSalBitmap.get(); }
 
-    void                ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
-    bool                ImplCreate( const ImpBitmap& rImpBitmap );
-    bool                ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
-    bool                ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
+    void                Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
+    bool                Create( const ImpBitmap& rImpBitmap );
+    bool                Create( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
+    bool                Create( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
 
-    Size                ImplGetSize() const;
-    sal_uInt16          ImplGetBitCount() const;
+    Size                GetSize() const;
+    sal_uInt16          GetBitCount() const;
 
-    BitmapBuffer*       ImplAcquireBuffer( BitmapAccessMode nMode );
-    void                ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode );
+    BitmapBuffer*       AcquireBuffer( BitmapAccessMode nMode );
+    void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode );
 
-    BitmapChecksum      ImplGetChecksum() const;
-    void                ImplInvalidateChecksum();
+    BitmapChecksum      GetChecksum() const;
+    void                InvalidateChecksum();
 
-    bool                ImplScalingSupported() const;
-    bool                ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag );
-    bool                ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol );
+    bool                ScalingSupported() const;
+    bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag );
+    bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol );
     bool                ConvertToGreyscale();
 };
 
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 86868f70826a..f02acce300e1 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -43,7 +43,7 @@ Bitmap::Bitmap(const Bitmap& rBitmap)
 Bitmap::Bitmap(SalBitmap* pSalBitmap)
     : mxImpBmp(new ImpBitmap(pSalBitmap))
     , maPrefMapMode(MapMode(MapUnit::MapPixel))
-    , maPrefSize(mxImpBmp->ImplGetSize())
+    , maPrefSize(mxImpBmp->GetSize())
 {
 }
 
@@ -104,7 +104,7 @@ Bitmap::Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalett
         }
 
         mxImpBmp.reset(new ImpBitmap);
-        mxImpBmp->ImplCreate( rSizePixel, nBitCount, pRealPal ? *pRealPal : aPal );
+        mxImpBmp->Create( rSizePixel, nBitCount, pRealPal ? *pRealPal : aPal );
     }
 }
 
@@ -242,12 +242,12 @@ void Bitmap::SetEmpty()
 
 Size Bitmap::GetSizePixel() const
 {
-    return( mxImpBmp ? mxImpBmp->ImplGetSize() : Size() );
+    return( mxImpBmp ? mxImpBmp->GetSize() : Size() );
 }
 
 sal_uInt16 Bitmap::GetBitCount() const
 {
-    return( mxImpBmp ? mxImpBmp->ImplGetBitCount() : 0 );
+    return( mxImpBmp ? mxImpBmp->GetBitCount() : 0 );
 }
 
 bool Bitmap::HasGreyPalette() const
@@ -271,7 +271,7 @@ BitmapChecksum Bitmap::GetChecksum() const
 
     if( mxImpBmp )
     {
-        nRet = mxImpBmp->ImplGetChecksum();
+        nRet = mxImpBmp->GetChecksum();
 
         if (!nRet)
         {
@@ -280,11 +280,11 @@ BitmapChecksum Bitmap::GetChecksum() const
             // so, we need to update the imp bitmap for this bitmap instance
             // as we do in BitmapInfoAccess::ImplCreate
             std::shared_ptr<ImpBitmap> xNewImpBmp(new ImpBitmap);
-            if (xNewImpBmp->ImplCreate(*mxImpBmp, GetBitCount()))
+            if (xNewImpBmp->Create(*mxImpBmp, GetBitCount()))
             {
                 Bitmap* pThis = const_cast<Bitmap*>(this);
                 pThis->mxImpBmp = xNewImpBmp;
-                nRet = mxImpBmp->ImplGetChecksum();
+                nRet = mxImpBmp->GetChecksum();
             }
         }
     }
@@ -298,7 +298,7 @@ void Bitmap::ImplMakeUnique()
     {
         std::shared_ptr<ImpBitmap> xOldImpBmp = mxImpBmp;
         mxImpBmp.reset(new ImpBitmap);
-        mxImpBmp->ImplCreate(*xOldImpBmp);
+        mxImpBmp->Create(*xOldImpBmp);
     }
 }
 
@@ -829,7 +829,7 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay )
     if( mxImpBmp && pDispGraphics )
     {
         std::shared_ptr<ImpBitmap> xImpDispBmp(new ImpBitmap);
-        if (xImpDispBmp->ImplCreate(*mxImpBmp, pDispGraphics))
+        if (xImpDispBmp->Create(*mxImpBmp, pDispGraphics))
             aDispBmp.ImplSetImpBitmap(xImpDispBmp);
     }
 
diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx
index 877ec5c195f5..aa21c4d359b0 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -143,7 +143,7 @@ bool Bitmap::Invert()
             }
         }
 
-        mxImpBmp->ImplInvalidateChecksum();
+        mxImpBmp->InvalidateChecksum();
         pAcc.reset();
         bRet = true;
     }
@@ -860,12 +860,11 @@ bool Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_
     {
         // implementation specific replace
         std::shared_ptr<ImpBitmap> xImpBmp(new ImpBitmap);
-        if (xImpBmp->ImplCreate(*mxImpBmp)
-            && xImpBmp->ImplReplace(rSearchColor, rReplaceColor, nTol))
+        if (xImpBmp->Create(*mxImpBmp) && xImpBmp->Replace(rSearchColor, rReplaceColor, nTol))
         {
             ImplSetImpBitmap(xImpBmp);
             maPrefMapMode = MapMode(MapUnit::MapPixel);
-            maPrefSize = xImpBmp->ImplGetSize();
+            maPrefSize = xImpBmp->GetSize();
             return true;
         }
     }
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index a8c42977bffb..7a0014b1b8c6 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -229,7 +229,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
         {
             std::shared_ptr<ImpBitmap> xImpBmp(new ImpBitmap);
             // frequently used conversion for creating alpha masks
-            if (xImpBmp->ImplCreate(*mxImpBmp) && xImpBmp->ConvertToGreyscale())
+            if (xImpBmp->Create(*mxImpBmp) && xImpBmp->ConvertToGreyscale())
             {
                 ImplSetImpBitmap(xImpBmp);
                 SAL_INFO( "vcl.opengl", "Ref count: " << mxImpBmp.use_count() );
@@ -732,16 +732,16 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n
 
     const sal_uInt16 nStartCount(GetBitCount());
 
-    if (mxImpBmp && mxImpBmp->ImplScalingSupported())
+    if (mxImpBmp && mxImpBmp->ScalingSupported())
     {
         // implementation specific scaling
         std::shared_ptr<ImpBitmap> xImpBmp(new ImpBitmap);
-        if (xImpBmp->ImplCreate(*mxImpBmp) && xImpBmp->ImplScale(rScaleX, rScaleY, nScaleFlag))
+        if (xImpBmp->Create(*mxImpBmp) && xImpBmp->Scale(rScaleX, rScaleY, nScaleFlag))
         {
             ImplSetImpBitmap(xImpBmp);
             SAL_INFO( "vcl.opengl", "Ref count: " << mxImpBmp.use_count() );
             maPrefMapMode = MapMode( MapUnit::MapPixel );
-            maPrefSize = xImpBmp->ImplGetSize();
+            maPrefSize = xImpBmp->GetSize();
             return true;
         }
     }
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 34919a3149bf..a9e0618b103c 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -49,16 +49,16 @@ BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
                         "Unpredictable results: bitmap is referenced more than once!" );
         }
 
-        mpBuffer = xImpBmp->ImplAcquireBuffer( mnAccessMode );
+        mpBuffer = xImpBmp->AcquireBuffer( mnAccessMode );
 
         if( !mpBuffer )
         {
             std::shared_ptr<ImpBitmap> xNewImpBmp(new ImpBitmap);
-            if (xNewImpBmp->ImplCreate(*xImpBmp, rBitmap.GetBitCount()))
+            if (xNewImpBmp->Create(*xImpBmp, rBitmap.GetBitCount()))
             {
                 xImpBmp = xNewImpBmp;
                 rBitmap.ImplSetImpBitmap( xImpBmp );
-                mpBuffer = xImpBmp->ImplAcquireBuffer( mnAccessMode );
+                mpBuffer = xImpBmp->AcquireBuffer( mnAccessMode );
             }
         }
 
@@ -72,7 +72,7 @@ BitmapInfoAccess::~BitmapInfoAccess()
 
     if (mpBuffer && xImpBmp)
     {
-        xImpBmp->ImplReleaseBuffer( mpBuffer, mnAccessMode );
+        xImpBmp->ReleaseBuffer( mpBuffer, mnAccessMode );
         mpBuffer = nullptr;
     }
 }
@@ -100,7 +100,7 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
 
     if (!bOk)
     {
-        xImpBmp->ImplReleaseBuffer( mpBuffer, mnAccessMode );
+        xImpBmp->ReleaseBuffer( mpBuffer, mnAccessMode );
         mpBuffer = nullptr;
     }
 }
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 9b9835b3df2d..04b3f4c34912 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -40,76 +40,76 @@ ImpBitmap::~ImpBitmap()
 
 bool ImpBitmap::ImplIsEqual(const ImpBitmap& rBmp) const
 {
-    return (rBmp.ImplGetSize() == ImplGetSize() &&
-        rBmp.ImplGetBitCount() == ImplGetBitCount() &&
-        rBmp.ImplGetChecksum() == ImplGetChecksum());
+    return (rBmp.GetSize() == GetSize() &&
+        rBmp.GetBitCount() == GetBitCount() &&
+        rBmp.GetChecksum() == GetChecksum());
 }
 
-void ImpBitmap::ImplCreate(const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal)
+void ImpBitmap::Create(const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal)
 {
     mpSalBitmap->Create( rSize, nBitCount, rPal );
 }
 
-bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap )
+bool ImpBitmap::Create( const ImpBitmap& rImpBitmap )
 {
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap );
 }
 
-bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics )
+bool ImpBitmap::Create( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics )
 {
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, pGraphics );
 }
 
-bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount )
+bool ImpBitmap::Create( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount )
 {
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, nNewBitCount );
 }
 
-Size ImpBitmap::ImplGetSize() const
+Size ImpBitmap::GetSize() const
 {
     return mpSalBitmap->GetSize();
 }
 
-sal_uInt16 ImpBitmap::ImplGetBitCount() const
+sal_uInt16 ImpBitmap::GetBitCount() const
 {
     sal_uInt16 nBitCount = mpSalBitmap->GetBitCount();
     return ( nBitCount <= 4 ) ? ( ( nBitCount <= 1 ) ? 1 : 4 ):
                                 ( ( nBitCount <= 8 ) ? 8 : 24);
 }
 
-BitmapBuffer* ImpBitmap::ImplAcquireBuffer( BitmapAccessMode nMode )
+BitmapBuffer* ImpBitmap::AcquireBuffer( BitmapAccessMode nMode )
 {
     return mpSalBitmap->AcquireBuffer( nMode );
 }
 
-void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode )
+void ImpBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode )
 {
     mpSalBitmap->ReleaseBuffer( pBuffer, nMode );
 }
 
-BitmapChecksum ImpBitmap::ImplGetChecksum() const
+BitmapChecksum ImpBitmap::GetChecksum() const
 {
     BitmapChecksum aChecksum;
     mpSalBitmap->GetChecksum(aChecksum);
     return aChecksum;
 }
 
-void ImpBitmap::ImplInvalidateChecksum()
+void ImpBitmap::InvalidateChecksum()
 {
     mpSalBitmap->InvalidateChecksum();
 }
 
-bool ImpBitmap::ImplScalingSupported() const
+bool ImpBitmap::ScalingSupported() const
 {
     return mpSalBitmap->ScalingSupported();
 }
 
-bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag )
+bool ImpBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag )
 {
     return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag );
 }
 
-bool ImpBitmap::ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol )
+bool ImpBitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol )
 {
     return mpSalBitmap->Replace( rSearchColor, rReplaceColor, nTol );
 }
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index 6a5e619ede8e..afc235743ae9 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -117,7 +117,7 @@ void OutputDevice::DrawDeviceMask( const Bitmap& rMask, const Color& rMaskColor,
                            ImplLogicHeightToDevicePixel(rDestSize.Height()));
 
         // we don't want to mirror via coordinates
-        const BmpMirrorFlags nMirrFlags = AdjustTwoRect( aPosAry, xImpBmp->ImplGetSize() );
+        const BmpMirrorFlags nMirrFlags = AdjustTwoRect( aPosAry, xImpBmp->GetSize() );
 
         // check if output is necessary
         if( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )