1 files changed, 20 insertions, 20 deletions

diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index 948456f2..c7646d91 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -27,9 +27,9 @@
 #include "connectiondialog.h"
 #include "xupdatescanner.h"
 #include <ksock.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qmutex.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqmutex.h>
 
 #define HAVE_PTHREADS
 #include "rfb.h"
@@ -89,17 +89,17 @@ public:
 
 class ClipboardEvent : public VNCEvent {
 	RFBController *controller;
-	QString text;
+	TQString text;
 public:
-	ClipboardEvent(RFBController *c, const QString &text);
+	ClipboardEvent(RFBController *c, const TQString &text);
 	virtual void exec();
 };
 
 class KNotifyEvent : public VNCEvent {
-	QString name;
-	QString desc;
+	TQString name;
+	TQString desc;
 public:
-	KNotifyEvent(const QString &n, const QString &d);
+	KNotifyEvent(const TQString &n, const TQString &d);
 	virtual ~KNotifyEvent();
 	virtual void exec();
 };
@@ -120,7 +120,7 @@ public:
  * set.
  * @author Tim Jansen
  */
-class RFBController : public QObject  {
+class RFBController : public TQObject  {
 	Q_OBJECT
 
 	friend class SessionEstablishedEvent;
@@ -139,7 +139,7 @@ public:
 	void handleKeyEvent(bool down, KeySym keySym);
 	void handlePointerEvent(int button_mask, int x, int y);
 	enum rfbNewClientAction handleNewClient(rfbClientPtr cl);
-	void clipboardToServer(const QString &text);
+	void clipboardToServer(const TQString &text);
 	void handleClientGone();
 	void handleNegotiationFinished(rfbClientPtr cl);
 	int getPort();
@@ -153,7 +153,7 @@ public slots:
 	void enableDesktopControl(bool c);
 
 signals:
-        void sessionEstablished(QString host);
+        void sessionEstablished(TQString host);
 	void sessionFinished();
 	void sessionRefused();
 	void quitApp();
@@ -161,35 +161,35 @@ signals:
 
 private:
 	void stopServer(bool xtestUngrab = true);
-	void sendKNotifyEvent(const QString &name, const QString &desc);
+	void sendKNotifyEvent(const TQString &name, const TQString &desc);
 	void sendSessionEstablished();
 	void disableBackground(bool state);
 
-	QString remoteIp;
+	TQString remoteIp;
 	volatile bool allowDesktopControl;
 
-	QTimer initIdleTimer;
-	QTimer idleTimer;
+	TQTimer initIdleTimer;
+	TQTimer idleTimer;
 
 	enum {
 		LAST_SYNC_TO_SERVER,
 		LAST_SYNC_TO_CLIENT
 	} lastClipboardDirection;
-	QString lastClipboardText;
+	TQString lastClipboardText;
 	QClipboard *clipboard;
 
 	Configuration *configuration;
 	XUpdateScanner *scanner;
 	ConnectionDialog dialog;
 
-	QString desktopName;
+	TQString desktopName;
 
 	rfbScreenInfoPtr server;
 
 	XImage *framebufferImage;
 
-	QMutex asyncMutex;
-	QPtrList<VNCEvent> asyncQueue;
+	TQMutex asyncMutex;
+	TQPtrList<VNCEvent> asyncQueue;
 
 	bool disableBackgroundPending; // background, as desired by libvncserver
 	bool disableBackgroundState; // real background state
@@ -208,7 +208,7 @@ private slots:
  * Class to call XTestDiscard at idle time (because otherwise
  * it will not work with QT)
  */
-class XTestDisabler : public QObject {
+class XTestDisabler : public TQObject {
 	Q_OBJECT
 public:
 	XTestDisabler();