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

diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 8326b499..7ab36fc0 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -44,9 +44,10 @@ namespace Kopete { class OnlineStatus; }
 class MSNContact : public Kopete::Contact
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent );
+	MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent );
 	~MSNContact();
 
 	/**
@@ -134,7 +135,7 @@ public slots:
 	virtual void slotUserInfo();
 	virtual void deleteContact();
 	virtual void sendFile( const KURL &sourceURL = KURL(),
-						   const TQString &fileName = TQString::null, uint fileSize = 0L );
+						   const TQString &fileName = TQString(), uint fileSize = 0L );
 
 	/**
 	 * Every time the kopete's contactlist is modified, we sync the serverlist with it
@@ -184,10 +185,10 @@ private:
 	TQString m_obj; //the MSNObject
 
 	/**
-	 * keep the current status here.  (it's normally already in Kopete::Contact::d->onlineStatus)
+	 * keep the current status here.  (it's normally already in Kopete::Contact::d->onlinetqStatus)
 	 * This is a workaround to prevent problems with the account offline status.
 	 */
-	Kopete::OnlineStatus m_currentStatus;
+	Kopete::OnlineStatus m_currenttqStatus;
 
 	//MSNProtocol::deserializeContact need to acess some contact insternals
 	friend class MSNProtocol;