TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 19 insertions, 15 deletions

diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h
index 7fc8792d..c0576b35 100644
--- a/kopete/protocols/gadu/gaducommands.h
+++ b/kopete/protocols/gadu/gaducommands.h
@@ -35,12 +35,13 @@ class TQSocketNotifier;
 class TQStringList;
 class TQPixmap;
 
-class GaduCommand : public QObject
+class GaduCommand : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	GaduCommand( TQObject* parent = 0, const char* name = 0 );
+	GaduCommand( TQObject* tqparent = 0, const char* name = 0 );
 	virtual ~GaduCommand();
 
 	virtual void execute() = 0;
@@ -52,7 +53,7 @@ signals:
 	void done( const TQString& title, const TQString& what );
 	void error( const TQString& title, const TQString& error );
 	void socketReady();
-	void operationStatus( const TQString );
+	void operationtqStatus( const TQString );
 
 protected:
 	void checkSocket( int, int );
@@ -73,11 +74,12 @@ private:
 class RegisterCommand : public GaduCommand
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	RegisterCommand( TQObject* parent = 0, const char* name = 0 );
+	RegisterCommand( TQObject* tqparent = 0, const char* name = 0 );
 	RegisterCommand( const TQString& email, const TQString& password ,
-					TQObject* parent = 0, const char* name = 0 );
+					TQObject* tqparent = 0, const char* name = 0 );
 	~RegisterCommand();
 
 	void setUserinfo( const TQString& email, const TQString& password, const TQString& token );
@@ -95,21 +97,22 @@ protected slots:
 private:
 	enum RegisterState{ RegisterStateNoToken, RegisterStateWaitingForToken, RegisterStateGotToken, RegisterStateWaitingForNumber, RegisterStateDone };
 	RegisterState	state;
-	QString			email_;
-	QString			password_;
+	TQString			email_;
+	TQString			password_;
 	struct gg_http*	session_;
 	int 			uin;
-	QString			tokenId;
-	QString			tokenString;
+	TQString			tokenId;
+	TQString			tokenString;
 };
 
 class RemindPasswordCommand : public GaduCommand
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	RemindPasswordCommand( uin_t uin, TQObject* parent = 0, const char* name = 0 );
-	RemindPasswordCommand( TQObject* parent = 0, const char* name = 0 );
+	RemindPasswordCommand( uin_t uin, TQObject* tqparent = 0, const char* name = 0 );
+	RemindPasswordCommand( TQObject* tqparent = 0, const char* name = 0 );
 	~RemindPasswordCommand();
 
 	void setUIN( uin_t );
@@ -126,9 +129,10 @@ private:
 class ChangePasswordCommand : public GaduCommand
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ChangePasswordCommand( TQObject* parent = 0, const char* name = 0 );
+	ChangePasswordCommand( TQObject* tqparent = 0, const char* name = 0 );
 	~ChangePasswordCommand();
 
 	void setInfo( uin_t uin, const TQString& passwd, const TQString& newpasswd,
@@ -140,9 +144,9 @@ protected slots:
 
 private:
 	struct gg_http*	session_;
-	QString			passwd_;
-	QString			newpasswd_;
-	QString			newemail_;
+	TQString			passwd_;
+	TQString			newpasswd_;
+	TQString			newemail_;
 	uin_t			uin_;
 };