TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


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

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/syncAction.h b/lib/syncAction.h
index f91ab3c..5f493f4 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -47,19 +47,20 @@ class TQTimer;
 class KPilotUser;
 class SyncAction;
 
-class KDE_EXPORT SyncAction : public QObject
+class KDE_EXPORT SyncAction : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SyncAction(KPilotLink *p,
 		const char *name=0L);
 	SyncAction(KPilotLink *p,
-		TQWidget *visibleparent,
+		TQWidget *visibletqparent,
 		const char *name=0L);
 	~SyncAction();
 
-	typedef enum { Error=-1 } Status;
+	typedef enum { Error=-1 } tqStatus;
 
 	/** A syncaction has a status, which can be expressed as an
 	*   integer. Subclasses are expected to define their own status
@@ -67,7 +68,7 @@ public:
 	*/
 	int status() const
 	{
-		return fActionStatus;
+		return fActiontqStatus;
 	}
 	/** Return a human-readable representation of the status. */
 	virtual TQString statusString() const;
@@ -155,7 +156,7 @@ public:
 protected:
 	/** Connection to the device. @todo make private. */
 	KPilotLink *fHandle;
-	int fActionStatus;
+	int fActiontqStatus;
 
 	/** Returns a pointer to the connection to the device. */
 	inline KPilotLink *deviceLink() const
@@ -184,7 +185,7 @@ public:
 	/**
 	* This class encapsulates the different sync modes that
 	* can be used, and enforces a little discipline in changing
-	* the mode and messing around in general. It tqreplaces a
+	* the mode and messing around in general. It replaces a
 	* simple enum by not much more, but it makes things like
 	* local test backups less likely to happen.
 	*
@@ -393,17 +394,17 @@ protected:
 	* @p timeout Timeout, in seconds.
 	*/
 	int questionYesNo(const TQString &question ,
-		const TQString &caption = TQString::null,
-		const TQString &key = TQString::null,
+		const TQString &caption = TQString(),
+		const TQString &key = TQString(),
 		unsigned timeout = 20,
-		const TQString &yes = TQString::null,
-		const TQString &no = TQString::null );
+		const TQString &yes = TQString(),
+		const TQString &no = TQString() );
 	int questionYesNoCancel(const TQString &question ,
-		const TQString &caption = TQString::null,
-		const TQString &key = TQString::null,
+		const TQString &caption = TQString(),
+		const TQString &key = TQString(),
 		unsigned timeout = 20,
-		const TQString &yes = TQString::null,
-		const TQString &no = TQString::null ) ;
+		const TQString &yes = TQString(),
+		const TQString &no = TQString() ) ;
 };