[Libreoffice-commits] core.git: vcl/unx

Jan-Marek Glogowski glogow at fbihome.de
Wed Nov 20 01:32:02 PST 2013


 vcl/unx/kde4/KDEXLib.cxx |    5 ++---
 vcl/unx/kde4/KDEXLib.hxx |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit bee6b3e6dad729263d10daf1550826871c57fe05
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Nov 14 11:31:39 2013 +0100

    Drop processYield return type.
    
    The virtual Yield function has no return type, and the result of
    processYield is actually never used => drop it.
    
    Change-Id: I3da7bc99fd8f56301da37ca196b03b34cdc84a40
    Reviewed-on: https://gerrit.libreoffice.org/6684
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 21b7939..c50bd77 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -308,7 +308,7 @@ void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
 }
 
-bool KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents )
+void KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents )
 {
     QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance( qApp->thread());
     bool wasEvent = false;
@@ -321,8 +321,7 @@ bool KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents )
         wasEvent = true;
     }
     if( bWait && !wasEvent )
-        wasEvent = dispatcher->processEvents( QEventLoop::WaitForMoreEvents );
-    return wasEvent;
+        dispatcher->processEvents( QEventLoop::WaitForMoreEvents );
 }
 
 void KDEXLib::StartTimer( sal_uLong nMS )
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 1e1a9db..1e3adc9 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -60,7 +60,7 @@ class KDEXLib : public QObject, public SalXLib
         void userEventActivated();
         void startTimeoutTimer();
         void startUserEventTimer();
-        bool processYield( bool bWait, bool bHandleAllCurrentEvents );
+        void processYield( bool bWait, bool bHandleAllCurrentEvents );
     Q_SIGNALS:
         void startTimeoutTimerSignal();
         void startUserEventTimerSignal();


More information about the Libreoffice-commits mailing list