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/inc/salgdi.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 'vcl/inc/salgdi.hxx')
| -rw-r--r-- | vcl/inc/salgdi.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index a2b67c07ede3..e914b6493dff 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -39,7 +39,7 @@ class FontAttributes; class PhysicalFontFace; class SalLayout; class ImplLayoutArgs; -class Rectangle; +namespace tools { class Rectangle; } class FontSubsetInfo; class OpenGLContext; class OutputDevice; @@ -189,7 +189,7 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) = 0; - virtual bool GetGlyphBoundRect(const GlyphItem&, Rectangle&) = 0; + virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) = 0; virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) = 0; virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0; @@ -204,7 +204,7 @@ public: void mirror( long& nX, const OutputDevice *pOutDev ) const; void mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const; - void mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; + void mirror( tools::Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; void mirror( vcl::Region& rRgn, const OutputDevice *pOutDev ) const; void mirror( ImplControlValue&, const OutputDevice* ) const; basegfx::B2DPoint mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *pOutDev ) const; @@ -353,7 +353,7 @@ public: */ bool HitTestNativeScrollbar( ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, const Point& aPos, bool& rIsInside, const OutputDevice *pOutDev ); @@ -366,7 +366,7 @@ public: bool DrawNativeControl( ControlType nType, ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, @@ -380,12 +380,12 @@ public: bool GetNativeControlRegion( ControlType nType, ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, - Rectangle &rNativeBoundingRegion, - Rectangle &rNativeContentRegion, + tools::Rectangle &rNativeBoundingRegion, + tools::Rectangle &rNativeContentRegion, const OutputDevice *pOutDev ); bool BlendBitmap( @@ -540,7 +540,7 @@ protected: */ virtual bool hitTestNativeControl( ControlType eType, ControlPart ePart, - const Rectangle& rBoundingControlRegion, + const tools::Rectangle& rBoundingControlRegion, const Point& aPos, bool& rIsInside ); /** @@ -557,7 +557,7 @@ protected: */ virtual bool drawNativeControl( ControlType eType, ControlPart ePart, - const Rectangle& rBoundingControlRegion, + const tools::Rectangle& rBoundingControlRegion, ControlState eState, const ImplControlValue& aValue, const OUString& aCaption ); @@ -583,12 +583,12 @@ protected: */ virtual bool getNativeControlRegion( ControlType eType, ControlPart ePart, - const Rectangle& rBoundingControlRegion, + const tools::Rectangle& rBoundingControlRegion, ControlState eState, const ImplControlValue& aValue, const OUString& aCaption, - Rectangle &rNativeBoundingRegion, - Rectangle &rNativeContentRegion ); + tools::Rectangle &rNativeBoundingRegion, + tools::Rectangle &rNativeContentRegion ); /** Blend the bitmap with the current buffer */ virtual bool blendBitmap( |