diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-01 12:48:18 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-01 12:48:18 -0500 |
| commit | 7e80b57fd407a5c89121d6c33e2d61bfbb6099ab (patch) | |
| tree | 575760f80c56d660bdc0e66d69e7e4c247353403 | |
| parent | 4ff8edd99a0bb62d92285fedc0eddc6ac67be78f (diff) | |
| download | tde-7e80b57fd407a5c89121d6c33e2d61bfbb6099ab.tar.gz tde-7e80b57fd407a5c89121d6c33e2d61bfbb6099ab.zip | |
Disable the TQSocketNotifier<-->QSocketNotifier bridge and utilize
the builtin TQSocketNotifier code instead.
This fixes the DCOP server failure due to:
"tqsocketnotifiers are not being registered with the main tqeventloop (via TQApplication::eventLoop()->registerSocketNotifier( this )) (and for obvious reasons, they ***cannot*** be if the tqsocketnotifier<-->qsocketnotifier bridge is active)"
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp | 9 | ||||
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp index 9275de326..a9b394365 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp @@ -48,7 +48,12 @@ #include <sys/types.h> #endif -#ifdef USE_QT4 +#if 0 +//#ifdef USE_QT4 + +TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, const char *name ) : QSocketNotifier(socket, type, tqparent) { + setObjectName(name); +} #else // USE_QT4 @@ -267,4 +272,4 @@ bool TQSocketNotifier::event( TQEvent *e ) return FALSE; } -#endif // USE_QT4
\ No newline at end of file +#endif // USE_QT4 diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h index 404e9f76a..490447139 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h @@ -47,20 +47,22 @@ #include "tqobject.h" #endif // TQT_H -#ifdef USE_QT4 +#if 0 +//#ifdef USE_QT4 #include <Qt/qsocketnotifier.h> #endif // USE_QT4 -#ifdef USE_QT4 +#if 0 +//#ifdef USE_QT4 class TQ_EXPORT TQSocketNotifier : public QSocketNotifier { Q_OBJECT TQ_OBJECT public: - TQSocketNotifier( int socket, Type type, TQObject *tqparent=0, const char *name=0 ) : QSocketNotifier(socket, type, tqparent) { setObjectName(name); } + TQSocketNotifier( int socket, Type type, TQObject *tqparent=0, const char *name=0 ); }; #else // USE_QT4 |