[Libreoffice-commits] core.git: vcl/inc

[Luboš Luňák (via logerrit)]

 vcl/inc/qt5/Qt5Frame.hxx    |   13 +++++++------
 vcl/inc/qt5/Qt5Instance.hxx |    4 ++--
 vcl/inc/qt5/Qt5Object.hxx   |    6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit c757569b4bd7b6640bae0148d2e5037d4de1b0fb
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Nov 16 15:06:05 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Nov 16 19:40:57 2020 +0100

    avoid loplugin::toolslong warnings in qt5 vcl backend
    
    Change-Id: Iddf3d86a51afd1315ac8b5bdafef00d40a9df591
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105939
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index c35b45739e7d..54a721e03730 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -166,11 +166,11 @@ public:
 
     virtual void SetExtendedFrameStyle(SalExtStyle nExtStyle) 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,
+    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(long& rWidth, long& rHeight) 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 SetModal(bool bModal) override;
@@ -183,7 +183,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 bool ShowTooltip(const OUString& rText, const tools::Rectangle& rHelpArea) override;
     using SalFrame::Flush;
     virtual void Flush() override;
@@ -203,7 +203,8 @@ public:
     virtual bool SetPluginParent(SystemParentData* pNewParent) override;
     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 SetScreenNumber(unsigned int) override;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 232606c48062..d73a59de51c1 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -107,8 +107,8 @@ public:
     virtual void DestroyObject(SalObject* pObject) override;
 
     virtual std::unique_ptr<SalVirtualDevice>
-    CreateVirtualDevice(SalGraphics* pGraphics, long& nDX, long& nDY, DeviceFormat eFormat,
-                        const SystemGraphicsData* pData = nullptr) override;
+    CreateVirtualDevice(SalGraphics* pGraphics, tools::Long& nDX, tools::Long& nDY,
+                        DeviceFormat eFormat, const SystemGraphicsData* pData = nullptr) override;
 
     virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pQueueInfo,
                                               ImplJobSetup* pSetupData) override;
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx
index 0479db2d62f0..9380cc57a75a 100644
--- a/vcl/inc/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/Qt5Object.hxx
@@ -49,10 +49,12 @@ 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 void SetForwardKey(bool bEnable) override;