loplugin:toolslong in Library_vclplug_osx

Change-Id: I63892376154893a97e6b205b93c1682f66fd3064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105756
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 27 insertions, 13 deletions

diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 3d0f19f418a0..d634647715ce 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -24,6 +24,7 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <postmac.h>
 
+#include <tools/long.hxx>
 #include <vcl/sysdata.hxx>
 
 #include <osx/salinst.h>
@@ -117,10 +118,12 @@ public:
     virtual void                SetMenu( SalMenu* pSalMenu ) override;
     virtual void                DrawMenuBar() override;
     virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                SetMinClientSize( tools::Long nWidth, tools::Long nHeight )
+        override;
+    virtual void                SetMaxClientSize( tools::Long nWidth, tools::Long nHeight )
+        override;
+    virtual void                SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
@@ -131,7 +134,7 @@ public:
     virtual void                ToTop( SalFrameToTop nFlags ) override;
     virtual void                SetPointer( PointerStyle ePointerStyle ) override;
     virtual void                CaptureMouse( bool bMouse ) override;
-    virtual void                SetPointerPos( long nX, long nY ) override;
+    virtual void                SetPointerPos( tools::Long nX, tools::Long nY ) override;
     virtual void                Flush( void ) override;
     virtual void                Flush( const tools::Rectangle& ) override;
     virtual void                SetInputContext( SalInputContext* pContext ) override;
@@ -157,7 +160,8 @@ public:
     // start setting the clipregion consisting of nRects rectangles
     virtual void BeginSetClipRegion( sal_uInt32 nRects ) override;
     // add a rectangle to the clip region
-    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void UnionClipRegion(
+        tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     // done setting up the clipregion
     virtual void EndSetClipRegion() override;
 
@@ -193,7 +197,8 @@ public:
     void screenParametersChanged();
 
 protected:
-    SalEvent PreparePosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags);
+    SalEvent PreparePosSize(
+        tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags);
 
 private: // methods
     /** do things on initial show (like centering on parent or on screen)
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index edece53b6bea..97cbe37e2038 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -30,6 +30,7 @@
 #include <comphelper/solarmutex.hxx>
 #include <osl/conditn.hxx>
 #include <osl/thread.hxx>
+#include <tools/long.hxx>
 
 #ifdef MACOSX
 #include <osx/osxvcltypes.h>
@@ -101,7 +102,7 @@ public:
     virtual void            DestroyObject( SalObject* pObject ) override;
     virtual std::unique_ptr<SalVirtualDevice>
                             CreateVirtualDevice( SalGraphics* pGraphics,
-                                                   long &nDX, long &nDY,
+                                                   tools::Long &nDX, tools::Long &nDY,
                                                    DeviceFormat eFormat,
                                                    const SystemGraphicsData *pData = nullptr ) override;
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 144c1cb069a1..4c2ac88be6c1 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_VCL_INC_OSX_SALOBJ_H
 #define INCLUDED_VCL_INC_OSX_SALOBJ_H
 
+#include <sal/config.h>
+
+#include <tools/long.hxx>
 #include <vcl/sysdata.hxx>
 #include <salobj.hxx>
 
@@ -56,9 +59,9 @@ public:
 
     virtual void                    ResetClipRegion() override;
     virtual void                    BeginSetClipRegion( sal_uInt32 nRects ) override;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     virtual void                    EndSetClipRegion() override;
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     virtual void                    Show( bool bVisible ) override;
     virtual const SystemEnvData*    GetSystemData() const override;
 };
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 0c7ec1e9edfd..abb787f5746e 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_INC_OSX_SALPRN_H
 #define INCLUDED_VCL_INC_OSX_SALPRN_H
 
+#include <sal/config.h>
+
+#include <tools/long.hxx>
+
 #include <osx/osxvcltypes.h>
 
 #include <salprn.hxx>
@@ -72,7 +76,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) override;
     virtual bool                SetData( JobSetFlags i_nFlags, ImplJobSetup* i_pSetupData ) override;
     virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
-                                             long& o_rOutWidth, long& o_rOutHeight,
+                                             tools::Long& o_rOutWidth, tools::Long& o_rOutHeight,
                                              Point& rPageOffset,
                                              Size& rPaperSize ) override;
     virtual sal_uInt32          GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override;
@@ -102,8 +106,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     sal_Int32 getCurPageRangeCount() const { return mnCurPageRangeCount; }
 
     // match width/height against known paper formats, possibly switching orientation
-    const PaperInfo* matchPaper( long i_nWidth, long i_nHeight, Orientation& o_rOrientation ) const;
-    void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
+    const PaperInfo* matchPaper(
+        tools::Long i_nWidth, tools::Long i_nHeight, Orientation& o_rOrientation ) const;
+    void setPaperSize( tools::Long i_nWidth, tools::Long i_nHeight, Orientation i_eSetOrientation );
 
     private:
     AquaSalInfoPrinter( const AquaSalInfoPrinter& ) = delete;