use tools::Long in vcl

Change-Id: Ice1055021e8568634e9a66ba89d3bb4ef4e731df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 26 insertions, 21 deletions

diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 1515783f6076..bef2f9dc4f66 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -99,10 +99,12 @@ public:
     virtual bool setClipRegion(const vcl::Region&) override;
     virtual void ResetClipRegion() override;
 
-    virtual void drawPixel(long nX, long nY) override;
-    virtual void drawPixel(long nX, long nY, Color nColor) override;
-    virtual void drawLine(long nX1, long nY1, long nX2, long nY2) override;
-    virtual void drawRect(long nX, long nY, long nWidth, long nHeight) override;
+    virtual void drawPixel(tools::Long nX, tools::Long nY) override;
+    virtual void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override;
+    virtual void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2,
+                          tools::Long nY2) override;
+    virtual void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
+                          tools::Long nHeight) override;
     virtual void drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry) override;
     virtual void drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry) override;
     virtual void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints,
@@ -123,8 +125,9 @@ public:
                               double fMiterMinimumAngle, bool bPixelSnapHairline) override;
     virtual bool drawGradient(const tools::PolyPolygon&, const Gradient&) override;
 
-    virtual void copyArea(long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                          long nSrcHeight, bool bWindowInvalidate) override;
+    virtual void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX,
+                          tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight,
+                          bool bWindowInvalidate) override;
 
     virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override;
     virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override;
@@ -133,15 +136,16 @@ public:
     virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
                           Color nMaskColor) override;
 
-    virtual std::shared_ptr<SalBitmap> getBitmap(long nX, long nY, long nWidth,
-                                                 long nHeight) override;
-    virtual Color getPixel(long nX, long nY) override;
+    virtual std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth,
+                                                 tools::Long nHeight) override;
+    virtual Color getPixel(tools::Long nX, tools::Long nY) override;
 
-    virtual void invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
+    virtual void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+                        SalInvert nFlags) override;
     virtual void invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) override;
 
-    virtual bool drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr,
-                         sal_uInt32 nSize) override;
+    virtual bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+                         void* pPtr, sal_uInt32 nSize) override;
 
     virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override;
 
@@ -156,12 +160,12 @@ public:
                                const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap,
                                const SalBitmap* pAlphaBitmap) override;
 
-    virtual bool drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
-                               sal_uInt8 nTransparency) override;
+    virtual bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
+                               tools::Long nHeight, sal_uInt8 nTransparency) override;
 
     virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
     virtual sal_uInt16 GetBitCount() const override;
-    virtual long GetGraphicsWidth() const override;
+    virtual tools::Long GetGraphicsWidth() const override;
 
     virtual void SetLineColor() override;
     virtual void SetLineColor(Color nColor) override;
@@ -188,8 +192,8 @@ public:
                                   FontSubsetInfo& rInfo // out parameter
                                   ) override;
 
-    virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override;
-    virtual void FreeEmbedFontData(const void* pData, long nDataLen) override;
+    virtual const void* GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override;
+    virtual void FreeEmbedFontData(const void* pData, tools::Long nDataLen) override;
 
     virtual void GetGlyphWidths(const PhysicalFontFace*, bool bVertical,
                                 std::vector<sal_Int32>& rWidths, Ucs2UIntMap& rUnicodeEnc) override;
diff --git a/vcl/inc/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/Qt5VirtualDevice.hxx
index ad0dc3c3c804..0b94928199c8 100644
--- a/vcl/inc/qt5/Qt5VirtualDevice.hxx
+++ b/vcl/inc/qt5/Qt5VirtualDevice.hxx
@@ -45,12 +45,13 @@ public:
     virtual SalGraphics* AcquireGraphics() override;
     virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
 
-    virtual bool SetSize(long nNewDX, long nNewDY) override;
-    virtual bool SetSizeUsingBuffer(long nNewDX, long nNewDY, sal_uInt8* pBuffer) override;
+    virtual bool SetSize(tools::Long nNewDX, tools::Long nNewDY) override;
+    virtual bool SetSizeUsingBuffer(tools::Long nNewDX, tools::Long nNewDY,
+                                    sal_uInt8* pBuffer) override;
 
     // SalGeometryProvider
-    virtual long GetWidth() const override;
-    virtual long GetHeight() const override;
+    virtual tools::Long GetWidth() const override;
+    virtual tools::Long GetHeight() const override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */