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/headless | |
| 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/headless')
| -rw-r--r-- | vcl/headless/svpdummies.cxx | 6 | ||||
| -rw-r--r-- | vcl/headless/svpframe.cxx | 4 | ||||
| -rw-r--r-- | vcl/headless/svptext.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 1a3eefb0d23a..46ff2841a961 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -50,11 +50,11 @@ unsigned int SvpSalSystem::GetDisplayScreenCount() return 1; } -Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen ) +tools::Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen ) { - Rectangle aRect; + tools::Rectangle aRect; if( nScreen == 0 ) - aRect = Rectangle( Point(0,0), Size(VIRTUAL_DESKTOP_WIDTH,VIRTUAL_DESKTOP_HEIGHT) ); + aRect = tools::Rectangle( Point(0,0), Size(VIRTUAL_DESKTOP_WIDTH,VIRTUAL_DESKTOP_HEIGHT) ); return aRect; } diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 962cea02a69f..ef32f7dbae77 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -295,9 +295,9 @@ void SvpSalFrame::GetClientSize( long& rWidth, long& rHeight ) rHeight = maGeometry.nHeight; } -void SvpSalFrame::GetWorkArea( Rectangle& rRect ) +void SvpSalFrame::GetWorkArea( tools::Rectangle& rRect ) { - rRect = Rectangle( Point( 0, 0 ), + rRect = tools::Rectangle( Point( 0, 0 ), Size( VIRTUAL_DESKTOP_WIDTH, VIRTUAL_DESKTOP_HEIGHT ) ); } diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index bdb97a97efc7..3751a0f217e7 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -91,7 +91,7 @@ void SvpSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, m_aTextRenderImpl.GetGlyphWidths(pFont, bVertical, rWidths, rUnicodeEnc); } -bool SvpSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, Rectangle& rRect) +bool SvpSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { return m_aTextRenderImpl.GetGlyphBoundRect(rGlyph, rRect); } |