Remove spurious TQ_OBJECT instances

67 files changed, 73 insertions, 73 deletions

diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index ff6cca19..d7102e0b 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -57,7 +57,7 @@ using namespace GroupWise;
 class GroupWiseAccount : public Kopete::ManagedConnectionAccount
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 );
 	~GroupWiseAccount();
@@ -347,7 +347,7 @@ private:
 /*class OnlineStatusMessageAction : public KAction
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0);
   signals:
diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h
index 1dcbacdc..16e81389 100644
--- a/kopete/protocols/groupwise/gwbytestream.h
+++ b/kopete/protocols/groupwise/gwbytestream.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/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h
index 7f3ef3ac..f1bc0054 100644
--- a/kopete/protocols/groupwise/gwconnector.h
+++ b/kopete/protocols/groupwise/gwconnector.h
@@ -35,7 +35,7 @@ class KNetworkConnector : public Connector
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KNetworkConnector ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h
index 2e81823f..7de4a61d 100644
--- a/kopete/protocols/groupwise/gwcontact.h
+++ b/kopete/protocols/groupwise/gwcontact.h
@@ -53,7 +53,7 @@ using namespace GroupWise;
 class GroupWiseContact : public Kopete::Contact
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/** 
 	 * Constructor
diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h
index b70de5af..c0f42045 100644
--- a/kopete/protocols/groupwise/gwcontactlist.h
+++ b/kopete/protocols/groupwise/gwcontactlist.h
@@ -42,7 +42,7 @@ typedef TQValueList<GWContactInstance *> GWContactInstanceList;
 class GWContactList : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GWContactList( TQObject * parent );
 	GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName );
@@ -61,7 +61,7 @@ public:
 class GWContactListItem : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName );
 
@@ -73,7 +73,7 @@ public:
 class GWFolder : public GWContactListItem
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GWFolder( TQObject * parent, unsigned int theId,  unsigned int theSequence, const TQString & theDisplayName );
 	virtual void dump( unsigned int depth );
@@ -82,7 +82,7 @@ public:
 class GWContactInstance : public GWContactListItem
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn );
 	TQString dn;				// DN
diff --git a/kopete/protocols/groupwise/gwmessagemanager.h b/kopete/protocols/groupwise/gwmessagemanager.h
index 7c0d3d2c..25f61b9a 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.h
+++ b/kopete/protocols/groupwise/gwmessagemanager.h
@@ -35,7 +35,7 @@ using namespace GroupWise;
 class GroupWiseChatSession : public Kopete::ChatSession
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class GroupWiseAccount;
 
diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h
index 95105f17..cc1b34fb 100644
--- a/kopete/protocols/groupwise/gwprotocol.h
+++ b/kopete/protocols/groupwise/gwprotocol.h
@@ -34,7 +34,7 @@
 class GroupWiseProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args);
     ~GroupWiseProtocol();
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h
index b72fad78..0ffab15b 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
index 2cb73cbf..97521bf1 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
@@ -32,7 +32,7 @@ class Client;
 class ChatroomManager : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ChatroomManager( Client * client, const char *name = 0);
 		~ChatroomManager();
diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 542d32eb..d302bf0e 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -39,7 +39,7 @@ using namespace GroupWise;
 class Client : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h
index 7654f7f0..15c58676 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.h
+++ b/kopete/protocols/groupwise/libgroupwise/connector.h
@@ -29,7 +29,7 @@ class ByteStream;
 class Connector : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Connector(TQObject *parent=0);
 	virtual ~Connector();
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index d1b2486c..14d94997 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -115,7 +115,7 @@ class Transfer;
 class CoreProtocol : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum State { NeedMore, Available, NoData };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 49d1d9dd..62903611 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -109,7 +109,7 @@ class EventTransfer;
 class EventProtocol : public InputProtocolBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     EventProtocol(TQObject *parent = 0, const char *name = 0);
     ~EventProtocol();
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index 8e2394c3..5585104a 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -40,7 +40,7 @@ typedef struct NovellDN
 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/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
index 152ac0f1..69e104de 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
+++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/privacymanager.h b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
index 3d1e29f3..4e798fb1 100644
--- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
@@ -32,7 +32,7 @@ Keeps a record of the server side privacy allow and deny lists, default policy a
 class PrivacyManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PrivacyManager( Client * client, const char *name = 0);
 	~PrivacyManager();
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index 79b028bf..4c27f047 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -314,7 +314,7 @@ namespace QCA
 	class QCA_EXPORT TLS : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum Validity {
 			NoCert,
@@ -376,7 +376,7 @@ namespace QCA
 	class QCA_EXPORT SASL : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum Error { ErrAuth, ErrCrypt };
 		enum ErrorCond {
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
index 65c89f55..129591d1 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -28,7 +28,7 @@ class QCA::TLS;
 class QCATLSHandler : public TLSHandler
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	QCATLSHandler(QCA::TLS *parent);
 	~QCATLSHandler();
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
index 1a9c1b94..61e928a2 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
@@ -32,7 +32,7 @@ Handles the parsing of incoming Response messages
 class ResponseProtocol : public InputProtocolBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Describes the current state of the protocol
diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h
index 88cfb3d4..33748953 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.h
+++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index f0c6223e..fa0f5f14 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -34,7 +34,7 @@
 class SecureStream : public ByteStream
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Error { ErrTLS = ErrCustom, ErrSASL };
 	SecureStream(ByteStream *s);
@@ -104,7 +104,7 @@ USE_TLSHANDLER
 class SecureLayer : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SecureLayer(QCA::TLS *t);
 	SecureLayer(QCA::SASL *s);
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h
index e07b5e49..95f27060 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.h
+++ b/kopete/protocols/groupwise/libgroupwise/stream.h
@@ -31,7 +31,7 @@
 class Stream : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
 	enum StreamCond {
diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h
index 223e7243..2b6bd155 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.h
+++ b/kopete/protocols/groupwise/libgroupwise/task.h
@@ -32,7 +32,7 @@ class Request;
 class Task : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum { ErrDisc };
 	Task(Task *parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
index 65edb07e..74efc267 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
@@ -34,7 +34,7 @@ Get the current number of users in each chat on the server
 class ChatCountsTask : public RequestTask
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ChatCountsTask(Task* parent);
 		~ChatCountsTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
index e8b05c99..76bc1c24 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
@@ -35,7 +35,7 @@ Get the current number of users in each chat on the server
 class ChatPropertiesTask : public RequestTask
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ChatPropertiesTask(Task* parent);
 		~ChatPropertiesTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index 64b9f111..a64bd452 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -36,7 +36,7 @@ using namespace GroupWise;
 class ConferenceTask : public EventTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ConferenceTask( Task* parent );
 	~ConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index 0bbc2625..6d8a1a40 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -31,7 +31,7 @@ This task monitors connection related events, currently 'connected elsewhere' di
 class ConnectionTask : public EventTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ConnectionTask(Task* parent);
 	~ConnectionTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index 69911dac..630050b4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -31,7 +31,7 @@ This task is responsible for creating a conference at the server, and confirming
 class CreateConferenceTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CreateConferenceTask(Task* parent);
 	~CreateConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index fc7bb184..879e4ecf 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -31,7 +31,7 @@ Creates a contact on the server.  The response to this action is handled by its
 class CreateContactInstanceTask : public NeedFolderTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CreateContactInstanceTask(Task* parent);
 	~CreateContactInstanceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index f63a19af..7323aea3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -42,7 +42,7 @@ using namespace GroupWise;
 class CreateContactTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CreateContactTask(Task* parent);
 	~CreateContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
index 37dbc19f..c9e1c939 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
@@ -31,7 +31,7 @@ Creates a folder on the server
 class CreateFolderTask : public ModifyContactListTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CreateFolderTask(Task* parent);
 	~CreateFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
index ce2e3bd0..7141ba37 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
@@ -29,7 +29,7 @@
 class DeleteItemTask : public ModifyContactListTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DeleteItemTask(Task* parent);
 	~DeleteItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
index 15ed1761..4dec0f9c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
@@ -31,7 +31,7 @@ class Transfer;
 class EventTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		EventTask( Task *parent );
 	protected:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index 5671a122..60a68e1d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -35,7 +35,7 @@ Search results are polled on the server, using the search handle returned by the
 class GetChatSearchResultsTask : public RequestTask
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 };
 		GetChatSearchResultsTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index 577ccc45..0f58d72a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -34,7 +34,7 @@ using namespace GroupWise;
 class GetDetailsTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GetDetailsTask( Task * parent );
 	~GetDetailsTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index aec5050f..ea3d5dbb 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -30,7 +30,7 @@
 class GetStatusTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GetStatusTask(Task* parent);
 	~GetStatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
index 36b14d28..95279bed 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
@@ -34,7 +34,7 @@ Sends Join Conference messages when the user accepts an invitation
 class JoinChatTask : public RequestTask
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		JoinChatTask(Task* parent);
 		~JoinChatTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index 0f92379f..e8b06c82 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -34,7 +34,7 @@ Sends Join Conference messages when the user accepts an invitation
 class JoinConferenceTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	JoinConferenceTask(Task* parent);
 	~JoinConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
index b9d9272c..176b4e07 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
@@ -29,7 +29,7 @@
 class KeepAliveTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KeepAliveTask(Task* parent);
 	~KeepAliveTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
index 30d9e293..73c2061d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
@@ -31,7 +31,7 @@ Tells the server that you are leaving a conference (closed the chatwindow)
 class LeaveConferenceTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LeaveConferenceTask(Task* parent);
 	~LeaveConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index fdeaeb9d..ecb5c0e1 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -31,7 +31,7 @@ using namespace GroupWise;
 class LoginTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LoginTask( Task * parent );
 	~LoginTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index b0787ce0..aebfd7e6 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -34,7 +34,7 @@ using namespace GroupWise;
 class ModifyContactListTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ModifyContactListTask(Task* parent);
 	~ModifyContactListTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
index b67a23ac..4f49148c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
@@ -31,7 +31,7 @@ Moves a contact between folders on the server
 class MoveContactTask : public NeedFolderTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MoveContactTask(Task* parent);
 	~MoveContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
index 383be314..c204c602 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
@@ -22,7 +22,7 @@ This Task is the ancestor of Tasks that may need to create a folder on the serve
 class NeedFolderTask : public ModifyContactListTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	NeedFolderTask(Task* parent);
 	~NeedFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index c69b7e0c..20380df0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -35,7 +35,7 @@ Search results are polled on the server, using the search handle supplied by the
 class PollSearchResultsTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 };
 	PollSearchResultsTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
index ea0d5e42..8d9c97c9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
@@ -31,7 +31,7 @@ Adds a contact to the server side allow or deny lists
 class PrivacyItemTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PrivacyItemTask( Task* parent);
 	~PrivacyItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
index b4903596..bf7f8f84 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
@@ -31,7 +31,7 @@ Used to reject an invitation to join a conference
 class RejectInviteTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RejectInviteTask(Task* parent);
 	~RejectInviteTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
index 10f6568c..a2cd8fc2 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
@@ -28,7 +28,7 @@ class Transfer;
 class RequestTask : public Task
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RequestTask( Task *parent );
 		bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index aa87e474..15fe12b7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -35,7 +35,7 @@ This Task searches for chatrooms on the server
 class SearchChatTask : public RequestTask
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum SearchType { FetchAll=0, SinceLastSearch };
 		
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index 1fa398d6..390edad8 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -33,7 +33,7 @@ This Task performs user searching on the server
 class SearchUserTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SearchUserTask(Task* parent);
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 4a7a753d..fa3afbc5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -30,7 +30,7 @@
 class SetStatusTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SetStatusTask(Task* parent);
 	~SetStatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index cc14bace..c4ddc744 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -29,7 +29,7 @@
 class StatusTask : public EventTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	StatusTask(Task* parent);
 	~StatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
index 7fc63f90..fb01a6b3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
@@ -31,7 +31,7 @@
 class TypingTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	TypingTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
index 17dad6e7..d84cecdd 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
@@ -32,7 +32,7 @@
 class UpdateContactTask : public UpdateItemTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UpdateContactTask(Task* parent);
 	~UpdateContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
index 1f3dcd07..435ce2f5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
@@ -31,7 +31,7 @@ Renames a folder on the server
 class UpdateFolderTask : public UpdateItemTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UpdateFolderTask(Task* parent);
 	~UpdateFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
index 4e0bea2d..3d950745 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
@@ -31,7 +31,7 @@ Rename a folder or contact on the server.  In future may be used for changing th
 class UpdateItemTask : public RequestTask
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UpdateItemTask( Task* parent );
 	~UpdateItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index a40f337c..33370a5d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -32,7 +32,7 @@
 class ClientStreamTest : public TQApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ClientStreamTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
index 8a964101..44772293 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
@@ -31,7 +31,7 @@
 class TLSHandler : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	TLSHandler(TQObject *parent=0);
 	virtual ~TLSHandler();
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
index 4f4c8df9..b81b7ce8 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
@@ -34,7 +34,7 @@ Several client event handling processes require that a contact's details are ava
 class UserDetailsManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	UserDetailsManager( Client * parent, const char *name = 0);
 	~UserDetailsManager();
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
index 8597a7ec..11aa1094 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
@@ -41,7 +41,7 @@ class GroupWiseContactSearch;
 class GroupWiseAddContactPage : public AddContactPage
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
     GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 );
     ~GroupWiseAddContactPage();
diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
index b3ecc6f3..18419180 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
@@ -41,7 +41,7 @@ class GroupWiseChatPropsWidget;
 class GroupWiseChatPropsDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/**
 		 * Construct an empty dialog
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
index a063284a..c0264b62 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
@@ -29,7 +29,7 @@ class GroupWiseChatSearchWidget;
 class GroupWiseChatSearchDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
 		~GroupWiseChatSearchDialog();
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h
index afb0cd62..213834bc 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.h
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h
@@ -35,7 +35,7 @@ Logic, wrapping UI, for displaying contact properties
 class GroupWiseContactProperties : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Display properties given a GroupWiseContact
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
index 9c21f7fd..ccdf890b 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
@@ -36,7 +36,7 @@ class GroupWiseAccountPreferences;
 class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account);
 
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h
index 57bb6e83..3ac2ae39 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.h
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h
@@ -34,7 +34,7 @@ Logic for the UI part managing the allow and deny lists, and the default privacy
 class GroupWisePrivacyDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
 	~GroupWisePrivacyDialog();
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
index 688071fd..42be43ab 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
@@ -31,7 +31,7 @@ This is the dialog that is shown when you receive an invitation to chat.
 class ReceiveInvitationDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name );
 	~ReceiveInvitationDialog();
diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h
index c4e11364..7f215aaa 100644
--- a/kopete/protocols/groupwise/ui/gwsearch.h
+++ b/kopete/protocols/groupwise/ui/gwsearch.h
@@ -33,7 +33,7 @@ Logic for searching for and displaying users and chat rooms using a GroupWiseCon
 class GroupWiseContactSearch : public GroupWiseContactSearchWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, 
 			TQWidget *parent = 0, const char *name = 0);