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/connection.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'kopete/protocols/oscar/liboscar/connection.h') diff --git a/kopete/protocols/oscar/liboscar/connection.h b/kopete/protocols/oscar/liboscar/connection.h index f2c1da75..b840a597 100644 --- a/kopete/protocols/oscar/liboscar/connection.h +++ b/kopete/protocols/oscar/liboscar/connection.h @@ -45,9 +45,10 @@ class Settings; * connection to an OSCAR server * @author Matt Rogers */ -class Connection : public QObject +class Connection : public TQObject { Q_OBJECT + TQ_OBJECT public: Connection( Connector* connector, ClientStream* cs, const char* name = 0 ); @@ -125,17 +126,17 @@ public: /** * Get the chat room name for this connection. - * @return the name of the room or TQString::null if not connected to a room + * @return the name of the room or TQString() if not connected to a room */ /** Get the user settings object */ Oscar::Settings* settings() const; /** Get the current FLAP sequence for this connection */ - Q_UINT16 flapSequence(); + TQ_UINT16 flapSequence(); /** Get the current SNAC sequence for this connection */ - Q_UINT32 snacSequence(); + TQ_UINT32 snacSequence(); /** Get the cookie for this connection */ TQByteArray cookie() const; -- cgit v1.2.1