diff --git a/qtmcop/qiomanager.cc b/qtmcop/qiomanager.cc index a6990cf..1853586 100644 --- a/qtmcop/qiomanager.cc +++ b/qtmcop/qiomanager.cc @@ -22,8 +22,8 @@ #include "qiomanager.h" #include "qiomanager_p.h" -#include -#include +#include +#include #include "debug.h" #include "dispatcher.h" #include "thread.h" @@ -66,11 +66,11 @@ static bool qioBlocking; * QIOWatch: */ QIOWatch::QIOWatch(int fd, int type, IONotify *notify, - QSocketNotifier::Type qtype, bool reentrant) + TQSocketNotifier::Type qtype, bool reentrant) : _fd(fd), _type(type), _client(notify), _reentrant(reentrant) { - qsocketnotify = new QSocketNotifier(fd,qtype,this); - connect(qsocketnotify,SIGNAL(activated(int)),this,SLOT(notify(int))); + qsocketnotify = new TQSocketNotifier(fd,qtype,this); + connect(qsocketnotify,TQT_SIGNAL(activated(int)),this,TQT_SLOT(notify(int))); } void QIOWatch::notify(int socket) @@ -84,8 +84,8 @@ void QIOWatch::notify(int socket) */ QTimeWatch::QTimeWatch(int milliseconds, TimeNotify *notify) { - timer = new QTimer(this); - connect( timer, SIGNAL(timeout()), this, SLOT(notify()) ); + timer = new TQTimer(this); + connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notify()) ); timer->start(milliseconds); _client = notify; } @@ -179,19 +179,19 @@ void QIOManager::watchFD(int fd, int types, IONotify *notify) if(types & IOType::read) { fdList.push_back( - new QIOWatch(fd, IOType::read, notify, QSocketNotifier::Read, r) + new QIOWatch(fd, IOType::read, notify, TQSocketNotifier::Read, r) ); } if(types & IOType::write) { fdList.push_back( - new QIOWatch(fd, IOType::write, notify, QSocketNotifier::Write, r) + new QIOWatch(fd, IOType::write, notify, TQSocketNotifier::Write, r) ); } if(types & IOType::except) { fdList.push_back( - new QIOWatch(fd, IOType::except, notify, QSocketNotifier::Exception, + new QIOWatch(fd, IOType::except, notify, TQSocketNotifier::Exception, r) ); } diff --git a/qtmcop/qiomanager.h b/qtmcop/qiomanager.h index 3eafe51..a1a8b20 100644 --- a/qtmcop/qiomanager.h +++ b/qtmcop/qiomanager.h @@ -30,9 +30,9 @@ #define QIOMANAGER_H #include "iomanager.h" -#include -#include -#include +#include +#include +#include #include #include "arts_export.h" diff --git a/qtmcop/qiomanager_p.h b/qtmcop/qiomanager_p.h index 8877b19..b4fea29 100644 --- a/qtmcop/qiomanager_p.h +++ b/qtmcop/qiomanager_p.h @@ -31,24 +31,24 @@ #define QIOMANAGER_P_H #include "iomanager.h" -#include -#include -#include +#include +#include +#include #include namespace Arts { -class QIOWatch : public QObject { +class QIOWatch : public TQObject { Q_OBJECT protected: - QSocketNotifier *qsocketnotify; + TQSocketNotifier *qsocketnotify; int _fd; int _type; IONotify *_client; bool _reentrant; public: - QIOWatch(int fd, int type, IONotify *notify, QSocketNotifier::Type qtype, + QIOWatch(int fd, int type, IONotify *notify, TQSocketNotifier::Type qtype, bool reentrant); inline IONotify *client() { return _client; } @@ -59,10 +59,10 @@ public slots: void notify(int socket); }; -class QTimeWatch : public QObject { +class QTimeWatch : public TQObject { Q_OBJECT protected: - QTimer *timer; + TQTimer *timer; TimeNotify *_client; public: QTimeWatch(int milliseconds, TimeNotify *notify);