diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-18 10:07:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-18 10:08:31 +0100 |
| commit | 7b2d8deef6580fb28adc02ab2d0fa1b43142543d (patch) | |
| tree | 4b77a8df89a6ec6de8e4366fde7f34eb30f8c106 /vcl/unx/kde4 | |
| parent | 94699cdec88ae181548d108b4a96f97be1f6c365 (diff) | |
Fix --enable-kde4 again
...after c88165dfb46c771eba6324ec061bf4455732194e "loplugin: unused return
values in vcl/"
Change-Id: Ia9acead013d80f5747e2cb7f18d46cd163890eda
Diffstat (limited to 'vcl/unx/kde4')
| -rw-r--r-- | vcl/unx/kde4/KDESalDisplay.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDESalDisplay.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index 33a36e45d5b0..105393fd9b54 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -46,14 +46,14 @@ SalKDEDisplay::~SalKDEDisplay() pDisp_ = nullptr; } -bool SalKDEDisplay::Yield() +void SalKDEDisplay::Yield() { if( DispatchInternalEvent() ) - return true; + return; // Prevent blocking from Drag'n'Drop events, which may have already have processed the event if (XEventsQueued( pDisp_, QueuedAfterReading ) == 0) - return false; + return; DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == osl::Thread::getCurrentIdentifier(), @@ -62,9 +62,8 @@ bool SalKDEDisplay::Yield() XEvent event; XNextEvent( pDisp_, &event ); if( checkDirectInputEvent( &event )) - return true; + return; qApp->x11ProcessEvent( &event ); - return true; } // HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx index 59734c7d806e..a262a6a57ef1 100644 --- a/vcl/unx/kde4/KDESalDisplay.hxx +++ b/vcl/unx/kde4/KDESalDisplay.hxx @@ -27,7 +27,7 @@ class SalKDEDisplay : public SalX11Display explicit SalKDEDisplay( Display* pDisp ); virtual ~SalKDEDisplay(); static SalKDEDisplay* self(); - virtual bool Yield() override; + virtual void Yield() override; bool checkDirectInputEvent( XEvent* ev ); private: Atom xim_protocol; |