Remove spurious TQ_OBJECT instances

69 files changed, 72 insertions, 72 deletions

diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h
index fb18c69a..c7418e36 100644
--- a/kopete/protocols/oscar/aim/aimaccount.h
+++ b/kopete/protocols/oscar/aim/aimaccount.h
@@ -53,7 +53,7 @@ class OscarVisibilityDialog;
 class AIMMyselfContact : public OscarMyselfContact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	AIMMyselfContact( AIMAccount *acct );
 	void userInfoUpdated();
@@ -84,7 +84,7 @@ private:
 class AIMAccount : public OscarAccount
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L);
diff --git a/kopete/protocols/oscar/aim/aimchatsession.h b/kopete/protocols/oscar/aim/aimchatsession.h
index 0634d02a..b4e78e3d 100644
--- a/kopete/protocols/oscar/aim/aimchatsession.h
+++ b/kopete/protocols/oscar/aim/aimchatsession.h
@@ -27,7 +27,7 @@ class Client;
 class AIMChatSession : public Kopete::ChatSession
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     AIMChatSession( const Kopete::Contact* contact, Kopete::ContactPtrList others,
                     Kopete::Protocol* protocol, Oscar::WORD exchange = 0,
diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h
index 37be084d..d66c62c6 100644
--- a/kopete/protocols/oscar/aim/aimcontact.h
+++ b/kopete/protocols/oscar/aim/aimcontact.h
@@ -35,7 +35,7 @@ class AIMUserInfoDialog;
 class AIMContact : public OscarContact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AIMContact( Kopete::Account*, const TQString&, Kopete::MetaContact*, 
diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h
index 13838fd1..828aab35 100644
--- a/kopete/protocols/oscar/aim/aimjoinchat.h
+++ b/kopete/protocols/oscar/aim/aimjoinchat.h
@@ -30,7 +30,7 @@ class AIMJoinChatBase;
 class AIMJoinChatUI : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	AIMJoinChatUI( AIMAccount*,  bool modal, TQWidget* parent = 0,
 	               const char* name = 0 );
diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h
index a1e03983..26d092b6 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.h
+++ b/kopete/protocols/oscar/aim/aimprotocol.h
@@ -40,7 +40,7 @@ public:
 class AIMProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AIMProtocol( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h
index da2c261c..d9e77fc5 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.h
+++ b/kopete/protocols/oscar/aim/aimuserinfo.h
@@ -30,7 +30,7 @@ class AIMAccount;
 class AIMUserInfoDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal,
 			TQWidget *parent, const char* name);
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
index c3cb1092..c3bcaa36 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
@@ -17,7 +17,7 @@ class MetaContact;
 class AIMAddContactPage : public AddContactPage
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AIMAddContactPage(bool connected, TQWidget *parent=0,
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
index dbf82adb..6ccaceb5 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
@@ -37,7 +37,7 @@ class aimEditAccountUI;
 class AIMEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account,
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index f3a62c73..19069529 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -34,7 +34,7 @@ class OscarVisibilityDialog;
 class ICQMyselfContact : public OscarMyselfContact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQMyselfContact( ICQAccount *acct );
 	void userInfoUpdated();
@@ -48,7 +48,7 @@ public slots:
 class ICQAccount : public OscarAccount
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ICQAccount( Kopete::Protocol *parent, TQString accountID, const char *name = 0L );
diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h
index 4c1d11e2..be8e064f 100644
--- a/kopete/protocols/oscar/icq/icqcontact.h
+++ b/kopete/protocols/oscar/icq/icqcontact.h
@@ -47,7 +47,7 @@ class ICQInterestInfoWidget;
 class ICQContact : public OscarContact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kopete/protocols/oscar/icq/icqprotocol.h b/kopete/protocols/oscar/icq/icqprotocol.h
index 7af69b84..2b3e7f4a 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.h
+++ b/kopete/protocols/oscar/icq/icqprotocol.h
@@ -38,7 +38,7 @@ public:
 class ICQProtocol : public Kopete::Protocol
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ICQProtocol(TQObject *parent, const char *name, const TQStringList &args);
diff --git a/kopete/protocols/oscar/icq/icqreadaway.h b/kopete/protocols/oscar/icq/icqreadaway.h
index a9a03c72..64a8c2f1 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.h
+++ b/kopete/protocols/oscar/icq/icqreadaway.h
@@ -28,7 +28,7 @@ class TQVBox;
 class ICQReadAway : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		ICQReadAway(ICQContact *, TQWidget *parent = 0, const char* name = "ICQReadAway");
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index 1a901a0e..cf77a99b 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -32,7 +32,7 @@ class ICQSearchDialog;
 class ICQAddContactPage : public AddContactPage
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
index de11a442..eaf7427c 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
@@ -29,7 +29,7 @@ class ICQAuthReplyUI;
 class ICQAuthReplyDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true);
 	~ICQAuthReplyDialog();
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
index 788cee4b..e3046702 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -31,7 +31,7 @@ class ICQEditAccountUI;
 class ICQEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	
 public:
 	ICQEditAccountWidget(ICQProtocol *, Kopete::Account *,
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
index e437ce63..6752d5e5 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -32,7 +32,7 @@ class ICQUserInfoWidget;
 class ICQSearchDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 );
 	~ICQSearchDialog();
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
index e8c5c54f..edafc223 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
@@ -32,7 +32,7 @@ class ICQContact;
 class ICQUserInfoWidget : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 );
 	void setContact( ICQContact* contact );
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h
index af907e6a..82850a47 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.h
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.h
@@ -26,7 +26,7 @@ using namespace Oscar;
 class AimLoginTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	AimLoginTask( Task* parent );
 	~AimLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h
index d19e0ab6..c3b7c4f9 100644
--- a/kopete/protocols/oscar/liboscar/buddyicontask.h
+++ b/kopete/protocols/oscar/liboscar/buddyicontask.h
@@ -28,7 +28,7 @@ class Transfer;
 class BuddyIconTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	BuddyIconTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h
index 9104bbce..e64ce68d 100644
--- a/kopete/protocols/oscar/liboscar/bytestream.h
+++ b/kopete/protocols/oscar/liboscar/bytestream.h
@@ -30,7 +30,7 @@
 class ByteStream : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
 	ByteStream(TQObject *parent=0);
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
index a36e2ab4..1b47dbf8 100644
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
@@ -30,7 +30,7 @@ class Transfer;
 class ChatNavServiceTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ChatNavServiceTask( Task* parent );
 	~ChatNavServiceTask();
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h
index 8cc09b9f..1b6d2ddf 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.h
@@ -28,7 +28,7 @@ class Transfer;
 class ChatServiceTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room );
     ~ChatServiceTask();
diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h
index b09be40e..71cf668a 100644
--- a/kopete/protocols/oscar/liboscar/client.h
+++ b/kopete/protocols/oscar/liboscar/client.h
@@ -50,7 +50,7 @@ class Settings;
 class KOPETE_EXPORT Client : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kopete/protocols/oscar/liboscar/connection.h b/kopete/protocols/oscar/liboscar/connection.h
index b840a597..9a3cd861 100644
--- a/kopete/protocols/oscar/liboscar/connection.h
+++ b/kopete/protocols/oscar/liboscar/connection.h
@@ -48,7 +48,7 @@ class Settings;
 class Connection : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
 	Connection( Connector* connector, ClientStream* cs, const char* name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h
index ee5d3e32..62b9a5a3 100644
--- a/kopete/protocols/oscar/liboscar/connector.h
+++ b/kopete/protocols/oscar/liboscar/connector.h
@@ -30,7 +30,7 @@ class ByteStream;
 class Connector : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Connector(TQObject *parent=0);
 	virtual ~Connector();
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.h b/kopete/protocols/oscar/liboscar/coreprotocol.h
index 807679ba..bf3cfeea 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.h
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.h
@@ -32,7 +32,7 @@ class Transfer;
 class CoreProtocol : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum State { NeedMore, Available, NoData, OutOfSync };
 
diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h
index 0771197a..9e5e3f75 100644
--- a/kopete/protocols/oscar/liboscar/flapprotocol.h
+++ b/kopete/protocols/oscar/liboscar/flapprotocol.h
@@ -28,7 +28,7 @@ class FlapTransfer;
 class FlapProtocol : public InputProtocolBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FlapProtocol( TQObject *parent = 0, const char *name = 0 );
 	~FlapProtocol();
diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h
index 3111608d..0d998c73 100644
--- a/kopete/protocols/oscar/liboscar/icqlogintask.h
+++ b/kopete/protocols/oscar/liboscar/icqlogintask.h
@@ -30,7 +30,7 @@ using namespace Oscar;
 class IcqLoginTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	IcqLoginTask( Task* parent );
 	~IcqLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/icqtask.h b/kopete/protocols/oscar/liboscar/icqtask.h
index 00ef13fb..71baf3af 100644
--- a/kopete/protocols/oscar/liboscar/icqtask.h
+++ b/kopete/protocols/oscar/liboscar/icqtask.h
@@ -28,7 +28,7 @@ class Buffer;
 class ICQTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQTask( Task* parent );
 	~ICQTask();
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h
index cd157f4d..4039dc91 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h
@@ -33,7 +33,7 @@ class Transfer;
 class ICQUserInfoRequestTask : public ICQTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICQUserInfoRequestTask( Task* parent );
 	~ICQUserInfoRequestTask();
diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
index 365927cc..badf788a 100644
--- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h
+++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
@@ -30,7 +30,7 @@ Defines a basic interface for protocols dealing with input from the GroupWise se
 class InputProtocolBase : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
 	InputProtocolBase(TQObject *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h
index c9bf27dc..3e1a21c5 100644
--- a/kopete/protocols/oscar/liboscar/logintask.h
+++ b/kopete/protocols/oscar/liboscar/logintask.h
@@ -44,7 +44,7 @@ class Transfer;
 class StageOneLoginTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	StageOneLoginTask( Task* parent );
 	~StageOneLoginTask();
@@ -104,7 +104,7 @@ class RateInfoTask;
 class StageTwoLoginTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	StageTwoLoginTask( Task* parent );
 	~StageTwoLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h
index c288a82d..30fe0b5b 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.h
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h
@@ -32,7 +32,7 @@ class TQTextCodec;
 class MessageReceiverTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 		
 	MessageReceiverTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.h b/kopete/protocols/oscar/liboscar/offlinemessagestask.h
index 87a7a9dc..42793be2 100644
--- a/kopete/protocols/oscar/liboscar/offlinemessagestask.h
+++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.h
@@ -30,7 +30,7 @@ ICQ Offline messages handling
 class OfflineMessagesTask : public ICQTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	OfflineMessagesTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
index 08730c70..da691c63 100644
--- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
+++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
@@ -35,7 +35,7 @@ Implements SNACS (0x03, 0x11) and (0x03, 0x12)
 class OnlineNotifierTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	OnlineNotifierTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h
index db5c3a3b..15346ff0 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.h
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h
@@ -35,7 +35,7 @@ class KNetworkByteStream : public ByteStream
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h
index 6d4f2026..f59063f4 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.h
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h
@@ -34,7 +34,7 @@ class TQHostAddress;
 class ClientStream : public Stream
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Error {
 		ErrConnection = ErrCustom,  // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h
index 3e72a8dc..f1045f34 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.h
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.h
@@ -37,7 +37,7 @@ class KNetworkConnector : public Connector
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KNetworkConnector( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
index c5c77d2f..75781c4d 100644
--- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
@@ -29,7 +29,7 @@ Request our user info from the server and handle our user info when it comes bac
 class OwnUserInfoTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	OwnUserInfoTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h
index d981dd83..a7d3f52c 100644
--- a/kopete/protocols/oscar/liboscar/rateclass.h
+++ b/kopete/protocols/oscar/liboscar/rateclass.h
@@ -37,7 +37,7 @@ class Transfer;
 class RateClass : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RateClass( TQObject* parent = 0 );
 	~RateClass();
diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h
index 14155029..6a5eef03 100644
--- a/kopete/protocols/oscar/liboscar/rateclassmanager.h
+++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h
@@ -34,7 +34,7 @@ class RateClassManagerPrivate;
 class RateClassManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RateClassManager( Connection* parent, const char* name = 0 );
 	~RateClassManager();
diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h
index 1ca3174f..ccbe1535 100644
--- a/kopete/protocols/oscar/liboscar/rateinfotask.h
+++ b/kopete/protocols/oscar/liboscar/rateinfotask.h
@@ -30,7 +30,7 @@ using namespace Oscar;
 class RateInfoTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RateInfoTask( Task* parent );
 	~RateInfoTask();
diff --git a/kopete/protocols/oscar/liboscar/safedelete.h b/kopete/protocols/oscar/liboscar/safedelete.h
index 88cfb3d4..33748953 100644
--- a/kopete/protocols/oscar/liboscar/safedelete.h
+++ b/kopete/protocols/oscar/liboscar/safedelete.h
@@ -60,7 +60,7 @@ private:
 class SafeDeleteLater : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	static SafeDeleteLater *ensureExists();
 	void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h
index b43fe195..3640b1ce 100644
--- a/kopete/protocols/oscar/liboscar/serverredirecttask.h
+++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h
@@ -32,7 +32,7 @@ class Transfer;
 class ServerRedirectTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ServerRedirectTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h
index ed7f0104..822911bd 100644
--- a/kopete/protocols/oscar/liboscar/serverversionstask.h
+++ b/kopete/protocols/oscar/liboscar/serverversionstask.h
@@ -31,7 +31,7 @@ class Transfer;
 class ServerVersionsTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ServerVersionsTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.h b/kopete/protocols/oscar/liboscar/servicesetuptask.h
index 513344ba..b935569d 100644
--- a/kopete/protocols/oscar/liboscar/servicesetuptask.h
+++ b/kopete/protocols/oscar/liboscar/servicesetuptask.h
@@ -38,7 +38,7 @@ Set up the various services for the BOS connection
 class ServiceSetupTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ServiceSetupTask( Task* parent );
 	~ServiceSetupTask();
diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h
index 04608487..d65b101e 100644
--- a/kopete/protocols/oscar/liboscar/snacprotocol.h
+++ b/kopete/protocols/oscar/liboscar/snacprotocol.h
@@ -28,7 +28,7 @@ class SnacTransfer;
 class SnacProtocol : public InputProtocolBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SnacProtocol( TQObject *parent = 0, const char *name = 0 );
 	~SnacProtocol();
diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h
index c5d8a351..4935dbe6 100644
--- a/kopete/protocols/oscar/liboscar/ssiauthtask.h
+++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h
@@ -29,7 +29,7 @@ class SSIManager;
 class SSIAuthTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SSIAuthTask( Task* parent );
 
diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.h b/kopete/protocols/oscar/liboscar/ssilisttask.h
index ac0ddfe5..4358cd9e 100644
--- a/kopete/protocols/oscar/liboscar/ssilisttask.h
+++ b/kopete/protocols/oscar/liboscar/ssilisttask.h
@@ -35,7 +35,7 @@ class SSIManager;
 class SSIListTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SSIListTask( Task* parent );
 	~SSIListTask();
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h
index 2d8d4fd1..89cdaa12 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.h
+++ b/kopete/protocols/oscar/liboscar/ssimanager.h
@@ -41,7 +41,7 @@ SSI management
 class KOPETE_EXPORT SSIManager : public TQObject
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SSIManager( TQObject* parent = 0, const char* name = 0 );
 
diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h
index 583fa5eb..919c7799 100644
--- a/kopete/protocols/oscar/liboscar/stream.h
+++ b/kopete/protocols/oscar/liboscar/stream.h
@@ -28,7 +28,7 @@ class Transfer;
 class Stream : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
 	enum StreamCond {
diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h
index 7aaba596..ccaa5d08 100644
--- a/kopete/protocols/oscar/liboscar/task.h
+++ b/kopete/protocols/oscar/liboscar/task.h
@@ -37,7 +37,7 @@ using namespace Oscar;
 class Task : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum { ErrDisc };
 	Task(Task *parent);
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
index 80c68446..7148eb11 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
@@ -24,7 +24,7 @@
 class ClientStreamTest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ClientStreamTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h
index c2149992..b5173e1a 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h
@@ -39,7 +39,7 @@
 class KUnitTest : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KUnitTest();
 
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.h b/kopete/protocols/oscar/liboscar/tests/logintest.h
index 661ae49d..4ba4f3cd 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.h
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.h
@@ -25,7 +25,7 @@
 class LoginTest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LoginTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
index e997b9db..b86abe41 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
@@ -25,7 +25,7 @@
 class LoginTest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LoginTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.h b/kopete/protocols/oscar/liboscar/tests/ssitest.h
index db7e8697..ff5b6ccf 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h
@@ -21,7 +21,7 @@
 class SSITest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SSITest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
index a17818e6..a32b7a46 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
@@ -25,7 +25,7 @@
 class LoginTest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LoginTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h
index 4940735f..d4982c83 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.h
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h
@@ -28,7 +28,7 @@
 class TypingNotifyTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum { Finished = 0x0000, Typed = 0x0001, Begin = 0x0002 };
 	
diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h
index 2b1baf82..b4fbc90a 100644
--- a/kopete/protocols/oscar/liboscar/userinfotask.h
+++ b/kopete/protocols/oscar/liboscar/userinfotask.h
@@ -33,7 +33,7 @@ Handles user information requests that are done via SNAC 02,05 and 02,06
 class UserInfoTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UserInfoTask( Task* parent );
 	~UserInfoTask();
diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h
index 6b187e84..cbbd2bea 100644
--- a/kopete/protocols/oscar/liboscar/usersearchtask.h
+++ b/kopete/protocols/oscar/liboscar/usersearchtask.h
@@ -31,7 +31,7 @@ Search for contacts
 class UserSearchTask : public ICQTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UserSearchTask( Task* parent );
 	
diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h
index 9287f697..760e9939 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.h
+++ b/kopete/protocols/oscar/liboscar/warningtask.h
@@ -29,7 +29,7 @@
 class WarningTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	WarningTask( Task* parent );
 	~WarningTask();
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index 22062d72..a3290506 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -42,7 +42,7 @@ class TQTextCodec;
 class KDE_EXPORT OscarAccount : public Kopete::PasswordedAccount
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L, bool isICQ=false);
diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h
index eae7d3e6..b115f7a1 100644
--- a/kopete/protocols/oscar/oscarcontact.h
+++ b/kopete/protocols/oscar/oscarcontact.h
@@ -60,7 +60,7 @@ class KToggleAction;
 class KDE_EXPORT OscarContact : public Kopete::Contact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	OscarContact( Kopete::Account* account, const TQString& name,
diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.h b/kopete/protocols/oscar/oscarencodingselectiondialog.h
index 65f36abc..beff9074 100644
--- a/kopete/protocols/oscar/oscarencodingselectiondialog.h
+++ b/kopete/protocols/oscar/oscarencodingselectiondialog.h
@@ -27,7 +27,7 @@ class OscarEncodingBaseUI;
 class KOPETE_EXPORT OscarEncodingSelectionDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     OscarEncodingSelectionDialog( TQWidget* parent = 0, int initialEncoding = 4);
     ~OscarEncodingSelectionDialog() {}
diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.h b/kopete/protocols/oscar/oscarlistnonservercontacts.h
index df4461d4..159b99f1 100644
--- a/kopete/protocols/oscar/oscarlistnonservercontacts.h
+++ b/kopete/protocols/oscar/oscarlistnonservercontacts.h
@@ -28,7 +28,7 @@ class TQStringList;
 class KOPETE_EXPORT OscarListNonServerContacts : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     OscarListNonServerContacts( TQWidget* parent );
     ~OscarListNonServerContacts();
diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h
index 922637e5..3434d3e3 100644
--- a/kopete/protocols/oscar/oscarmyselfcontact.h
+++ b/kopete/protocols/oscar/oscarmyselfcontact.h
@@ -37,7 +37,7 @@ class KToggleAction;
 class KDE_EXPORT OscarMyselfContact : public Kopete::Contact
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	OscarMyselfContact( OscarAccount* account );
diff --git a/kopete/protocols/oscar/oscarversionupdater.h b/kopete/protocols/oscar/oscarversionupdater.h
index 0bfbc4c4..117734c8 100644
--- a/kopete/protocols/oscar/oscarversionupdater.h
+++ b/kopete/protocols/oscar/oscarversionupdater.h
@@ -37,7 +37,7 @@ class TQDomDocument;
 class OscarVersionUpdater : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	
 public:
 	OscarVersionUpdater();
diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.h b/kopete/protocols/oscar/oscarvisibilitydialog.h
index 213e6941..a5583024 100644
--- a/kopete/protocols/oscar/oscarvisibilitydialog.h
+++ b/kopete/protocols/oscar/oscarvisibilitydialog.h
@@ -30,7 +30,7 @@ class Client;
 class KOPETE_EXPORT OscarVisibilityDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	typedef TQMap<TQString, TQString> ContactMap;