Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 112 insertions, 112 deletions

diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index fbb3462a..cc906447 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -29,7 +29,7 @@
 #include "testbedprotocol.h"
 
 
-TestbedAccount::TestbedAccount( TestbedProtocol *parent, const QString& accountID, const char *name )
+TestbedAccount::TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name )
 : Kopete::Account ( parent, accountID , name )
 {
 	// Init the myself contact
@@ -51,20 +51,20 @@ KActionMenu* TestbedAccount::actionMenu()
 
 	KAction *action;
 	
-	action = new KAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, SLOT (slotShowVideo ()), this, "actionShowVideo");
+	action = new KAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo");
 	mActionMenu->insert(action);
 	action->setEnabled( isConnected() );
 
 	return mActionMenu;
 }
 
-bool TestbedAccount::createContact(const QString& contactId, Kopete::MetaContact* parentContact)
+bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact)
 {
 	TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact );
 	return newContact != 0L;
 }
 
-void TestbedAccount::setAway( bool away, const QString & /* reason */ )
+void TestbedAccount::setAway( bool away, const TQString & /* reason */ )
 {
 	if ( away )
 		slotGoAway();
@@ -72,7 +72,7 @@ void TestbedAccount::setAway( bool away, const QString & /* reason */ )
 		slotGoOnline();
 }
 
-void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const QString &reason )
+void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const TQString &reason )
 {
 	if ( status.status() == Kopete::OnlineStatus::Online &&
 			myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
@@ -90,15 +90,15 @@ void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ )
 {
 	kdDebug ( 14210 ) << k_funcinfo << endl;
 	myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
-	QObject::connect ( m_server, SIGNAL ( messageReceived( const QString & ) ),
-			this, SLOT ( receivedMessage( const QString & ) ) );
+	TQObject::connect ( m_server, TQT_SIGNAL ( messageReceived( const TQString & ) ),
+			this, TQT_SLOT ( receivedMessage( const TQString & ) ) );
 }
 
 void TestbedAccount::disconnect()
 {
 	kdDebug ( 14210 ) << k_funcinfo << endl;
 	myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOffline );
-	QObject::disconnect ( m_server, 0, 0, 0 );
+	TQObject::disconnect ( m_server, 0, 0, 0 );
 }
 
 TestbedFakeServer * TestbedAccount::server()
@@ -147,10 +147,10 @@ void TestbedAccount::slotShowVideo ()
 	updateContactStatus();
 }
 
-void TestbedAccount::receivedMessage( const QString &message )
+void TestbedAccount::receivedMessage( const TQString &message )
 {
 	// Look up the contact the message is from
-	QString from;
+	TQString from;
 	TestbedContact* messageSender;
 
 	from = message.section( ':', 0, 0 );
@@ -167,7 +167,7 @@ void TestbedAccount::receivedMessage( const QString &message )
 
 void TestbedAccount::updateContactStatus()
 {
-	QDictIterator<Kopete::Contact> itr( contacts() );
+	TQDictIterator<Kopete::Contact> itr( contacts() );
 	for ( ; itr.current(); ++itr )
 		itr.current()->setOnlineStatus( myself()->onlineStatus() );
 }
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index 34429300..52261cb7 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -36,7 +36,7 @@ class TestbedAccount : public Kopete::Account
 {
 	Q_OBJECT
 public:
-	TestbedAccount( TestbedProtocol *parent, const QString& accountID, const char *name = 0 );
+	TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name = 0 );
 	~TestbedAccount();
 	/**
 	 * Construct the context menu used for the status bar icon
@@ -47,15 +47,15 @@ public:
 	 * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
 	 * Kopete::MetaContact
 	 */
-	virtual bool createContact(const QString& contactId, Kopete::MetaContact* parentContact);
+	virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact);
 	/**
 	 * Called when Kopete is set globally away
 	 */
-	virtual void setAway(bool away, const QString& reason);
+	virtual void setAway(bool away, const TQString& reason);
 	/**
 	 * Called when Kopete status is changed globally
 	 */
