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 /include/vcl/dockwin.hxx | |
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 'include/vcl/dockwin.hxx')
-rw-r--r-- | include/vcl/dockwin.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 4d9c48963e93..d4622a07ff7b 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -30,21 +30,21 @@ struct DockingData { Point maMousePos; // in - Rectangle maTrackRect; // in/out + tools::Rectangle maTrackRect; // in/out bool mbFloating; // out - DockingData( const Point& rPt, const Rectangle& rRect, bool b) : + DockingData( const Point& rPt, const tools::Rectangle& rRect, bool b) : maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ) {}; }; struct EndDockingData { - Rectangle maWindowRect; // in + tools::Rectangle maWindowRect; // in bool mbFloating; // in bool mbCancelled; // in - EndDockingData( const Rectangle& rRect, bool b, bool bCancelled ) : + EndDockingData( const tools::Rectangle& rRect, bool b, bool bCancelled ) : maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled ) {}; }; @@ -88,7 +88,7 @@ private: Size maRollUpOutSize; Size maMinOutSize; Size maMaxOutSize; - Rectangle maDragArea; + tools::Rectangle maDragArea; long mnTrackX; long mnTrackY; long mnTrackWidth; @@ -120,14 +120,14 @@ public: bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers - void StartDocking( const Point& rPos, Rectangle& rRect ); - bool Docking( const Point& rPos, Rectangle& rRect ); - void EndDocking( const Rectangle& rRect, bool bFloatMode ); + void StartDocking( const Point& rPos, tools::Rectangle& rRect ); + bool Docking( const Point& rPos, tools::Rectangle& rRect ); + void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ); bool PrepareToggleFloatingMode(); void ToggleFloatingMode(); - void SetDragArea( const Rectangle& rRect ); - const Rectangle& GetDragArea() const { return maDragArea;} + void SetDragArea( const tools::Rectangle& rRect ); + const tools::Rectangle& GetDragArea() const { return maDragArea;} void Lock(); void Unlock(); @@ -195,7 +195,7 @@ public: void SetPosSizePixel( vcl::Window *pWin, long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags ); - Rectangle GetPosSizePixel( const vcl::Window *pWin ); + tools::Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; @@ -277,8 +277,8 @@ public: virtual void dispose() override; virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ); + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ); virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); |