diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /vcl/inc/osx | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/inc/osx')
-rw-r--r-- | vcl/inc/osx/salframe.h | 8 | ||||
-rw-r--r-- | vcl/inc/osx/salmenu.h | 4 | ||||
-rw-r--r-- | vcl/inc/osx/salsys.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 94afaf3e9f0e..4b6d486f6be6 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -87,7 +87,7 @@ public: std::list<AquaBlinker*> maBlinkers; - Rectangle maInvalidRect; + tools::Rectangle maInvalidRect; InputContextFlags mnICOptions; @@ -118,7 +118,7 @@ public: 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 GetWorkArea( Rectangle& rRect ) override; + virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; virtual void SetWindowState( const SalFrameState* pState ) override; virtual bool GetWindowState( SalFrameState* pState ) override; @@ -130,7 +130,7 @@ public: virtual void CaptureMouse( bool bMouse ) override; virtual void SetPointerPos( long nX, long nY ) override; virtual void Flush( void ) override; - virtual void Flush( const Rectangle& ) override; + virtual void Flush( const tools::Rectangle& ) override; virtual void SetInputContext( SalInputContext* pContext ) override; virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override; virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override; @@ -161,7 +161,7 @@ public: void UpdateFrameGeometry(); // trigger painting of the window - void SendPaintEvent( const Rectangle* pRect = nullptr ); + void SendPaintEvent( const tools::Rectangle* pRect = nullptr ); static bool isAlive( const AquaSalFrame* pFrame ) { return GetSalData()->maFrameCheck.find( pFrame ) != GetSalData()->maFrameCheck.end(); } diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h index f21c750bcc01..4d3ffaaf752e 100644 --- a/vcl/inc/osx/salmenu.h +++ b/vcl/inc/osx/salmenu.h @@ -69,10 +69,10 @@ public: virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override; virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override; virtual void GetSystemMenuData( SystemMenuData* pData ) override; - virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override; + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override; virtual bool AddMenuBarButton( const SalMenuButtonItem& ) override; virtual void RemoveMenuBarButton( sal_uInt16 nId ) override; - virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override; + virtual tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override; int getItemIndexByPos( sal_uInt16 nPos ) const; const AquaSalFrame* getFrame() const; diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h index e1b18f90d124..c619a99eef4e 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -33,7 +33,7 @@ public: // get info about the display virtual unsigned int GetDisplayScreenCount() override; - virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override; + virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override; virtual int ShowNativeMessageBox( const OUString& rTitle, const OUString& rMessage) override; |