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 /canvas | |
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 'canvas')
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 8 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 12 | ||||
-rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 7aebfbc1ac2f..8bdda85d1ba8 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -168,7 +168,7 @@ namespace vclcanvas rOutDev.SetLineColor( COL_WHITE ); rOutDev.SetFillColor( COL_WHITE ); rOutDev.SetClipRegion(); - rOutDev.DrawRect( Rectangle( Point(), + rOutDev.DrawRect( ::tools::Rectangle( Point(), rOutDev.GetOutputSizePixel()) ); if( mp2ndOutDev ) @@ -181,7 +181,7 @@ namespace vclcanvas rOutDev2.SetLineColor( COL_WHITE ); rOutDev2.SetFillColor( COL_WHITE ); rOutDev2.SetClipRegion(); - rOutDev2.DrawRect( Rectangle( Point(), + rOutDev2.DrawRect( ::tools::Rectangle( Point(), rOutDev2.GetOutputSizePixel()) ); rOutDev2.SetDrawMode( DrawModeFlags::BlackLine | DrawModeFlags::BlackFill | DrawModeFlags::BlackText | DrawModeFlags::BlackGradient | DrawModeFlags::BlackBitmap ); @@ -946,7 +946,7 @@ namespace vclcanvas rLayout = getMemoryLayout(); // TODO(F2): Support alpha canvas here - const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const ::tools::Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); OutputDevice& rOutDev( mpOutDev->getOutDev() ); @@ -1007,7 +1007,7 @@ namespace vclcanvas rOutDev.EnableMapMode( false ); rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); - const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const ::tools::Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); const sal_uInt16 nBitCount( std::min( (sal_uInt16)24, rOutDev.GetBitCount() ) ); const BitmapPalette* pPalette = nullptr; diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index dd5236673edb..3250fc879746 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -106,7 +106,7 @@ namespace vclcanvas */ void fillLinearGradient( OutputDevice& rOutDev, const ::basegfx::B2DHomMatrix& rTextureTransform, - const ::Rectangle& rBounds, + const ::tools::Rectangle& rBounds, unsigned int nStepCount, const ::canvas::ParametricPolyPolygon::Values& rValues, const std::vector< ::Color >& rColors ) @@ -264,7 +264,7 @@ namespace vclcanvas void fillPolygonalGradient( OutputDevice& rOutDev, const ::basegfx::B2DHomMatrix& rTextureTransform, - const ::Rectangle& rBounds, + const ::tools::Rectangle& rBounds, unsigned int nStepCount, bool bFillNonOverlapping, const ::canvas::ParametricPolyPolygon::Values& rValues, @@ -488,7 +488,7 @@ namespace vclcanvas const ::canvas::ParametricPolyPolygon::Values& rValues, const std::vector< ::Color >& rColors, const ::basegfx::B2DHomMatrix& rTextureTransform, - const ::Rectangle& rBounds, + const ::tools::Rectangle& rBounds, unsigned int nStepCount, bool bFillNonOverlapping ) { @@ -563,7 +563,7 @@ namespace vclcanvas // determine maximal bound rect of texture-filled // polygon - const ::Rectangle aPolygonDeviceRectOrig( + const ::tools::Rectangle aPolygonDeviceRectOrig( rPoly.GetBoundRect() ); if( tools::isRectangle( rPoly ) ) @@ -734,7 +734,7 @@ namespace vclcanvas // determine maximal bound rect of texture-filled // polygon - const ::Rectangle aPolygonDeviceRect( + const ::tools::Rectangle aPolygonDeviceRect( aPolyPoly.GetBoundRect() ); @@ -760,7 +760,7 @@ namespace vclcanvas aRect, aTotalTransform ); - const ::Rectangle aIntegerTextureDeviceRect( + const ::tools::Rectangle aIntegerTextureDeviceRect( vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); if( bRectangularPolygon && diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index b8ea28bad033..59efaa6deff8 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; -#define FPS_BOUNDS Rectangle(0,0,130,90) +#define FPS_BOUNDS ::tools::Rectangle(0,0,130,90) #define INFO_COLOR COL_RED namespace vclcanvas @@ -79,7 +79,7 @@ namespace vclcanvas OutputDevice& rOutDev, const ::basegfx::B2IRange& rArea ) { - const Rectangle& rRequestedArea( + const ::tools::Rectangle& rRequestedArea( vcl::unotools::rectangleFromB2IRectangle( rArea ) ); // clip output to actual update region (otherwise a) @@ -222,7 +222,7 @@ namespace vclcanvas // clips. besides that, will interfere with animations (as for // Window-invalidate repaints, only parts of the window will // be redrawn otherwise) - const vcl::Region aFullWindowRegion( Rectangle(aEmptyPoint, + const vcl::Region aFullWindowRegion( ::tools::Rectangle(aEmptyPoint, aOutDevSize) ); pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion); } |