From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- kopete/protocols/oscar/liboscar/client.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'kopete/protocols/oscar/liboscar/client.h') diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index 78597746..5e9cc61b 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -47,9 +47,10 @@ namespace Oscar class Settings; } -class KOPETE_EXPORT Client : public QObject +class KOPETE_EXPORT Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -67,14 +68,14 @@ public: FatalProtocolError = 3 }; - enum AIMStatus { Online = 0, Away }; - enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; + enum AIMtqStatus { Online = 0, Away }; + enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; /************* EXTERNAL API *************/ - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); /** @@ -102,9 +103,9 @@ public: /** Logout and disconnect */ void close(); /** Set our status for AIM */ - void setStatus( AIMStatus status, const TQString &message = TQString::null ); + void settqStatus( AIMtqStatus status, const TQString &message = TQString() ); /** Set our status for ICQ */ - void setStatus( DWORD status, const TQString &message = TQString::null ); + void settqStatus( DWORD status, const TQString &message = TQString() ); /** Retrieve our user info */ UserDetails ourInfo() const; @@ -255,7 +256,7 @@ public: * Add the icq away message request to queue * \param contact the contact to get info for */ - void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ); + void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ); /** * Remove the icq away message request from queue @@ -280,7 +281,7 @@ public: //! Start a server redirect for a different service void requestServerRedirect( WORD family, WORD e = 0, TQByteArray c = TQByteArray(), - WORD instance = 0, const TQString& room = TQString::null ); + WORD instance = 0, const TQString& room = TQString() ); //! Start uploading a buddy icon void sendBuddyIcon( const TQByteArray& imageData ); @@ -411,7 +412,7 @@ signals: void receivedUserInfo( const TQString& contact, const UserDetails& details ); /** We warned a user */ - void userWarned( const TQString& contact, Q_UINT16 increase, Q_UINT16 newLevel ); + void userWarned( const TQString& contact, TQ_UINT16 increase, TQ_UINT16 newLevel ); /** Search signals */ void gotSearchResults( const ICQSearchResult& ); @@ -462,7 +463,7 @@ protected slots: void receivedIcqInfo( const TQString& contact, unsigned int type ); /** we have normal user info for a contact */ - void receivedInfo( Q_UINT16 sequence ); + void receivedInfo( TQ_UINT16 sequence ); /** received a message of some kind */ void receivedMessage( const Oscar::Message& msg ); @@ -504,7 +505,7 @@ private: * \param contact the contact to get info for */ //TODO only made a default for testing w/o frontend - void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway ); + void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway ); private: class ClientPrivate; -- cgit v1.2.1