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/toolkit | |
| 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/toolkit')
| -rw-r--r-- | include/toolkit/helper/convert.hxx | 6 | ||||
| -rw-r--r-- | include/toolkit/helper/vclunohelper.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx index a189f8562519..3e4d23696249 100644 --- a/include/toolkit/helper/convert.hxx +++ b/include/toolkit/helper/convert.hxx @@ -46,14 +46,14 @@ inline ::Point VCLPoint( const css::awt::Point& rAWTPoint ) return ::Point( rAWTPoint.X, rAWTPoint.Y ); } -inline css::awt::Rectangle AWTRectangle( const ::Rectangle& rVCLRect ) +inline css::awt::Rectangle AWTRectangle( const ::tools::Rectangle& rVCLRect ) { return css::awt::Rectangle( rVCLRect.Left(), rVCLRect.Top(), rVCLRect.GetWidth(), rVCLRect.GetHeight() ); } -inline ::Rectangle VCLRectangle( const css::awt::Rectangle& rAWTRect ) +inline ::tools::Rectangle VCLRectangle( const css::awt::Rectangle& rAWTRect ) { - return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); + return ::tools::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); } #endif // INCLUDED_TOOLKIT_HELPER_CONVERT_HXX diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 24747523f947..2dbf25320a24 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -138,8 +138,8 @@ public: static ::Point /* VCLPoint */ ConvertToVCLPoint(css::awt::Point const& _aPoint); static css::awt::Point ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint); - static ::Rectangle ConvertToVCLRect( css::awt::Rectangle const & _rRect ); - static css::awt::Rectangle ConvertToAWTRect( ::Rectangle const & _rRect ); + static ::tools::Rectangle ConvertToVCLRect( css::awt::Rectangle const & _rRect ); + static css::awt::Rectangle ConvertToAWTRect( ::tools::Rectangle const & _rRect ); static css::awt::MouseEvent createMouseEvent( |