diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /vcl/inc/unx/gtk/gtkdata.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'vcl/inc/unx/gtk/gtkdata.hxx')
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 38324c404a28..6490edaa911c 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -88,8 +88,8 @@ class GtkSalTimer : public SalTimer public: GtkSalTimer(); virtual ~GtkSalTimer(); - virtual void Start( sal_uLong nMS ) SAL_OVERRIDE; - virtual void Stop() SAL_OVERRIDE; + virtual void Start( sal_uLong nMS ) override; + virtual void Stop() override; bool Expired(); sal_uLong m_nTimeoutMS; @@ -107,7 +107,7 @@ public: virtual ~GtkData(); void Init(); - virtual void Dispose() SAL_OVERRIDE; + virtual void Dispose() override; static void initNWF(); static void deInitNWF(); @@ -118,8 +118,8 @@ public: void Yield( bool bWait, bool bHandleAllCurrentEvents ); inline GdkDisplay *GetGdkDisplay(); - virtual void ErrorTrapPush() SAL_OVERRIDE; - virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE; + virtual void ErrorTrapPush() override; + virtual bool ErrorTrapPop( bool bIgnoreError ) override; inline GtkSalDisplay *GetGtkDisplay() const; bool BlockIdleTimeout() const { return blockIdleTimeout; } @@ -150,12 +150,12 @@ public: GtkSalSystem* getSystem() const { return m_pSys; } - virtual void deregisterFrame( SalFrame* pFrame ) SAL_OVERRIDE; + virtual void deregisterFrame( SalFrame* pFrame ) override; GdkCursor *getCursor( PointerStyle ePointerStyle ); #if GTK_CHECK_VERSION(3,0,0) virtual int CaptureMouse( SalFrame* pFrame ); #else - virtual int CaptureMouse( SalFrame* pFrame ) SAL_OVERRIDE; + virtual int CaptureMouse( SalFrame* pFrame ) override; #endif SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); } @@ -164,7 +164,7 @@ public: #if GTK_CHECK_VERSION(3,0,0) // int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); } #else - virtual ScreenData *initScreen( SalX11Screen nXScreen ) const SAL_OVERRIDE; + virtual ScreenData *initScreen( SalX11Screen nXScreen ) const override; #endif GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event, @@ -174,10 +174,10 @@ public: void screenSizeChanged( GdkScreen* ); void monitorsChanged( GdkScreen* ); - virtual void PostUserEvent() SAL_OVERRIDE; + virtual void PostUserEvent() override; #if !GTK_CHECK_VERSION(3,0,0) - virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; + virtual bool Dispatch( XEvent *pEvent ) override; #endif }; |