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 /svx/inc | |
| 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 'svx/inc')
| -rw-r--r-- | svx/inc/dragmt3d.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/sdr/properties/itemsettools.hxx | 4 | ||||
| -rw-r--r-- | svx/inc/svdibrow.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 1bf8f9b2bcbd..0966fbf91981 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -58,7 +58,7 @@ protected: ::std::vector< E3dDragMethodUnit > maGrp; E3dDragConstraint meConstraint; Point maLastPos; - Rectangle maFullBound; + tools::Rectangle maFullBound; bool mbMoveFull; bool mbMovedAtAll; diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx index fbecdef4f249..cef08ef4907f 100644 --- a/svx/inc/sdr/properties/itemsettools.hxx +++ b/svx/inc/sdr/properties/itemsettools.hxx @@ -24,7 +24,7 @@ class SdrObject; class SfxItemSet; -class Rectangle; +namespace tools { class Rectangle; } class Fraction; // class to remember broadcast start positions @@ -42,7 +42,7 @@ namespace sdr ~ItemChangeBroadcaster(); sal_uInt32 GetRectangleCount() const { return mnCount; } - const Rectangle& GetRectangle(sal_uInt32 nIndex) const; + const tools::Rectangle& GetRectangle(sal_uInt32 nIndex) const; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 525e81a588ed..bcfe6a1dcc7b 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -61,12 +61,12 @@ private: protected: virtual long GetRowCount() const override; virtual bool SeekRow(long nRow) override; - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const override; + virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override; virtual void DoubleClick(const BrowserMouseEvent&) override; virtual void KeyInput(const KeyEvent& rEvt) override; virtual void Select() override; void SetDirty(); // is called for example in mode switches - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; public: SdrItemBrowserControl(vcl::Window* pParent); |