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, 7 insertions, 6 deletions

diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index ae3744de..eb343541 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -48,10 +48,11 @@ class KopeteWinPopup;
 class WPAccount : public Kopete::Account
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 // Kopete::Account overloading
 public:
-	WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0);
+	WPAccount(WPProtocol *tqparent, const TQString& accountID, const char *name = 0);
 	~WPAccount();
 
 	virtual KActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
@@ -61,8 +62,8 @@ public slots:
 	virtual void connect(const Kopete::OnlineStatus &);						// Connect to server
 	virtual void disconnect();					// Disconnect from server
 
-	void goAvailable() { setAway(false, TQString::null); }		// Two convenience slots
-	void goAway() { setAway(true, TQString::null); }			// for available and away
+	void goAvailable() { setAway(false, TQString()); }		// Two convenience slots
+	void goAway() { setAway(true, TQString()); }			// for available and away
 
 // Stuff used internally & by colleague classes
 public:
@@ -88,10 +89,10 @@ public slots:
 	void slotGotNewMessage(const TQString &Body, const TQDateTime &Arrival, const TQString &From);
 
 	/* Reimplemented from Kopete::Account */
-	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString::null);
+	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
 
 protected:
-	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
+	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact);
 
 private slots:
 //	void updateAccountId();
@@ -104,4 +105,4 @@ private:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;