diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 09:37:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 09:40:30 +0200 |
| commit | 025c58f7ea613c2271e43e6639d734e4d478621d (patch) | |
| tree | 46a4d3c649a7ed18e27766fee8aceb0b8e4e40b2 /vcl/inc/unx | |
| parent | 78bb1a2a51a991f605ae5c51d813697673bbc670 (diff) | |
fix kde4 vclplug build
by reverting parts of
commit de8f6b25de6fbe813fe172542e7eff1596b37335
loplugin:unused-returns in vcl
and reverting
commit 78bb1a2a51a991f605ae5c51d813697673bbc67
Fix --enable-kde4 codeHEAD
<noelgrandin> sberg, is that safe ^^ ? I was just about to push a partial revert of the commit that caused the breakage
<sberg> noelgrandin, oops, I'd naively assumed that all impls of Dispatch had just always returned true
Change-Id: Icbca450a76de30a04bc90a2887066840191c9d5f
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/saldisp.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index d612ef64a151..31440f0f3655 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -185,7 +185,7 @@ public: virtual void TriggerAllUserEventsProcessed() override; #if !GTK_CHECK_VERSION(3,0,0) - virtual void Dispatch( XEvent *pEvent ) override; + virtual bool Dispatch( XEvent *pEvent ) override; #endif #if GTK_CHECK_VERSION(3,0,0) void RefreshMenusUnity(); diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index e91efe244b44..259af28e63a8 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -291,7 +291,7 @@ protected: mutable Time m_nLastUserEventTime; // mutable because changed on first access - virtual void Dispatch( XEvent *pEvent ) = 0; + virtual bool Dispatch( XEvent *pEvent ) = 0; void InitXinerama(); void InitRandR( ::Window aRoot ) const; void DeInitRandR(); @@ -389,7 +389,7 @@ public: SalX11Display( Display* pDisp ); virtual ~SalX11Display() override; - virtual void Dispatch( XEvent *pEvent ) override; + virtual bool Dispatch( XEvent *pEvent ) override; virtual void Yield(); virtual void TriggerUserEventProcessing() override; |