From a5a571307fb3306b74ab46b085cde6388270a770 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Mar 2017 20:27:55 +0200 Subject: 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 Tested-by: Jenkins --- cppcanvas/source/inc/implrenderer.hxx | 4 ++-- cppcanvas/source/inc/outdevstate.hxx | 2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 2 +- cppcanvas/source/mtfrenderer/implrenderer.cxx | 20 ++++++++++---------- cppcanvas/source/mtfrenderer/mtftools.cxx | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index be9656466c69..0b584fad9a85 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -36,7 +36,7 @@ class GDIMetaFile; class VirtualDevice; class Gradient; -class Rectangle; +namespace tools { class Rectangle; } namespace vcl { class Font; } namespace tools { class PolyPolygon; } class Point; @@ -215,7 +215,7 @@ static float GetSwapFloat( SvStream& rSt ) const ActionFactoryParameters& rParms, bool bIntersect ); - static void updateClipping( const ::Rectangle& rClipRect, + static void updateClipping( const ::tools::Rectangle& rClipRect, const ActionFactoryParameters& rParms, bool bIntersect ); diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx index 2d199cc860ce..1a087fdc63c4 100644 --- a/cppcanvas/source/inc/outdevstate.hxx +++ b/cppcanvas/source/inc/outdevstate.hxx @@ -80,7 +80,7 @@ namespace cppcanvas } ::basegfx::B2DPolyPolygon clip; - ::Rectangle clipRect; + ::tools::Rectangle clipRect; css::uno::Reference< css::rendering::XPolyPolygon2D > xClipPoly; css::uno::Sequence< double > lineColor; diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 97f6e01920eb..20142396e4e9 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1060,7 +1060,7 @@ namespace cppcanvas sal_Int32 aCount; ReadRectangle (rMF, sx, sy, sw, sh); - Rectangle aSource(Point(sx, sy), Size(sw, sh)); + ::tools::Rectangle aSource(Point(sx, sy), Size(sw, sh)); SAL_INFO("cppcanvas.emf", "EMF+ " << (type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage") << " source rectangle: " << sx << "," << sy << " " << sw << "x" << sh); diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index f12efdb10b1b..38b3921eb215 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1121,7 +1121,7 @@ namespace cppcanvas } } - void ImplRenderer::updateClipping( const ::Rectangle& rClipRect, + void ImplRenderer::updateClipping( const ::tools::Rectangle& rClipRect, const ActionFactoryParameters& rParms, bool bIntersect ) { @@ -1297,7 +1297,7 @@ namespace cppcanvas "region encountered, falling back to bounding box!" ); // #121806# explicitly kept integer - Rectangle aClipRect( + ::tools::Rectangle aClipRect( rVDev.LogicToPixel( pClipAction->GetRegion().GetBoundRect() ) ); @@ -1331,7 +1331,7 @@ namespace cppcanvas MetaISectRectClipRegionAction* pClipAction = static_cast(pCurrAct); // #121806# explicitly kept integer - Rectangle aClipRect( + ::tools::Rectangle aClipRect( rVDev.LogicToPixel( pClipAction->GetRect() ) ); // intersect current clip with given rect @@ -1353,7 +1353,7 @@ namespace cppcanvas "region encountered, falling back to bounding box!" ); // #121806# explicitly kept integer - Rectangle aClipRect( + ::tools::Rectangle aClipRect( rVDev.LogicToPixel( pClipAction->GetRegion().GetBoundRect() ) ); // intersect current clip with given rect @@ -1931,7 +1931,7 @@ namespace cppcanvas case MetaActionType::RECT: { - const Rectangle& rRect( + const ::tools::Rectangle& rRect( static_cast(pCurrAct)->GetRect() ); if( rRect.IsEmpty() ) @@ -1956,7 +1956,7 @@ namespace cppcanvas case MetaActionType::ROUNDRECT: { - const Rectangle& rRect( + const ::tools::Rectangle& rRect( static_cast(pCurrAct)->GetRect()); if( rRect.IsEmpty() ) @@ -1979,7 +1979,7 @@ namespace cppcanvas case MetaActionType::ELLIPSE: { - const Rectangle& rRect( + const ::tools::Rectangle& rRect( static_cast(pCurrAct)->GetRect() ); if( rRect.IsEmpty() ) @@ -2184,7 +2184,7 @@ namespace cppcanvas // crop bitmap to given source rectangle (no // need to copy and convert the whole bitmap) ::Bitmap aBmp( pAct->GetBitmap() ); - const Rectangle aCropRect( pAct->GetSrcPoint(), + const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(), pAct->GetSrcSize() ); aBmp.Crop( aCropRect ); @@ -2267,7 +2267,7 @@ namespace cppcanvas // crop bitmap to given source rectangle (no // need to copy and convert the whole bitmap) BitmapEx aBmp( pAct->GetBitmapEx() ); - const Rectangle aCropRect( pAct->GetSrcPoint(), + const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(), pAct->GetSrcSize() ); aBmp.Crop( aCropRect ); @@ -2367,7 +2367,7 @@ namespace cppcanvas // crop bitmap to given source rectangle (no // need to copy and convert the whole bitmap) - const Rectangle aCropRect( pAct->GetSrcPoint(), + const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(), pAct->GetSrcSize() ); aBmp.Crop( aCropRect ); diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index b6f1fff2876d..a9ceb98c5594 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -161,7 +161,7 @@ namespace cppcanvas { // simple rect case - const ::Rectangle aLocalClipRect( rOutdevState.clipRect ); + const ::tools::Rectangle aLocalClipRect( rOutdevState.clipRect ); if( bRotation ) { -- cgit