summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/msncontact.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/msn/msncontact.h
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
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
Diffstat (limited to 'kopete/protocols/msn/msncontact.h')
-rw-r--r--kopete/protocols/msn/msncontact.h9
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;