-	virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const QString &reason = QString::null);
+	virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const TQString &reason = TQString::null);
 	/**
 	 * 'Connect' to the testbed server.  Only sets myself() online.
 	 */
@@ -73,7 +73,7 @@ public slots:
 	 * Called by the server when it has a message for us.
 	 * This identifies the sending Kopete::Contact and passes it a Kopete::Message
 	 */
-	void receivedMessage( const QString &message );
+	void receivedMessage( const TQString &message );
 
 protected:
 	/**
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp
index 5327b5b4..bb016453 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.cpp
+++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp
@@ -16,9 +16,9 @@
 
 #include "testbedaddcontactpage.h"
 
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qlineedit.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqlineedit.h>
 #include <kdebug.h>
 
 #include "kopeteaccount.h"
@@ -26,11 +26,11 @@
 
 #include "testbedaddui.h"
 
-TestbedAddContactPage::TestbedAddContactPage( QWidget* parent, const char* name )
+TestbedAddContactPage::TestbedAddContactPage( TQWidget* parent, const char* name )
 		: AddContactPage(parent, name)
 {
 	kdDebug(14210) << k_funcinfo << endl;
-	( new QVBoxLayout( this ) )->setAutoAdd( true );
+	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	m_testbedAddUI = new TestbedAddUI( this );
 }
 
@@ -43,12 +43,12 @@ bool TestbedAddContactPage::apply( Kopete::Account* a, Kopete::MetaContact* m )
     if ( validateData() )
 	{
 		bool ok = false;
-		QString type;
-		QString name;
+		TQString type;
+		TQString name;
 		if ( m_testbedAddUI->m_rbEcho->isOn() )
 		{
 			type = m_testbedAddUI->m_uniqueName->text();
-			name = QString::fromLatin1( "Echo Contact" );
+			name = TQString::fromLatin1( "Echo Contact" );
 			ok = true;
 		}
 		if ( ok )
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.h b/kopete/protocols/testbed/testbedaddcontactpage.h
index fd7642f3..f430f559 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.h
+++ b/kopete/protocols/testbed/testbedaddcontactpage.h
@@ -31,7 +31,7 @@ class TestbedAddContactPage : public AddContactPage
 {
 	Q_OBJECT
 public:
-    TestbedAddContactPage( QWidget* parent = 0, const char* name = 0 );
+    TestbedAddContactPage( TQWidget* parent = 0, const char* name = 0 );
     ~TestbedAddContactPage();
 	
     /**
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index b5fc1c2c..bf110872 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -28,8 +28,8 @@
 #include "testbedfakeserver.h"
 #include "testbedprotocol.h"
 
-TestbedContact::TestbedContact( Kopete::Account* _account, const QString &uniqueName,
-		const TestbedContactType type, const QString &displayName, Kopete::MetaContact *parent )
+TestbedContact::TestbedContact( Kopete::Account* _account, const TQString &uniqueName,
+		const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *parent )
 : Kopete::Contact( _account, uniqueName, parent )
 {
 	kdDebug( 14210 ) << k_funcinfo << " uniqueName: " << uniqueName << ", displayName: " << displayName << endl;
@@ -49,9 +49,9 @@ bool TestbedContact::isReachable()
     return true;
 }
 
-void TestbedContact::serialize( QMap< QString, QString > &serializedData, QMap< QString, QString > & /* addressBookData */ )
+void TestbedContact::serialize( TQMap< TQString, TQString > &serializedData, TQMap< TQString, TQString > & /* addressBookData */ )
 {
-    QString value;
+    TQString value;
 	switch ( m_type )
 	{
 	case Null:
@@ -71,23 +71,23 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags )
 	}
 	else
 	{
-		QPtrList<Kopete::Contact> contacts;
+		TQPtrList<Kopete::Contact> contacts;
 		contacts.append(this);
 		m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol());
