Revert previous commit...some bugs crept in since last build test a week ago and I woul prefer to fix them over the next few days before commiting this patch set.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1155623 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 36 insertions, 36 deletions

diff --git a/qtmcop/qiomanager.cc b/qtmcop/qiomanager.cc
index 2b4608f..a6990cf 100644
--- a/qtmcop/qiomanager.cc
+++ b/qtmcop/qiomanager.cc
@@ -22,8 +22,8 @@
 
 #include "qiomanager.h"
 #include "qiomanager_p.h"
-#include <tqsocketnotifier.h>
-#include <tqapplication.h>
+#include <qsocketnotifier.h>
+#include <qapplication.h>
 #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,
-	TQSocketNotifier::Type qtype, bool reentrant)
+	QSocketNotifier::Type qtype, bool reentrant)
 	: _fd(fd), _type(type), _client(notify), _reentrant(reentrant)
 {
-	qsocketnotify = new TQSocketNotifier(fd,qtype,this);
-	connect(qsocketnotify,TQT_SIGNAL(activated(int)),this,TQT_SLOT(notify(int)));
+	qsocketnotify = new QSocketNotifier(fd,qtype,this);
+	connect(qsocketnotify,SIGNAL(activated(int)),this,SLOT(notify(int)));
 }
 
 void QIOWatch::notify(int socket)
@@ -80,17 +80,17 @@ void QIOWatch::notify(int socket)
 }
 
 /*
- * TQTimeWatch:
+ * QTimeWatch:
  */
-TQTimeWatch::TQTimeWatch(int milliseconds, TimeNotify *notify)
+QTimeWatch::QTimeWatch(int milliseconds, TimeNotify *notify)
 {
-	timer = new TQTimer(this);
-	connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notify()) );
+	timer = new QTimer(this);
+	connect( timer, SIGNAL(timeout()), this, SLOT(notify()) );
 	timer->start(milliseconds);
 	_client = notify;
 }
 
-void TQTimeWatch::notify()
+void QTimeWatch::notify()
 {
 	qioManager->dispatch(this);
 }
@@ -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, TQSocketNotifier::Read, r)
+			new QIOWatch(fd, IOType::read, notify, QSocketNotifier::Read, r)
 		);
 	}
 	if(types & IOType::write)
 	{
 		fdList.push_back(
-			new QIOWatch(fd, IOType::write, notify, TQSocketNotifier::Write, r)
+			new QIOWatch(fd, IOType::write, notify, QSocketNotifier::Write, r)
 		);
 	}
 	if(types & IOType::except)
 	{
 		fdList.push_back(
-			new QIOWatch(fd, IOType::except, notify, TQSocketNotifier::Exception,
+			new QIOWatch(fd, IOType::except, notify, QSocketNotifier::Exception,
 						 r)
 		);
 	}
@@ -228,17 +228,17 @@ void QIOManager::addTimer(int milliseconds, TimeNotify *notify)
 		notify = new HandleNotifications();
 		milliseconds = 0;
 	}
-	timeList.push_back(new TQTimeWatch(milliseconds,notify));
+	timeList.push_back(new QTimeWatch(milliseconds,notify));
 }
 
 void QIOManager::removeTimer(TimeNotify *notify)
 {
-	list<TQTimeWatch *>::iterator i;
+	list<QTimeWatch *>::iterator i;
 
 	i = timeList.begin();
 	while(i != timeList.end())
 	{
-		TQTimeWatch *w = *i;
+		QTimeWatch *w = *i;
 
 		if(w->client() == notify)
 		{
@@ -271,7 +271,7 @@ void QIOManager::dispatch(QIOWatch *ioWatch)
 	qioLevel--;
 }
 
-void QIOManager::dispatch(TQTimeWatch *timeWatch)
+void QIOManager::dispatch(QTimeWatch *timeWatch)
 {
 	qioLevel++;
 	if(qioLevel == 1)
diff --git a/qtmcop/qiomanager.h b/qtmcop/qiomanager.h
index 3ab488c..3eafe51 100644
--- a/qtmcop/qiomanager.h
+++ b/qtmcop/qiomanager.h
@@ -30,20 +30,20 @@
 #define QIOMANAGER_H
 
 #include "iomanager.h"
-#include <tqobject.h>
-#include <tqtimer.h>
-#include <tqsocketnotifier.h>
+#include <qobject.h>
+#include <qtimer.h>
+#include <qsocketnotifier.h>
 #include <list>
 #include "arts_export.h"
 
 namespace Arts {
 
 class QIOWatch;
-class TQTimeWatch;
+class QTimeWatch;
 
 /**
- * QIOManager performs MCOP I/O inside the TQt event loop. This way, you will
- * be able to receive requests and notifications inside TQt application. The
+ * QIOManager performs MCOP I/O inside the Qt event loop. This way, you will
+ * be able to receive requests and notifications inside Qt application. The
  * usual way to set it up is:
  *
  * <pre>
@@ -59,13 +59,13 @@ class TQTimeWatch;
 class ARTS_EXPORT QIOManager : public IOManager {
 protected:
 	friend class QIOWatch;
-	friend class TQTimeWatch;
+	friend class QTimeWatch;
 
 	std::list<QIOWatch *> fdList;
-	std::list<TQTimeWatch *> timeList;
+	std::list<QTimeWatch *> timeList;
 
 	void dispatch(QIOWatch *ioWatch);
-	void dispatch(TQTimeWatch *timeWatch);
+	void dispatch(QTimeWatch *timeWatch);
 
 public:
 	QIOManager();
diff --git a/qtmcop/qiomanager_p.h b/qtmcop/qiomanager_p.h
index 4024d5e..8877b19 100644
--- a/qtmcop/qiomanager_p.h
+++ b/qtmcop/qiomanager_p.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): QIOWatch, TQTimeWatch.
+ * BC - Status (2002-03-08): QIOWatch, QTimeWatch.
  *
  * These classes provide implementation details and not meant to be used
  * in any way.
@@ -31,24 +31,24 @@
 #define QIOMANAGER_P_H
 
 #include "iomanager.h"
-#include <tqobject.h>
-#include <tqtimer.h>
-#include <tqsocketnotifier.h>
+#include <qobject.h>
+#include <qtimer.h>
+#include <qsocketnotifier.h>
 #include <list>
 
 namespace Arts {
 
-class QIOWatch : public TQObject {
+class QIOWatch : public QObject {
 	Q_OBJECT
 protected:
-	TQSocketNotifier *qsocketnotify;
+	QSocketNotifier *qsocketnotify;
 	int _fd;
 	int _type;
 	IONotify *_client;
 	bool _reentrant;
 
 public:
-	QIOWatch(int fd, int type, IONotify *notify, TQSocketNotifier::Type qtype,
+	QIOWatch(int fd, int type, IONotify *notify, QSocketNotifier::Type qtype,
 				bool reentrant);
 
 	inline IONotify *client() { return _client; }
@@ -59,13 +59,13 @@ public slots:
 	void notify(int socket);
 };
 
-class TQTimeWatch : public TQObject {
+class QTimeWatch : public QObject {
 	Q_OBJECT
 protected:
-	TQTimer *timer;
+	QTimer *timer;
 	TimeNotify *_client;
 public:
-	TQTimeWatch(int milliseconds, TimeNotify *notify);
+	QTimeWatch(int milliseconds, TimeNotify *notify);
 
 	inline TimeNotify *client() { return _client; }
 public slots: