summaryrefslogtreecommitdiff
path: root/starmath/inc
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 /starmath/inc
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 'starmath/inc')
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx4
-rw-r--r--starmath/inc/dialog.hxx8
-rw-r--r--starmath/inc/document.hxx2
-rw-r--r--starmath/inc/edit.hxx4
-rw-r--r--starmath/inc/rect.hxx6
-rw-r--r--starmath/inc/view.hxx12
-rw-r--r--starmath/inc/visitors.hxx4
7 files changed, 20 insertions, 20 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 2b5c8b0cc34e..a7a43a1d11f4 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -85,7 +85,7 @@ class SmElementsControl : public Control
static const sal_uInt16 aFormats[][2];
static const sal_uInt16 aOthers[][2];
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual void MouseMove(const MouseEvent& rMEvt) override;
virtual void RequestHelp(const HelpEvent& rHEvt) override;
@@ -151,7 +151,7 @@ public:
virtual ~SmElementsDockingWindow() override;
virtual void dispose() override;
- virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) override;
+ virtual void EndDocking( const tools::Rectangle& rReactangle, bool bFloatMode) override;
virtual void ToggleFloatingMode() override;
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 79bc363db7f3..7de61cf8b7dd 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -80,7 +80,7 @@ public:
class SmShowFont : public vcl::Window
{
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
vcl::Font maFont;
@@ -279,7 +279,7 @@ class SmShowSymbolSetWindow : public Control
void SetScrollBarRange();
Point OffsetPoint(const Point &rPoint) const;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual void KeyInput(const KeyEvent& rKEvt) override;
virtual void Resize() override;
@@ -323,7 +323,7 @@ class SmShowSymbol : public Control
{
Link<SmShowSymbol&,void> aDblClickHdlLink;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual void Resize() override;
@@ -384,7 +384,7 @@ public:
class SmShowChar : public Control
{
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void Resize() override;
public:
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 0c72a33f50a1..351724ddccc7 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -201,7 +201,7 @@ public:
void Execute( SfxRequest& rReq );
void GetState(SfxItemSet &);
- virtual void SetVisArea (const Rectangle & rVisArea) override;
+ virtual void SetVisArea (const tools::Rectangle & rVisArea) override;
virtual void SetModified(bool bModified = true) override;
/** Get a cursor for modifying this document
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 5fb4ec1dcdaa..6f1aa1ae7f15 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -70,13 +70,13 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
DECL_LINK(EditStatusHdl, EditStatus&, void);
DECL_LINK(ScrollHdl, ScrollBar*, void);
void CreateEditView();
- Rectangle AdjustScrollBars();
+ tools::Rectangle AdjustScrollBars();
void SetScrollBarRanges();
void InitScrollBars();
void InvalidateSlots();
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 2a33bb5c5023..83ebdcda5586 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -180,7 +180,7 @@ public:
bool IsInsideRect(const Point &rPoint) const;
bool IsInsideItalicRect(const Point &rPoint) const;
- inline Rectangle AsRectangle() const;
+ inline tools::Rectangle AsRectangle() const;
SmRect AsGlyphRect() const;
};
@@ -210,9 +210,9 @@ inline long SmRect::GetBaseline() const
}
-inline Rectangle SmRect::AsRectangle() const
+inline tools::Rectangle SmRect::AsRectangle() const
{
- return Rectangle(Point(GetItalicLeft(), GetTop()), GetItalicSize());
+ return tools::Rectangle(Point(GetItalicLeft(), GetTop()), GetItalicSize());
}
#endif
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 83cf858ba36f..fdbe2526e625 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -46,7 +46,7 @@ class SmGraphicWindow : public ScrollableWindow
{
Point aFormulaDrawPos;
// old style editing pieces
- Rectangle aCursorRect;
+ tools::Rectangle aCursorRect;
bool bIsCursorVisible;
bool bIsLineVisible;
AutoTimer aCaretBlinkTimer;
@@ -69,7 +69,7 @@ protected:
}
using Window::SetCursor;
void SetCursor(const SmNode *pNode);
- void SetCursor(const Rectangle &rRect);
+ void SetCursor(const tools::Rectangle &rRect);
bool IsInlineEditEnabled() const;
private:
@@ -79,7 +79,7 @@ private:
sal_uInt16 nZoom;
protected:
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
virtual void KeyInput(const KeyEvent& rKEvt) override;
virtual void Command(const CommandEvent& rCEvt) override;
virtual void StateChanged( StateChangedType eChanged ) override;
@@ -172,7 +172,7 @@ protected:
// Window
virtual void GetFocus() override;
virtual void Resize() override;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual Size CalcDockingSize(SfxChildAlignment eAlign) override;
@@ -264,7 +264,7 @@ protected:
virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize) override;
virtual void InnerResizePixel(const Point &rOfs, const Size &rSize, bool inplaceEditModeChange) override;
virtual void OuterResizePixel(const Point &rOfs, const Size &rSize) override;
- virtual void QueryObjAreaPixel( Rectangle& rRect ) const override;
+ virtual void QueryObjAreaPixel( tools::Rectangle& rRect ) const override;
virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) override;
public:
@@ -306,7 +306,7 @@ public:
void GetState(SfxItemSet &);
void Impl_Print( OutputDevice &rOutDev, const SmPrintUIOptions &rPrintUIOptions,
- Rectangle aOutRect, Point aZeroPoint );
+ tools::Rectangle aOutRect, Point aZeroPoint );
/** Set bInsertIntoEditWindow so we know where to insert
*
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index fafbd328ee2e..63271613f10f 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -392,9 +392,9 @@ private:
/** True if aSelectionArea have been initialized */
bool mbHasSelectionArea;
/** The current area that is selected */
- Rectangle maSelectionArea;
+ tools::Rectangle maSelectionArea;
/** Extend the area that must be selected */
- void ExtendSelectionArea(const Rectangle& rArea);
+ void ExtendSelectionArea(const tools::Rectangle& rArea);
/** Default visiting method */
void DefaultVisit( SmNode* pNode ) override;
/** Visit the children of a given pNode */