-		connect(m_msgManager, SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
-				this, SLOT( sendMessage( Kopete::Message& ) ) );
-		connect(m_msgManager, SIGNAL(destroyed()), this, SLOT(slotChatSessionDestroyed()));
+		connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
+				this, TQT_SLOT( sendMessage( Kopete::Message& ) ) );
+		connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed()));
 		return m_msgManager;
 	}
 }
 
 
-QPtrList<KAction> *TestbedContact::customContextMenuActions() //OBSOLETE
+TQPtrList<KAction> *TestbedContact::customContextMenuActions() //OBSOLETE
 {
 	//FIXME!!!  this function is obsolete, we should use XMLGUI instead
 	/*m_actionCollection = new KActionCollection( this, "userColl" );
 	m_actionPrefs = new KAction(i18n( "&Contact Settings" ), 0, this,
-			SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
+			TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
 
 	return m_actionCollection;*/
 	return 0L;
@@ -114,7 +114,7 @@ void TestbedContact::sendMessage( Kopete::Message &message )
 	manager()->messageSucceeded();
 }
 
-void TestbedContact::receivedMessage( const QString &message )
+void TestbedContact::receivedMessage( const TQString &message )
 {
 	// Create a Kopete::Message
 	Kopete::Message *newMessage;
diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h
index 7f7c168a..f6efa7ee 100644
--- a/kopete/protocols/testbed/testbedcontact.h
+++ b/kopete/protocols/testbed/testbedcontact.h
@@ -17,7 +17,7 @@
 #ifndef TESTBEDCONTACT_H
 #define TESTBEDCONTACT_H
 
-#include <qmap.h>
+#include <tqmap.h>
 #include "kopetecontact.h"
 #include "kopetemessage.h"
 
@@ -39,8 +39,8 @@ public:
 	 */
 	enum TestbedContactType { Null, Echo };
 
-	TestbedContact( Kopete::Account* _account, const QString &uniqueName, 
-			const TestbedContact::TestbedContactType type, const QString &displayName, 
+	TestbedContact( Kopete::Account* _account, const TQString &uniqueName, 
+			const TestbedContact::TestbedContactType type, const TQString &displayName, 
 			Kopete::MetaContact *parent );
 
     ~TestbedContact();
@@ -50,12 +50,12 @@ public:
 	 * Serialize the contact's data into a key-value map
 	 * suitable for writing to a file
 	 */
-    virtual void serialize(QMap< QString, QString >& serializedData,
-			QMap< QString, QString >& addressBookData);
+    virtual void serialize(TQMap< TQString, TQString >& serializedData,
+			TQMap< TQString, TQString >& addressBookData);
 	/**
 	 * Return the actions for this contact
 	 */
-	virtual QPtrList<KAction> *customContextMenuActions();
+	virtual TQPtrList<KAction> *customContextMenuActions();
 	/**
 	 * Returns a Kopete::ChatSession associated with this contact
 	 */
@@ -72,7 +72,7 @@ public slots:
 	 * Called when an incoming message arrived
 	 * This displays it in the chatwindow
 	 */
-	void receivedMessage( const QString &message );
+	void receivedMessage( const TQString &message );
 
 protected slots:
 	/**
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp
index 270b887a..98a52dfc 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.cpp
+++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp
@@ -16,18 +16,18 @@
 
 #include "testbededitaccountwidget.h"
 
-#include <qlayout.h>
-#include <qlineedit.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
 #include <kdebug.h>
 #include "kopeteaccount.h"
 #include "testbedaccountpreferences.h"
 #include "testbedaccount.h"
 #include "testbedprotocol.h"
 
-TestbedEditAccountWidget::TestbedEditAccountWidget( QWidget* parent, Kopete::Account* account)
-: QWidget( parent ), KopeteEditAccountWidget( account )
+TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account)
+: TQWidget( parent ), KopeteEditAccountWidget( account )
 {
-	( new QVBoxLayout( this ) )->setAutoAdd( true );
+	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 				kdDebug(14210) << k_funcinfo << endl;
 	m_preferencesWidget = new TestbedAccountPreferences( this );
 }
@@ -38,7 +38,7 @@ TestbedEditAccountWidget::~TestbedEditAccountWidget()
 
 Kopete::Account* TestbedEditAccountWidget::apply()
 {
-	QString accountName;
+	TQString accountName;
 	if ( m_preferencesWidget->m_acctName->text().isEmpty() )
 		accountName = "Testbed Account";
 	else
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.h b/kopete/protocols/testbed/testbededitaccountwidget.h
index 9d2e6089..cbd0722a 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.h
+++ b/kopete/protocols/testbed/testbededitaccountwidget.h
@@ -17,7 +17,7 @@
 #ifndef TESTBEDEDITACCOUNTWIDGET_H
 #define TESTBEDEDITACCOUNTWIDGET_H
 
-#include <qwidget.h>
+#include <tqwidget.h>
 #include <editaccountwidget.h>
 
 class QVBoxLayout;
@@ -28,11 +28,11 @@ class TestbedAccountPreferences;
  * A widget for editing this protocol's accounts
  * @author Will Stephenson
 */
-class TestbedEditAccountWidget : public QWidget, public KopeteEditAccountWidget
+class TestbedEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 {
 Q_OBJECT
 public:
-    TestbedEditAccountWidget( QWidget* parent, Kopete::Account* account);
+    TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account);
 
     ~TestbedEditAccountWidget();
 
diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp
index b1bb3e1e..9a4116ca 100644
--- a/kopete/protocols/testbed/testbedfakeserver.cpp
+++ b/kopete/protocols/testbed/testbedfakeserver.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "testbedfakeserver.h"
-#include <qtimer.h>
+#include <tqtimer.h>
 #include <kdebug.h>
 #include "testbedincomingmessage.h"
 
@@ -29,24 +29,24 @@ TestbedFakeServer::~TestbedFakeServer()
 {
 }
 
-void TestbedFakeServer::sendMessage( QString contactId, QString message )
+void TestbedFakeServer::sendMessage( TQString contactId, TQString message )
 {
 	// see what contact the message is for
 	// if it's for Echo, respond immediately
 	kdDebug( 14210 ) << k_funcinfo << "Message for: " << contactId << ", is: " << message << endl;
 	kdDebug( 14210 ) << "recipient is echo, coming back at you." << endl;
 	// put the message in a map and start a timer to tell it to deliver itself.
-	//emit messageReceived( QString::fromLatin1( "echo: " ) + message );
-	QString messageId = contactId + QString::fromLatin1(": ");
+	//emit messageReceived( TQString::fromLatin1( "echo: " ) + message );
+	TQString messageId = contactId + TQString::fromLatin1(": ");
 	TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message );
 	m_incomingMessages.append( msg );
-	QTimer::singleShot( 1000, msg, SLOT( deliver() ) );
+	TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) );
 	
 	// This removes any delivered messages 
 	purgeMessages();
 }
 
