Fixup type names - squash into Marco's commit.

Change-Id: Iae7914122f1d9f14c033bb1fd7c9fcbef53638db

5 files changed, 12 insertions, 14 deletions

diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index de8a5555fee4..296593fec167 100644
--- a/include/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_VCL_SALGTYPE_HXX
 
 typedef sal_uInt32 SalColor;
+typedef sal_uInt64 SalChecksum;
+
 #define MAKE_SALCOLOR( r, g, b )    ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16))
 #define SALCOLOR_RED( n )           ((sal_uInt8)((n)>>16))
 #define SALCOLOR_GREEN( n )         ((sal_uInt8)(((sal_uInt16)(n)) >> 8))
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index b33d69f6e0e1..fba1e4c39b75 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -55,7 +55,7 @@ private:
     void makeCurrent();
     virtual void updateChecksum() const;
 
-    bool calcChecksumGL(OpenGLTexture& rHashTexture, ChecksumType& rHash) const;
+    bool calcChecksumGL(OpenGLTexture& rHashTexture, SalChecksum& rHash) const;
 
 public:
     OpenGLSalBitmap();
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index a5e0dbbca8cc..c23b1641c0a3 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -39,9 +39,6 @@ enum class BmpScaleFlag;
 class VCL_PLUGIN_PUBLIC SalBitmap
 {
 public:
-
-    typedef sal_uInt64      ChecksumType;
-
                             SalBitmap() : mbChecksumValid(false) {}
     virtual                 ~SalBitmap();
 
@@ -68,7 +65,7 @@ public:
     virtual bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0;
 
 
-    virtual bool GetChecksum(ChecksumType& rChecksum) const
+    virtual bool GetChecksum(SalChecksum& rChecksum) const
     {
         updateChecksum();
         assert(mbChecksumValid);
@@ -82,8 +79,8 @@ public:
     }
 
 protected:
-    ChecksumType mnChecksum;
-    bool         mbChecksumValid;
+    SalChecksum mnChecksum;
+    bool        mbChecksumValid;
 
 protected:
     virtual void updateChecksum() const
@@ -91,7 +88,7 @@ protected:
         if (mbChecksumValid)
             return;
 
-        ChecksumType nCrc = 0;
+        SalChecksum nCrc = 0;
         SalBitmap* pThis = const_cast<SalBitmap*>(this);
         BitmapBuffer* pBuf = pThis->AcquireBuffer(BITMAP_READ_ACCESS);
         if (pBuf)
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 75709575269c..ba668112f294 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -509,7 +509,7 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const
     return mnBits;
 }
 
-bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const
+bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, SalChecksum& rChecksum) const
 {
     OUString FragShader("areaHashCRC64TFragmentShader");
 
@@ -576,9 +576,8 @@ bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType&
     std::vector<sal_uInt8> aBuf( aFinalTexture.GetWidth() * aFinalTexture.GetHeight() * 4 );
     aFinalTexture.Read(GL_RGBA, GL_UNSIGNED_BYTE, aBuf.data());
 
-    ChecksumType nCrc = vcl_crc64(0, aBuf.data(), aBuf.size());
+    rChecksum = vcl_crc64(0, aBuf.data(), aBuf.size());
 
-    rChecksum = nCrc;
     return true;
 }
 
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index f70012202b07..a51cc5b258ec 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -94,9 +94,9 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode
 
 sal_uLong ImpBitmap::ImplGetChecksum() const
 {
-    SalBitmap::ChecksumType aChecksum;
-    mpSalBitmap->GetChecksum(aChecksum);
-    sal_uLong a32BitChecksum = aChecksum;
+    SalChecksum nChecksum;
+    mpSalBitmap->GetChecksum(nChecksum);
+    sal_uLong a32BitChecksum = nChecksum;
     return a32BitChecksum;
 }