summaryrefslogtreecommitdiff
path: root/include/vcl/ctrl.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /include/vcl/ctrl.hxx
parent17d821af6bb9df93569836a92f6bed975587fc6c (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/vcl/ctrl.hxx')
-rw-r--r--include/vcl/ctrl.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index c6b60ef48ace..522ab4a7fa84 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -84,12 +84,12 @@ protected:
at the target device, or taking the reference device into account) when
returning.
*/
- Rectangle DrawControlText( OutputDevice& _rTargetDevice, const Rectangle& _rRect,
+ tools::Rectangle DrawControlText( OutputDevice& _rTargetDevice, const tools::Rectangle& _rRect,
const OUString& _rStr, DrawTextFlags _nStyle,
MetricVector* _pVector, OUString* _pDisplayText,
const Size* i_pDeviceSize = nullptr ) const;
- Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const Rectangle & rRect,
+ tools::Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const tools::Rectangle & rRect,
const OUString& _rStr, DrawTextFlags _nStyle,
Size* o_pDeviceSize = nullptr ) const;
@@ -122,7 +122,7 @@ public:
the rect for drawing the frame. Upon returning from the call, the rect will be inflated
by the space occupied by the drawn pixels.
*/
- SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect );
+ SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, tools::Rectangle& rRect );
public:
explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 );
@@ -140,7 +140,7 @@ public:
// gets the displayed text
virtual OUString GetDisplayText() const override;
// returns the bounding box for the character at index nIndex (in control coordinates)
- Rectangle GetCharacterBounds( long nIndex ) const;
+ tools::Rectangle GetCharacterBounds( long nIndex ) const;
// returns the character index for corresponding to rPoint (in control coordinates)
// -1 is returned if no character is at that point
long GetIndexForPoint( const Point& rPoint ) const;