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, 5 insertions, 4 deletions

diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h
index f3429bb..7b50adc 100644
--- a/conduits/docconduit/doc-conduit.h
+++ b/conduits/docconduit/doc-conduit.h
@@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum {
 		eSyncDelete,
 		eSyncConflict
 	};
-typedef enum eTexStatus {
+typedef enum eTextqStatus {
 	eStatNone=0,
 	eStatNew=1,
 	eStatChanged=2,
@@ -55,6 +55,7 @@ TQString dirToString(eSyncDirectionEnum dir);
 
 class DOCConduit:public ConduitAction {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	eSyncDirectionEnum eSyncDirection;
 
@@ -138,14 +139,14 @@ public:
 		txtfilename=txtfn;
 		pdbfilename=pdbfn;
 		direction=dir;
-		fPCStatus=eStatNone;
-		fPalmStatus=eStatNone;
+		fPCtqStatus=eStatNone;
+		fPalmtqStatus=eStatNone;
 	};
 	~docSyncInfo(){};
 	TQString handheldDB, txtfilename, pdbfilename;
 	DBInfo dbinfo;
 	eSyncDirectionEnum direction;
-	eTexStatus fPCStatus, fPalmStatus;
+	eTextqStatus fPCtqStatus, fPalmtqStatus;
 };