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/aim/aimaccount.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'kopete/protocols/oscar/aim/aimaccount.h') diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index 2df309b6..35c7adb5 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -53,6 +53,7 @@ class OscarVisibilityDialog; class AIMMyselfContact : public OscarMyselfContact { Q_OBJECT + TQ_OBJECT public: AIMMyselfContact( AIMAccount *acct ); void userInfoUpdated(); @@ -62,7 +63,7 @@ public: TQString lastAwayMessage() { return m_lastAwayMessage; }; virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate, - WORD exchange = 0, const TQString& room = TQString::null); + WORD exchange = 0, const TQString& room = TQString()); public slots: void sendMessage( Kopete::Message&, Kopete::ChatSession* session ); @@ -83,15 +84,16 @@ private: class AIMAccount : public OscarAccount { Q_OBJECT + TQ_OBJECT public: - AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L); + AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name=0L); virtual ~AIMAccount(); // Accessor method for the action menu virtual KActionMenu* actionMenu(); - void setAway(bool away, const TQString &awayReason = TQString::null ); + void setAway(bool away, const TQString &awayReason = TQString() ); virtual void connectWithPassword( const TQString &password ); @@ -101,7 +103,7 @@ public: public slots: /** Reimplementation from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString::null ); + void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString() ); void slotEditInfo(); void slotGoOnline(); @@ -131,7 +133,7 @@ protected: * Implement virtual method from OscarAccount * This allows OscarAccount to take care of adding new contacts */ - OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); + OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); TQString sanitizedMessage( const TQString& message ); -- cgit v1.2.1