-void TestbedFakeServer::incomingMessage( QString message )
+void TestbedFakeServer::incomingMessage( TQString message )
 {
 	emit messageReceived( message );
 }
diff --git a/kopete/protocols/testbed/testbedfakeserver.h b/kopete/protocols/testbed/testbedfakeserver.h
index c5daabe4..1e58031a 100644
--- a/kopete/protocols/testbed/testbedfakeserver.h
+++ b/kopete/protocols/testbed/testbedfakeserver.h
@@ -17,8 +17,8 @@
 #ifndef TESTBEDFAKESERVER_H
 #define TESTBEDFAKESERVER_H
 
-#include "qobject.h"
-#include <qptrlist.h>
+#include "tqobject.h"
+#include <tqptrlist.h>
 
 class TestbedIncomingMessage;
 
@@ -35,7 +35,7 @@ public:
 	/**
 	 * Called to simulate sending a message to a remote contact
 	 */
-	void sendMessage( QString contactId, QString message );
+	void sendMessage( TQString contactId, TQString message );
 	
 public slots:
 	/**
@@ -43,13 +43,13 @@ public slots:
 	 * In reality, a message on the incoming message list
 	 * connects to this slot when it's time to 'arrive'  
 	 */
-	void incomingMessage( QString message );
+	void incomingMessage( TQString message );
 	
 signals:
 	/**
 	 * Tells the account that a message arrived
 	 */
