summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-01 12:48:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-01 12:48:18 -0500
commitff009161ef57048e04e158645074f16e02a1d863 (patch)
tree89ab16e7d62f064943a0899761af9699047980e7 /tqtinterface/qt4/src
parent808772afcd13076cd2f5aae34ae90f563c55afe8 (diff)
downloadexperimental-ff009161ef57048e04e158645074f16e02a1d863.tar.gz
experimental-ff009161ef57048e04e158645074f16e02a1d863.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)"
Diffstat (limited to 'tqtinterface/qt4/src')
-rw-r--r--tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp9
-rw-r--r--tqtinterface/qt4/src/kernel/tqsocketnotifier.h8
2 files changed, 12 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp b/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp
index 9275de3..a9b3943 100644
--- a/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp
+++ b/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/tqtinterface/qt4/src/kernel/tqsocketnotifier.h b/tqtinterface/qt4/src/kernel/tqsocketnotifier.h
index 404e9f7..4904471 100644
--- a/tqtinterface/qt4/src/kernel/tqsocketnotifier.h
+++ b/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