vcl/unx/kde4/KDEXLib.cxx | 36 ------------------------------------
1 file changed, 36 deletions(-)
New commits:
commit d38365def25ed543e331dfceb1f816db104f8f6c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Feb 26 17:02:38 2014 +0200
KDE4: Drop Qt 4.9 support
I don't think there will ever be any 4.9 release, so drop all the
unused code.
(cherry picked from commit 7dd973344a8e2c09ac52aa02739b6b921f6df87e)
Change-Id: Ieca21e5d62d478dcde26f812e246d27029027bb5
Reviewed-on: https://gerrit.libreoffice.org/8706
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index e08856e..e936c69 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
@@ -200,12 +194,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 )
@@ -236,21 +224,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
@@ -261,15 +234,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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