-	void messageReceived( const QString &message );
+	void messageReceived( const TQString &message );
 	
 protected:
 	/**
@@ -60,7 +60,7 @@ protected:
 	/**
 	 * List of incoming messages
 	 */
-	QPtrList<TestbedIncomingMessage> m_incomingMessages;
+	TQPtrList<TestbedIncomingMessage> m_incomingMessages;
 };
 
 #endif
diff --git a/kopete/protocols/testbed/testbedincomingmessage.cpp b/kopete/protocols/testbed/testbedincomingmessage.cpp
index fbbd4c83..576e6c12 100644
--- a/kopete/protocols/testbed/testbedincomingmessage.cpp
+++ b/kopete/protocols/testbed/testbedincomingmessage.cpp
@@ -16,7 +16,7 @@
 
 #include "testbedincomingmessage.h"
 
-TestbedIncomingMessage::TestbedIncomingMessage( TestbedFakeServer* const server , QString message )
+TestbedIncomingMessage::TestbedIncomingMessage( TestbedFakeServer* const server , TQString message )
 {
 	m_server = server; 
 	m_message = message; 
diff --git a/kopete/protocols/testbed/testbedincomingmessage.h b/kopete/protocols/testbed/testbedincomingmessage.h
index 226368d9..3f27510a 100644
--- a/kopete/protocols/testbed/testbedincomingmessage.h
+++ b/kopete/protocols/testbed/testbedincomingmessage.h
@@ -17,7 +17,7 @@
 #ifndef TESTBEDINCOMINGMESSAGE_H
 #define TESTBEDINCOMINGMESSAGE_H
 
-#include <qobject.h>
+#include <tqobject.h>
 #include "testbedfakeserver.h"
 
 /**
@@ -34,7 +34,7 @@ public:
 	 * @param server The simulated Kopete side 'client' of the IM system where the message will arrive when 'delivered'
 	 * @param message The simulated message
 	 */
-	TestbedIncomingMessage( TestbedFakeServer* const server , QString message );
+	TestbedIncomingMessage( TestbedFakeServer* const server , TQString message );
 	virtual ~TestbedIncomingMessage();
 	/**
 	 * Has this message already been delivered?
@@ -47,7 +47,7 @@ public slots:
 	 */
 	void deliver();
 protected:
-	QString m_message;
+	TQString m_message;
 	TestbedFakeServer* m_server;
 	bool m_delivered;
 };
diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp
index 838a74b4..97ecaf02 100644
--- a/kopete/protocols/testbed/testbedprotocol.cpp
+++ b/kopete/protocols/testbed/testbedprotocol.cpp
@@ -29,11 +29,11 @@ K_EXPORT_COMPONENT_FACTORY( kopete_testbed, TestbedProtocolFactory( "kopete_test
 
 TestbedProtocol *TestbedProtocol::s_protocol = 0L;
 
-TestbedProtocol::TestbedProtocol( QObject* parent, const char *name, const QStringList &/*args*/ )
+TestbedProtocol::TestbedProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ )
 	: Kopete::Protocol( TestbedProtocolFactory::instance(), parent, name ),
-	  testbedOnline(  Kopete::OnlineStatus::Online, 25, this, 0,  QString::null,  i18n( "Online" ),   i18n( "O&nline" ) ),
+	  testbedOnline(  Kopete::OnlineStatus::Online, 25, this, 0,  TQString::null,  i18n( "Online" ),   i18n( "O&nline" ) ),
 	  testbedAway(  Kopete::OnlineStatus::Away, 25, this, 1, "msn_away",  i18n( "Away" ),   i18n( "&Away" ) ),
-	  testbedOffline(  Kopete::OnlineStatus::Offline, 25, this, 2,  QString::null,  i18n( "Offline" ),   i18n( "O&ffline" ) )
+	  testbedOffline(  Kopete::OnlineStatus::Offline, 25, this, 2,  TQString::null,  i18n( "Offline" ),   i18n( "O&ffline" ) )
 
 {
 	kdDebug( 14210 ) << k_funcinfo << endl;
@@ -46,23 +46,23 @@ TestbedProtocol::~TestbedProtocol()
 }
 
 Kopete::Contact *TestbedProtocol::deserializeContact(
-	Kopete::MetaContact *metaContact, const QMap<QString, QString> &serializedData,
-	const QMap<QString, QString> &/* addressBookData */)
+	Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
+	const TQMap<TQString, TQString> &/* addressBookData */)
 {
-	QString contactId = serializedData[ "contactId" ];
-	QString accountId = serializedData[ "accountId" ];
-	QString displayName = serializedData[ "displayName" ];
-	QString type = serializedData[ "contactType" ];
+	TQString contactId = serializedData[ "contactId" ];
+	TQString accountId = serializedData[ "accountId" ];
+	TQString displayName = serializedData[ "displayName" ];
+	TQString type = serializedData[ "contactType" ];
 
 	TestbedContact::TestbedContactType tbcType;
-	if ( type == QString::fromLatin1( "echo" ) )
+	if ( type == TQString::fromLatin1( "echo" ) )
 		tbcType = TestbedContact::Echo;
-	if ( type == QString::fromLatin1( "null" ) )
+	if ( type == TQString::fromLatin1( "null" ) )
 		tbcType = TestbedContact::Null;
 	else
 		tbcType = TestbedContact::Null;
 
-	QDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this );
+	TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this );
 
 	Kopete::Account *account = accounts[ accountId ];
 	if ( !account )
@@ -74,19 +74,19 @@ Kopete::Contact *TestbedProtocol::deserializeContact(
 	return new TestbedContact(account, contactId, tbcType, displayName, metaContact);
 }
 
-AddContactPage * TestbedProtocol::createAddContactWidget( QWidget *parent, Kopete::Account * /* account */ )
+AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * /* account */ )
 {
 	kdDebug( 14210 ) << "Creating Add Contact Page" << endl;
 	return new TestbedAddContactPage( parent );
 }
 
-KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, QWidget *parent )
+KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent )
 {
 	kdDebug(14210) << "Creating Edit Account Page" << endl;
 	return new TestbedEditAccountWidget( parent, account );
 }
 
-Kopete::Account *TestbedProtocol::createNewAccount( const QString &accountId )
+Kopete::Account *TestbedProtocol::createNewAccount( const TQString &accountId )
 {
 	return new TestbedAccount( this, accountId );
 }
diff --git a/kopete/protocols/testbed/testbedprotocol.h b/kopete/protocols/testbed/testbedprotocol.h
index 7ee04b7d..d688e130 100644
--- a/kopete/protocols/testbed/testbedprotocol.h
+++ b/kopete/protocols/testbed/testbedprotocol.h
@@ -28,7 +28,7 @@ class TestbedProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
 public:
-	TestbedProtocol(QObject *parent, const char *name, const QStringList &args);
+	TestbedProtocol(TQObject *parent, const char *name, const TQStringList &args);
     ~TestbedProtocol();
 	/**
 	 * Convert the serialised data back into a TestbedContact and add this
@@ -36,21 +36,21 @@ public:
 	 */
 	virtual Kopete::Contact *deserializeContact(
 			Kopete::MetaContact *metaContact,
-			const QMap< QString, QString > & serializedData,
-			const QMap< QString, QString > & addressBookData
+			const TQMap< TQString, TQString > & serializedData,
+			const TQMap< TQString, TQString > & addressBookData
 		);
 	/**
 	 * Generate the widget needed to add TestbedContacts
 	 */
-	virtual AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account );
+	virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account );
 	/**
 	 * Generate the widget needed to add/edit accounts for this protocol
 	 */
-	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent );
+	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent );
 	/**
 	 * Generate a TestbedAccount
 	 */
