diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-02-26 17:02:38 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-03-03 10:47:27 +0000 |
commit | 7dd973344a8e2c09ac52aa02739b6b921f6df87e (patch) | |
tree | 18d1eade0f352adc80b6e0ff78b4ff463f8986d0 /vcl/unx/kde4/KDEXLib.cxx | |
parent | 13a30b3a109c39ce346ea5bc1f35889209bb375b (diff) |
KDE4: Drop Qt 4.9 support
I don't think there will ever be any 4.9 release, so drop all the
unused code.
Change-Id: I4b72de96e6064240582cd83d4e45547096a2efb0
Diffstat (limited to 'vcl/unx/kde4/KDEXLib.cxx')
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 7c67e3518130..dc63cb65bf45 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -45,12 +45,6 @@ #include <config_kde4.h> -#if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 ) -#define QT_UNIX_EVENT_LOOP_SUPPORT 1 -#else -#define QT_UNIX_EVENT_LOOP_SUPPORT 0 -#endif - #if KDE_HAVE_GLIB #define GLIB_EVENT_LOOP_SUPPORT 1 #else @@ -193,12 +187,6 @@ void KDEXLib::Init() static GPollFunc old_gpoll = NULL; static gint gpoll_wrapper( GPollFD*, guint, gint ); #endif -#if QT_UNIX_EVENT_LOOP_SUPPORT -static int (*qt_select)(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, - const struct timeval *orig_timeout); -static int lo_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, - const struct timeval *orig_timeout); -#endif static bool ( *old_qt_event_filter )( void* ); static bool qt_event_filter( void* m ) @@ -229,21 +217,6 @@ void KDEXLib::setupEventLoop() } #endif #endif -#if QT_UNIX_EVENT_LOOP_SUPPORT -// When Qt does not use Glib support, it uses its own Unix event dispatcher. -// That one has aboutToBlock() and awake() signals, but they are broken (either -// functionality or semantics), as e.g. awake() is not emitted right after the dispatcher -// is woken up from sleep again, but only later (which is too late for re-acquiring SolarMutex). -// This should be fixed with Qt-4.8.0 (?) where support for adding custom select() function -// has been added too (http://bugreports.qt.nokia.com/browse/QTBUG-16934). - if( QAbstractEventDispatcher::instance()->inherits( "QEventDispatcherUNIX" )) - { - eventLoopType = QtUnixEventLoop; - QInternal::callFunction( QInternal::GetUnixSelectFunction, reinterpret_cast< void** >( &qt_select )); - QInternal::callFunction( QInternal::SetUnixSelectFunction, reinterpret_cast< void** >( lo_select )); - return; - } -#endif } #if GLIB_EVENT_LOOP_SUPPORT @@ -254,15 +227,6 @@ gint gpoll_wrapper( GPollFD* ufds, guint nfds, gint timeout ) } #endif -#if QT_UNIX_EVENT_LOOP_SUPPORT -int lo_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, - const struct timeval *orig_timeout) -{ - SalYieldMutexReleaser release; // release YieldMutex (and re-acquire at block end) - return qt_select( nfds, fdread, fdwrite, fdexcept, orig_timeout ); -} -#endif - void KDEXLib::Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ) { if( eventLoopType == LibreOfficeEventLoop ) |