Trinity Qt initial conversion

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

1 files changed, 17 insertions, 17 deletions

diff --git a/kpilot/lib/kpilotdevicelinkPrivate.h b/kpilot/lib/kpilotdevicelinkPrivate.h
index be2bbda35..d451e75c5 100644
--- a/kpilot/lib/kpilotdevicelinkPrivate.h
+++ b/kpilot/lib/kpilotdevicelinkPrivate.h
@@ -29,8 +29,8 @@
 
 #include <errno.h>
 
-#include <qstringlist.h>
-#include <qthread.h>
+#include <tqstringlist.h>
+#include <tqthread.h>
 
 #include "kpilotdevicelink.h"
 #include "options.h"
@@ -49,7 +49,7 @@ public:
 		return mThis;
 	}
 
-	bool canBind(const QString &device)
+	bool canBind(const TQString &device)
 	{
 		FUNCTIONSETUPL(5);
 		DEBUGKPILOT << fname << ": device: ["
@@ -59,7 +59,7 @@ public:
 		return !mBoundDevices.contains(device);
 	}
 
-	void bindDevice(const QString &device)
+	void bindDevice(const TQString &device)
 	{
 		FUNCTIONSETUPL(5);
 		DEBUGKPILOT << fname << ": device: ["
@@ -69,7 +69,7 @@ public:
 		showList();
 	}
 
-	void unbindDevice(const QString &device)
+	void unbindDevice(const TQString &device)
 	{
 		FUNCTIONSETUPL(5);
 		DEBUGKPILOT << fname << ": device: ["
@@ -88,7 +88,7 @@ protected:
 	{
 	}
 
-	QStringList mBoundDevices;
+	TQStringList mBoundDevices;
 	static DeviceMap *mThis;
 
 private:
@@ -173,13 +173,13 @@ protected:
 class DeviceCommEvent : public QEvent
 {
 public:
-	DeviceCommEvent(DeviceCustomEvents type, QString msg = QString::null,
+	DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString::null,
 			int progress = 0) :
-		QEvent( (QEvent::Type)type ), fMessage(msg), fProgress(progress),
+		TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress),
 				fPilotSocket(-1)
 	{
 	}
-	QString message() const
+	TQString message() const
 	{
 		return fMessage;
 	}
@@ -198,7 +198,7 @@ public:
 		return fPilotSocket;
 	}
 private:
-	QString fMessage;
+	TQString fMessage;
 	int fProgress;
 	/**
 	 * Pilot-link library handles for the device once it's opened.
@@ -211,7 +211,7 @@ private:
  Event thread (similar to Swing's AWT event dispatch thread).
  */
 
-class DeviceCommThread : public QObject, public QThread
+class DeviceCommThread : public TQObject, public QThread
 {
 friend class KPilotDeviceLink;
 
@@ -239,7 +239,7 @@ protected:
 	 * Does the low-level opening of the device and handles the
 	 * pilot-link library initialisation.
 	 */
-	bool open(const QString &device = QString::null);
+	bool open(const TQString &device = TQString::null);
 
 protected slots:
 	/**
@@ -277,7 +277,7 @@ private:
 			WARNINGKPILOT << "Link asked for, but either I'm "
 				<< "done or I don't have a valid handle.  "
 				<< "Shutting down comm thread." << endl;
-			QThread::exit();
+			TQThread::exit();
 			return 0;
 		}
 	}
@@ -285,12 +285,12 @@ private:
 	/**
 	 * Timers and Notifiers for detecting activity on the device.
 	 */
-	QTimer *fOpenTimer;
-	QSocketNotifier *fSocketNotifier;
+	TQTimer *fOpenTimer;
+	TQSocketNotifier *fSocketNotifier;
 	bool fSocketNotifierActive;
 
 	/** Timer used to check for a badly-connected Z31/72 */
-	QTimer *fWorkaroundUSBTimer;
+	TQTimer *fWorkaroundUSBTimer;
 	
 	/**
 	 * Pilot-link library handles for the device once it's opened.
@@ -298,7 +298,7 @@ private:
 	int fPilotSocket;
 	int fTempSocket;
 
-	inline QString errorMessage(int e)
+	inline TQString errorMessage(int e)
 	{
 		switch (e)
 		{