-	virtual Kopete::Account * createNewAccount( const QString &accountId );
+	virtual Kopete::Account * createNewAccount( const TQString &accountId );
 	/**
 	 * Access the instance of this protocol
 	 */
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index 22884036..b6a5a3b6 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -18,32 +18,32 @@
 #include <webcamwidget.h>
 #include "avdevice/videodevicepool.h"
 
-#include <qframe.h>
-#include <qobject.h>
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
+#include <tqframe.h>
+#include <tqobject.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
 #include <kdebug.h>
 #include <klocale.h>
 
-TestbedWebcamDialog::TestbedWebcamDialog( const QString &contactId, QWidget * parent, const char * name )
+TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
 : KDialogBase( KDialogBase::Plain, Qt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ),
                    KDialogBase::Close, KDialogBase::Close, true /*seperator*/ )
 {
-	setInitialSize( QSize(320,290), false );
+	setInitialSize( TQSize(320,290), false );
 	
 	setEscapeButton( KDialogBase::Close );
-//	QObject::connect( this, SIGNAL( closeClicked() ), this, SIGNAL( closingWebcamDialog() ) );
+//	TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) );
 
-	QWidget *page = plainPage();
+	TQWidget *page = plainPage();
 	setMainWidget(page);
 
-	QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );	
+	TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );	
 	mImageContainer = new Kopete::WebcamWidget( page );
 	mImageContainer->setMinimumSize(320,240);
 	mImageContainer->setText( i18n( "No webcam image received" ) );
-	mImageContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	mImageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	topLayout->add( mImageContainer );
 	
 	show();
@@ -56,10 +56,10 @@ TestbedWebcamDialog::TestbedWebcamDialog( const QString &contactId, QWidget * pa
 	mVideoDevicePool->getImage(&mImage);
 kdDebug() << "Just captured 1st frame" << endl;
 
-	mPixmap=QPixmap(320,240,-1, QPixmap::DefaultOptim);
+	mPixmap=TQPixmap(320,240,-1, TQPixmap::DefaultOptim);
 	if (mPixmap.convertFromImage(mImage,0) == true)
 		mImageContainer->updatePixmap(mPixmap);
-	connect(&qtimer, SIGNAL(timeout()), this, SLOT(slotUpdateImage()) );
+	connect(&qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateImage()) );
 	qtimer.start(0,FALSE);
 }
 
@@ -73,7 +73,7 @@ void TestbedWebcamDialog::slotUpdateImage()
 {
 	mVideoDevicePool->getFrame();
 	mVideoDevicePool->getImage(&mImage);
-	mImageContainer->updatePixmap( QPixmap( mImage ) );
+	mImageContainer->updatePixmap( TQPixmap( mImage ) );
 }
 
 
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.h b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
index 59f43e68..4f7e85ab 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.h
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
@@ -17,10 +17,10 @@
 #ifndef TESTBEDWEBCAMDIALOG_H
 #define TESTBEDWEBCAMDIALOG_H
 
-#include <qstring.h>
-#include <qimage.h>
-#include <qtimer.h>
-#include <qpixmap.h>
+#include <tqstring.h>
+#include <tqimage.h>
+#include <tqtimer.h>
+#include <tqpixmap.h>
 #include <kdialogbase.h>
 
 /**
@@ -41,7 +41,7 @@ class TestbedWebcamDialog : public KDialogBase
 {
 Q_OBJECT
 public:
-	TestbedWebcamDialog( const QString &, QWidget* parent = 0, const char* name = 0 );
+	TestbedWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 );
 	~TestbedWebcamDialog();
 	
 public slots:
@@ -51,9 +51,9 @@ public slots:
 	
 private:
 	Kopete::WebcamWidget *mImageContainer;
-	QImage mImage;
-	QTimer qtimer;
-	QPixmap mPixmap;
+	TQImage mImage;
+	TQTimer qtimer;
+	TQPixmap mPixmap;
 	Kopete::AV::VideoDevicePool *mVideoDevicePool;
 };