summaryrefslogtreecommitdiff
path: root/vcl/inc/unx/gtk
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 /vcl/inc/unx/gtk
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 'vcl/inc/unx/gtk')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx14
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx132
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx2
4 files changed, 75 insertions, 75 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ad615048ec86..5ab7296081b0 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -204,11 +204,11 @@ class GtkSalFrame : public SalFrame
Size m_aMaxSize;
Size m_aMinSize;
- Rectangle m_aRestorePosSize;
+ tools::Rectangle m_aRestorePosSize;
#if GTK_CHECK_VERSION(3,0,0)
OUString m_aTooltip;
- Rectangle m_aHelpArea;
+ tools::Rectangle m_aHelpArea;
long m_nWidthRequest;
long m_nHeightRequest;
cairo_region_t* m_pRegion;
@@ -341,7 +341,7 @@ class GtkSalFrame : public SalFrame
enum class SetType { RetainSize, Fullscreen, UnFullscreen };
- void SetScreen( unsigned int nNewScreen, SetType eType, Rectangle *pSize = nullptr );
+ void SetScreen( unsigned int nNewScreen, SetType eType, tools::Rectangle *pSize = nullptr );
public:
#if GTK_CHECK_VERSION(3,0,0)
@@ -457,7 +457,7 @@ public:
virtual void SetMaxClientSize( long nWidth, long nHeight ) override;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
virtual void GetClientSize( long& rWidth, long& rHeight ) override;
- virtual void GetWorkArea( Rectangle& rRect ) override;
+ virtual void GetWorkArea( tools::Rectangle& rRect ) override;
virtual SalFrame* GetParent() const override;
virtual void SetWindowState( const SalFrameState* pState ) override;
virtual bool GetWindowState( SalFrameState* pState ) override;
@@ -527,9 +527,9 @@ public:
#if GTK_CHECK_VERSION(3,0,0)
virtual void SetModal(bool bModal) override;
- virtual bool ShowTooltip(const OUString& rHelpText, const Rectangle& rHelpArea) override;
- virtual sal_uIntPtr ShowPopover(const OUString& rHelpText, const Rectangle& rHelpArea, QuickHelpFlags nFlags) override;
- virtual bool UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, const Rectangle& rHelpArea) override;
+ virtual bool ShowTooltip(const OUString& rHelpText, const tools::Rectangle& rHelpArea) override;
+ virtual sal_uIntPtr ShowPopover(const OUString& rHelpText, const tools::Rectangle& rHelpArea, QuickHelpFlags nFlags) override;
+ virtual bool UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, const tools::Rectangle& rHelpArea) override;
virtual bool HidePopover(sal_uIntPtr nId) override;
#endif
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index bf70ba1694dc..e8b425436b64 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -103,17 +103,17 @@ class GtkSalGraphics : public SvpSalGraphics
public:
GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow );
virtual bool drawNativeControl( ControlType nType, ControlPart nPart,
- const Rectangle& rControlRegion,
+ const tools::Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption ) override;
virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart,
- const Rectangle& rControlRegion,
+ const tools::Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption,
- Rectangle &rNativeBoundingRegion,
- Rectangle &rNativeContentRegion ) override;
+ tools::Rectangle &rNativeBoundingRegion,
+ tools::Rectangle &rNativeContentRegion ) override;
#if ENABLE_CAIRO_CANVAS
virtual bool SupportsCairo() const override;
@@ -203,13 +203,13 @@ private:
static GtkStyleContext *mpSeparatorMenuItemStyle;
static GtkStyleContext *mpSeparatorMenuItemSeparatorStyle;
- static Rectangle NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect );
- static Rectangle NWGetSpinButtonRect( ControlPart nPart, Rectangle aAreaRect);
- static Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart, Rectangle aAreaRect );
+ static tools::Rectangle NWGetScrollButtonRect( ControlPart nPart, tools::Rectangle aAreaRect );
+ static tools::Rectangle NWGetSpinButtonRect( ControlPart nPart, tools::Rectangle aAreaRect);
+ static tools::Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect );
static void PaintScrollbar(GtkStyleContext *context,
cairo_t *cr,
- const Rectangle& rControlRectangle,
+ const tools::Rectangle& rControlRectangle,
ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue );
@@ -217,29 +217,29 @@ private:
cairo_t *cr,
ControlType nType,
ControlPart nPart,
- Rectangle aAreaRect,
+ tools::Rectangle aAreaRect,
ControlState nState );
void PaintSpinButton(GtkStateFlags flags,
cairo_t *cr,
- const Rectangle& rControlRectangle,
+ const tools::Rectangle& rControlRectangle,
ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue);
static void PaintCombobox(GtkStateFlags flags,
cairo_t *cr,
- const Rectangle& rControlRectangle,
+ const tools::Rectangle& rControlRectangle,
ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue);
static void PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,
- const Rectangle& rControlRectangle,
+ const tools::Rectangle& rControlRectangle,
bool bIsCheck, bool bInMenu);
static void PaintCheck(cairo_t *cr, GtkStyleContext *context,
- const Rectangle& rControlRectangle, bool bInMenu);
+ const tools::Rectangle& rControlRectangle, bool bInMenu);
static void PaintRadio(cairo_t *cr, GtkStyleContext *context,
- const Rectangle& rControlRectangle, bool bInMenu);
+ const tools::Rectangle& rControlRectangle, bool bInMenu);
static bool style_loaded;
@@ -270,14 +270,14 @@ public:
// native widget methods
virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
- virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
const Point& aPos, bool& rIsInside ) override;
- virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption ) override;
- virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+ virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption,
- Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
+ tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override;
//helper methods for frame's UpdateSettings
void updateSettings( AllSettings& rSettings );
@@ -296,129 +296,129 @@ public:
protected:
- GdkX11Pixmap* NWGetPixmapFromScreen( Rectangle srcRect, int nBgColor = 0 );
- bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, Rectangle dstRect );
+ GdkX11Pixmap* NWGetPixmapFromScreen( tools::Rectangle srcRect, int nBgColor = 0 );
+ bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, tools::Rectangle dstRect );
bool DoDrawNativeControl( GdkDrawable* pDrawable,
ControlType nType,
ControlPart nPart,
- const Rectangle& aCtrlRect,
- const std::list< Rectangle >& aClip,
+ const tools::Rectangle& aCtrlRect,
+ const std::list< tools::Rectangle >& aClip,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption,
ControlCacheKey& rControlCacheKey);
bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption,
ControlCacheKey& rControlCacheKey);
bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
- const Rectangle& rControlRectangle,
- const std::list< Rectangle >& rClipList,
+ const tools::Rectangle& rControlRectangle,
+ const std::list< tools::Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
};
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index cf076675dea8..9a5ef3ed67ab 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -126,7 +126,7 @@ public:
gboolean SignalKey(GdkEventKey* pEvent);
void ReturnFocus();
- virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override;
+ virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
virtual void ShowCloseButton(bool bShow) override;
virtual bool CanGetFocus() const override;
virtual bool TakeFocus() override;
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index b8ebbdf0574d..d888bce5bca3 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -29,7 +29,7 @@ public:
virtual bool IsUnifiedDisplay() override;
virtual unsigned int GetDisplayScreenCount() override;
virtual unsigned int GetDisplayBuiltInScreen() override;
- virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen) override;
+ virtual tools::Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen) override;
virtual int ShowNativeDialog (const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons,