Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

78 files changed, 455 insertions, 455 deletions

diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
index 2288f62f..65e808f4 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
@@ -13,7 +13,7 @@
 #include <kdebug.h>
 #include <kbookmark.h>
 #include <tqvariant.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqregexp.h>
 
 #include "addbookmarksplugin.moc"
@@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder()
 {
 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
 
-	return getFolder( mgr->root(), TQString::fromLatin1("kopete") );
+	return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") );
 }
 
 KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& folder )
@@ -165,7 +165,7 @@ KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString&
 
 TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data )
 {
-	TQString temp = TQString::fromLatin1(data);
+	TQString temp = TQString::tqfromLatin1(data);
 	TQRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>");
 	int pos = rx.search( temp );
 	TQTextCodec *codec;
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
index 114cdbc4..a6175750 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
@@ -16,7 +16,7 @@
 #include <kopetepluginmanager.h>
 #include <kopetecontactlist.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqlistbox.h>
 #include <tqnamespace.h>
diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 5b6a832c..61043084 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -136,7 +136,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
             <property name="text">
                 <string>For protocols:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 6321996d..3826b869 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -16,7 +16,7 @@
 #include <kmessagebox.h>
 #include <kconfig.h>
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kplugininfo.h>
 #include <kiconloader.h>
 #include <tqpainter.h>
@@ -81,7 +81,7 @@ class AliasItem : public TQListViewItem
 					if ( isEnabled() || !lv )
 						p->setPen( cg.highlightedText() );
 					else if ( !isEnabled() && lv )
-						p->setPen( lv->palette().disabled().highlightedText() );
+						p->setPen( lv->tqpalette().disabled().highlightedText() );
 				}
 
 				// And last, draw the online status icons
@@ -211,7 +211,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 								protocol,
 								*it,
 								aliasCommand,
-								TQString::fromLatin1("Custom alias for %1").arg(aliasCommand),
+								TQString::tqfromLatin1("Custom alias for %1").tqarg(aliasCommand),
 								Kopete::CommandHandler::UserAlias
 							);
 
@@ -221,7 +221,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 							if( item )
 							{
 								item->protocolList.append( protocol );
-								item->repaint();
+								item->tqrepaint();
 							}
 							else
 							{
@@ -241,8 +241,8 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 void AliasPreferences::save()
 {
 	KConfig *config = KGlobal::config();
-	config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
-	config->setGroup( TQString::fromLatin1("AliasPlugin") );
+	config->deleteGroup( TQString::tqfromLatin1("AliasPlugin") );
+	config->setGroup( TQString::tqfromLatin1("AliasPlugin") );
 
 	TQStringList aliases;
 	AliasItem *item = (AliasItem*)preferencesDialog->aliasList->firstChild();
@@ -271,11 +271,11 @@ void AliasPreferences::save()
 
 void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id )
 {
-	TQRegExp spaces( TQString::fromLatin1("\\s+") );
+	TQRegExp spaces( TQString::tqfromLatin1("\\s+") );
 
-	if( alias.startsWith( TQString::fromLatin1("/") ) )
+	if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 		alias = alias.section( '/', 1 );
-	if( command.startsWith( TQString::fromLatin1("/") ) )
+	if( command.startsWith( TQString::tqfromLatin1("/") ) )
 		command = command.section( '/', 1 );
 
 	if( id == 0 )
@@ -309,7 +309,7 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto
 			*it,
 			alias,
 			command,
-			TQString::fromLatin1("Custom alias for %1").arg(command),
+			TQString::tqfromLatin1("Custom alias for %1").tqarg(command),
 			Kopete::CommandHandler::UserAlias,
 			0,
 			argc
@@ -328,14 +328,14 @@ void AliasPreferences::slotAddAlias()
 	if( addDialog.exec() == TQDialog::Accepted )
 	{
 		TQString alias = addDialog.alias->text();
-		if( alias.startsWith( TQString::fromLatin1("/") ) )
+		if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 			alias = alias.section( '/', 1 );
 
 		if( alias.contains( TQRegExp("[_=]") ) )
 		{
 			KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
 					" alias name cannot contain the characters \"_\" or \"=\"."
-					"</qt>").arg(alias),i18n("Invalid Alias Name") );
+					"</qt>").tqarg(alias),i18n("Invalid Alias Name") );
 		}
 		else
 		{
@@ -353,7 +353,7 @@ void AliasPreferences::slotAddAlias()
 				{
 					KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
 						"command is already being handled by either another alias or "
-						"Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
+						"Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
 					return;
 				}
 			}
@@ -418,13 +418,13 @@ void AliasPreferences::slotEditAlias()
 		if( editDialog.exec() == TQDialog::Accepted )
 		{
 			TQString alias = editDialog.alias->text();
-			if( alias.startsWith( TQString::fromLatin1("/") ) )
+			if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 				alias = alias.section( '/', 1 );
 			if( alias.contains( TQRegExp("[_=]") ) )
 			{
 				KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
 						" alias name cannot contain the characters \"_\" or \"=\"."
-						"</qt>").arg(alias),i18n("Invalid Alias Name") );
+						"</qt>").tqarg(alias),i18n("Invalid Alias Name") );
 			}
 			else
 			{
@@ -449,7 +449,7 @@ void AliasPreferences::slotEditAlias()
 						{
 							KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
 							"command is already being handled by either another alias or "
-							"Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
+							"Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
 						return;
 						}
 					}
diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
index f3610a7f..586487b8 100644
--- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
@@ -81,7 +81,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
 		bool isReplaced=false;
 		for ( it = map.begin(); it != map.end(); ++it )
 		{
-			TQRegExp re( match.arg( TQRegExp::escape( it.key() ) ) );
+			TQRegExp re( match.tqarg( TQRegExp::escape( it.key() ) ) );
 			if( re.search( replaced_message ) != -1 )
 			{
 				TQString before = re.cap(1);
@@ -113,7 +113,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
 				TQString replaced_message = msg.plainBody();
 				// eventually start each sent line with capital letter
 				// TODO 	". "	 "? "	 "! "
-				replaced_message[ 0 ] = replaced_message.at( 0 ).upper();
+				replaced_message[ 0 ] = replaced_message.tqat( 0 ).upper();
 
 				// the message is now the one with replaced words
 				msg.setBody( replaced_message, Kopete::Message::PlainText );
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 9a6eec1f..9909b5ee 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqheader.h>
@@ -126,7 +126,7 @@ void AutoReplacePreferences::slotAddCouple()
 		if ( ( oldLvi = preferencesDialog->m_list->findItem( k, 0 ) ) )
 			delete oldLvi;
 		lvi = new TQListViewItem( preferencesDialog->m_list, k, v );
-		// Triggers a size, geometry and content update
+		// Triggers a size, tqgeometry and content update
 		// during the next iteration of the event loop
 		preferencesDialog->m_list->triggerUpdate();
 		// select last added
diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui
index 3694784a..ca558f4b 100644
--- a/kopete/plugins/autoreplace/autoreplaceprefs.ui
+++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui
@@ -91,7 +91,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -135,7 +135,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -157,7 +157,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
index d6365c0a..e540277e 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
@@ -36,7 +36,7 @@ ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *na
 	m_process = 0L;
 
 	m_timer = new TQTimer();
-	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) );
+	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotChecktqStatus() ) );
 	m_timer->start( 60000 );
 
 	m_pluginConnected = false;
@@ -49,7 +49,7 @@ ConnectionStatusPlugin::~ConnectionStatusPlugin()
 	delete m_process;
 }
 
-void ConnectionStatusPlugin::slotCheckStatus()
+void ConnectionStatusPlugin::slotChecktqStatus()
 {
 	kdDebug( 14301 ) << k_funcinfo << endl;
 
@@ -87,7 +87,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process )
 
 	if ( process == m_process )
 	{
-		setConnectedStatus( m_buffer.contains( "default" ) );
+		setConnectedtqStatus( m_buffer.contains( "default" ) );
 		m_buffer = TQString();
 		delete m_process;
 		m_process = 0L;
@@ -98,11 +98,11 @@ void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int bu
 {
 	// Look for a default gateway
 	//kdDebug( 14301 ) << k_funcinfo << endl;
-	m_buffer += TQString::fromLatin1( buffer, buflen );
+	m_buffer += TQString::tqfromLatin1( buffer, buflen );
 	//kdDebug( 14301 ) << qsBuffer << endl;
 }
 
-void ConnectionStatusPlugin::setConnectedStatus( bool connected )
+void ConnectionStatusPlugin::setConnectedtqStatus( bool connected )
 {
 	//kdDebug( 14301 ) << k_funcinfo << endl;
 
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h
index c030c71c..e0efdb9a 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.h
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h
@@ -36,7 +36,7 @@ public:
 	~ConnectionStatusPlugin();
 
 private slots:
-	void slotCheckStatus();
+	void slotChecktqStatus();
 	void slotProcessStdout( KProcess *process, char *buffer, int len );
 
 	/**
@@ -45,7 +45,7 @@ private slots:
 	void slotProcessExited( KProcess *process );
 
 private:
-	void setConnectedStatus( bool newStatus );
+	void setConnectedtqStatus( bool newtqStatus );
 
 	bool m_pluginConnected;
 	KProcess *m_process;
diff --git a/kopete/plugins/contactnotes/contactnotesedit.cpp b/kopete/plugins/contactnotes/contactnotesedit.cpp
index 69d242ad..607c0f17 100644
--- a/kopete/plugins/contactnotes/contactnotesedit.cpp
+++ b/kopete/plugins/contactnotes/contactnotesedit.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqvbox.h>
 
 #include <klocale.h>
@@ -33,7 +33,7 @@ ContactNotesEdit::ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p,
 
 	TQVBox *w=new TQVBox(this);
 	w->setSpacing(KDialog::spacingHint());
-	m_label = new TQLabel(i18n("Notes about %1:").arg(m->displayName()) , w , "m_label");
+	m_label = new TQLabel(i18n("Notes about %1:").tqarg(m->displayName()) , w , "m_label");
 	m_linesEdit= new TQTextEdit ( w , "m_linesEdit");
 
 	m_linesEdit->setText(p->notes(m));
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 898e7f1a..11f30f48 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -48,8 +48,8 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent )
 	setInstance( KGenericFactory<CryptographyPlugin>::instance() );
 
 
-	m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
-	m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ;
+	m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::tqfromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
+	m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::tqfromLatin1("off") ) ;
 
 	setXMLFile("cryptographychatui.rc");
 }
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 12533044..135cf636 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
 
@@ -45,7 +45,7 @@
 //In Jabber, the JEP says it's not. so we don't use richtext in our message, but some client did.
 //We limit the html to some basis tag to limit security problem (bad links)
 //    - Olivier
-const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
+const TQRegExp CryptographyPlugin::isHTML( TQString::tqfromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
 
 typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory;
 static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" );
@@ -154,8 +154,8 @@ bool CryptographyPlugin::passphraseHandling()
 void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 {
  	TQString body = msg.plainBody();
-	if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") )
-		 || !body.contains( TQString::fromLatin1("-----END PGP MESSAGE----") ) )
+	if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") )
+		 || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) )
 		return;
 
 	if( msg.direction() != Kopete::Message::Inbound )
@@ -179,16 +179,16 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 				plainBody = TQStyleSheet::escape( plainBody );
 
 				//this is the same algoritm as in Kopete::Message::escapedBody();
-				plainBody.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br/>" ) )
-					.replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
-					.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "&nbsp; " ) );
+				plainBody.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) )
+					.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
+					.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "&nbsp; " ) );
 			}
 
-			msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+			msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 				+ i18n("Outgoing Encrypted Message: ")
-				+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+				+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 				+ plainBody
-				+ TQString::fromLatin1(" </td></tr></table>")
+				+ TQString::tqfromLatin1(" </td></tr></table>")
 				, Kopete::Message::RichText );
 		}
 
@@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 			body = Kopete::Message::escape( body );
 		}
 
-		msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+		msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 			+ i18n("Incoming Encrypted Message: ")
-			+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+			+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 			+ body
-			+ TQString::fromLatin1(" </td></tr></table>")
+			+ TQString::tqfromLatin1(" </td></tr></table>")
 			, Kopete::Message::RichText );
 	}
 
diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui
index 2a6ec002..00a7b4c0 100644
--- a/kopete/plugins/cryptography/cryptographyprefsbase.ui
+++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui
@@ -63,7 +63,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>50</height>
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index ae92647b..9d692e08 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -35,7 +35,7 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete
 	connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed()));
 	connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed()));
 
-	view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName()));
+	view->m_titleLabel->setText(i18n("Select public key for %1").tqarg(mc->displayName()));
 	view->m_editKey->setText(key);
 }
 CryptographySelectUserKey::~CryptographySelectUserKey()
diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
index 8a5b1379..fb71e0a1 100644
--- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
+++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index 73858012..fb407523 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -96,9 +96,9 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID)
 			/// pipe for passphrase
 			//userID=TQString::fromUtf8(userID);
 			userID.replace('<',"&lt;");
-			TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").arg(userID);
+			TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").tqarg(userID);
 			if (counter>1)
-				passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").arg(TQString::number(4-counter)));
+				passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").tqarg(TQString::number(4-counter)));
 	
 			/// pipe for passphrase
 			int code=KPasswordDialog::getPassword(password,passdlg);
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 865584a1..e095c0e8 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <klistview.h>
@@ -122,7 +122,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
       tst=tst.section(":",9,9);
 
       // FIXME: Same here: don't use popen! - Martijn
-      fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).arg( KShellProcess::quote( id ) ).latin1(), "r" );
+      fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).tqarg( KShellProcess::quote( id ) ).latin1(), "r" );
       bool dead=true;
       while ( fgets( line, sizeof(line), fp2))
       {
@@ -147,7 +147,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
       if (!tst.isEmpty() && (!dead))
       {
         KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst));
-        KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
+        KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(tr).tqarg(val));
         sub->setSelectable(false);
         item->setPixmap(0,keyPair);
       }
@@ -163,7 +163,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
   keysListpr->setSelected(keysListpr->firstChild(),true);
 
   page->show();
-  resize(this->minimumSize());
+  resize(this->tqminimumSize());
   setMainWidget(page);
 }
 
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index c7b33b33..5e990386 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 ////////////////////////////////////////////////////////   code  for choosing a public key from a list for encryption
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqptrlist.h>
 #include <tqwhatsthis.h>
@@ -73,14 +73,14 @@ def=isDefault;
 }
 
 
-void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment)
+void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment)
 {
         if ((def) && (column<2)) {
                 TQFont font(p->font());
                 font.setBold(true);
                 p->setFont(font);
         }
-        KListViewItem::paintCell(p, cg, column, width, alignment);
+        KListViewItem::paintCell(p, cg, column, width, tqalignment);
 }
 
 TQString UpdateViewItem2 :: key(int c,bool ) const
@@ -108,7 +108,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
         keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
 	keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
 
-        if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
+        if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile));
         fmode=filemode;	
 	
 	TQHButtonGroup *hBar=new TQHButtonGroup(page);
@@ -174,7 +174,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
                         (CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible"));
 			
 		TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>");
-		  KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").arg(shredWhatsThis),parentBox );
+		  KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox );
 		  shredBox->addWidget(CBshred);
 		  shredBox->addWidget(warn);
         }
@@ -452,7 +452,7 @@ void popupPublic::slotprocread(KProcIO *p)
 				bool isDefaultKey=false;
                                 if (id.right(8)==defaultKey) isDefaultKey=true;
                                         UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
-					//KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
+					//KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val));
                                         //sub->setSelectable(false);
                                         if (seclist.find(tst,0,FALSE)!=-1)
                                                 item->setPixmap(0,keyPair);
diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp
index 6d7e03b2..2cfab23b 100644
--- a/kopete/plugins/highlight/highlightconfig.cpp
+++ b/kopete/plugins/highlight/highlightconfig.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tqfile.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqregexp.h>
 #include <tqdir.h>
 #include <tqdom.h>
@@ -78,11 +78,11 @@ void HighlightConfig::load()
 {
 	m_filters.clear(); //clear filters
 
-	TQString filename = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) );
+	TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) );
 	if( filename.isEmpty() )
 		return ;
 
-	TQDomDocument filterList( TQString::fromLatin1( "highlight-plugin" ) );
+	TQDomDocument filterList( TQString::tqfromLatin1( "highlight-plugin" ) );
 
 	TQFile filterListFile( filename );
 	filterListFile.open( IO_ReadOnly );
@@ -96,7 +96,7 @@ void HighlightConfig::load()
 		TQDomElement element = node.toElement();
 		if( !element.isNull() )
 		{
-//			if( element.tagName() == TQString::fromLatin1("filter")
+//			if( element.tagName() == TQString::tqfromLatin1("filter")
 //			{
 				Filter *filtre=newFilter();
 				TQDomNode filterNode = node.firstChild();
@@ -106,40 +106,40 @@ void HighlightConfig::load()
 					TQDomElement filterElement = filterNode.toElement();
 					if( !filterElement.isNull() )
 					{
-						if( filterElement.tagName() == TQString::fromLatin1( "display-name" ) )
+						if( filterElement.tagName() == TQString::tqfromLatin1( "display-name" ) )
 						{
 							filtre->displayName = filterElement.text();
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "search" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "search" ) )
 						{
 							filtre->search = filterElement.text();
 
-							filtre->caseSensitive= ( filterElement.attribute( TQString::fromLatin1( "caseSensitive" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ) );
-							filtre->isRegExp= ( filterElement.attribute( TQString::fromLatin1( "regExp" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->caseSensitive= ( filterElement.attribute( TQString::tqfromLatin1( "caseSensitive" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->isRegExp= ( filterElement.attribute( TQString::tqfromLatin1( "regExp" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "FG" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "FG" ) )
 						{
 							filtre->FG = filterElement.text();
-							filtre->setFG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->setFG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "BG" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "BG" ) )
 						{
 							filtre->BG = filterElement.text();
-							filtre->setBG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->setBG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "importance" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "importance" ) )
 						{
 							filtre->importance = filterElement.text().toUInt();
-							filtre->setImportance= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->setImportance= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "sound" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "sound" ) )
 						{
 							filtre->soundFN = filterElement.text();
-							filtre->playSound = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->playSound = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::fromLatin1( "raise" ) )
+						else if( filterElement.tagName() == TQString::tqfromLatin1( "raise" ) )
 						{
-							filtre->raiseView = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
+							filtre->raiseView = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
 						}
 					}
 					filterNode = filterNode.nextSibling();
@@ -154,7 +154,7 @@ void HighlightConfig::load()
 void HighlightConfig::save()
 {
 
-	TQString fileName = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) );
+	TQString fileName = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) );
 
 	KSaveFile file( fileName );
 	if( file.status() == 0 )
@@ -162,7 +162,7 @@ void HighlightConfig::save()
 		TQTextStream *stream = file.textStream();
 		stream->setEncoding( TQTextStream::UnicodeUTF8 );
 
-		TQString xml = TQString::fromLatin1(
+		TQString xml = TQString::tqfromLatin1(
 			"<?xml version=\"1.0\"?>\n"
 			"<!DOCTYPE kopete-highlight-plugin>\n"
 			"<highlight-plugin>\n" );
@@ -172,32 +172,32 @@ void HighlightConfig::save()
 		for( ; filtreIt.current(); ++filtreIt )
 		{
 			Filter *filtre = *filtreIt;
-			xml += TQString::fromLatin1( "  <filter>\n    <display-name>" )
+			xml += TQString::tqfromLatin1( "  <filter>\n    <display-name>" )
 				+ TQStyleSheet::escape(filtre->displayName)
-				+ TQString::fromLatin1( "</display-name>\n" );
+				+ TQString::tqfromLatin1( "</display-name>\n" );
 
-			xml += TQString::fromLatin1("    <search caseSensitive=\"") + TQString::number( static_cast<int>( filtre->caseSensitive ) ) +
-				TQString::fromLatin1("\" regExp=\"") + TQString::number( static_cast<int>( filtre->isRegExp ) ) +
-				TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::fromLatin1( "</search>\n" );
+			xml += TQString::tqfromLatin1("    <search caseSensitive=\"") + TQString::number( static_cast<int>( filtre->caseSensitive ) ) +
+				TQString::tqfromLatin1("\" regExp=\"") + TQString::number( static_cast<int>( filtre->isRegExp ) ) +
+				TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::tqfromLatin1( "</search>\n" );
 
-			xml += TQString::fromLatin1("    <BG set=\"") + TQString::number( static_cast<int>( filtre->setBG ) ) +
-				TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::fromLatin1( "</BG>\n" );
-			xml += TQString::fromLatin1("    <FG set=\"") + TQString::number( static_cast<int>( filtre->setFG ) ) +
-				TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::fromLatin1( "</FG>\n" );
+			xml += TQString::tqfromLatin1("    <BG set=\"") + TQString::number( static_cast<int>( filtre->setBG ) ) +
+				TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::tqfromLatin1( "</BG>\n" );
+			xml += TQString::tqfromLatin1("    <FG set=\"") + TQString::number( static_cast<int>( filtre->setFG ) ) +
+				TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::tqfromLatin1( "</FG>\n" );
 
-			xml += TQString::fromLatin1("    <importance set=\"") + TQString::number( static_cast<int>( filtre->setImportance ) ) +
-				TQString::fromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::fromLatin1( "</importance>\n" );
+			xml += TQString::tqfromLatin1("    <importance set=\"") + TQString::number( static_cast<int>( filtre->setImportance ) ) +
+				TQString::tqfromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::tqfromLatin1( "</importance>\n" );
 
-			xml += TQString::fromLatin1("    <sound set=\"") + TQString::number( static_cast<int>( filtre->playSound ) ) +
-				TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::fromLatin1( "</sound>\n" );
+			xml += TQString::tqfromLatin1("    <sound set=\"") + TQString::number( static_cast<int>( filtre->playSound ) ) +
+				TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::tqfromLatin1( "</sound>\n" );
 
-			xml += TQString::fromLatin1("    <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) +
-				TQString::fromLatin1( "\"></raise>\n" );
+			xml += TQString::tqfromLatin1("    <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) +
+				TQString::tqfromLatin1( "\"></raise>\n" );
 
-			xml += TQString::fromLatin1( "  </filter>\n" );
+			xml += TQString::tqfromLatin1( "  </filter>\n" );
 		}
 
-		xml += TQString::fromLatin1( "</highlight-plugin>\n" );
+		xml += TQString::tqfromLatin1( "</highlight-plugin>\n" );
 
 		*stream << xml;
 	}
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index e6280a27..eead8241 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <kcombobox.h>
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index 4d39a0ca..eaca281c 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -137,7 +137,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -177,7 +177,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -217,7 +217,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -277,7 +277,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>21</height>
@@ -288,7 +288,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -328,7 +328,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>21</height>
@@ -339,7 +339,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -379,7 +379,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>21</height>
@@ -390,7 +390,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -413,7 +413,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 677ed1d2..76b29a5c 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -44,7 +44,7 @@ void HistoryPlugin::convertOldHistory()
 	progressDlg->setAllowCancel(false); //because i am too lazy to allow to cancel
 
 
-	TQString kopetedir=locateLocal( "data", TQString::fromLatin1( "kopete"));
+	TQString kopetedir=locateLocal( "data", TQString::tqfromLatin1( "kopete"));
 	TQDir d( kopetedir ); //d should point to ~/.kde/share/apps/kopete/
 
 	d.setFilter( TQDir::Dirs  );
@@ -112,7 +112,7 @@ void HistoryPlugin::convertOldHistory()
 
 			progressDlg->progressBar()->reset();
 			progressDlg->progressBar()->setTotalSteps(d2.count());
-			progressDlg->setLabel(i18n("Parsing old history in %1").arg(fi->fileName()));
+			progressDlg->setLabel(i18n("Parsing old history in %1").tqarg(fi->fileName()));
 			progressDlg->show(); //if it was not already showed...
 
 			while ( (fi2 = it2.current()) != 0 )
@@ -122,7 +122,7 @@ void HistoryPlugin::convertOldHistory()
 
 				if(!contactId.isEmpty() )
 				{
-					progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").arg(fi->fileName()).arg(contactId));
+					progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").tqarg(fi->fileName()).tqarg(contactId));
 					kapp->processEvents(0); //make sure the text is updated in the progressDlg
 
 					int month=0;
@@ -155,12 +155,12 @@ void HistoryPlugin::convertOldHistory()
 							buffer += TQString::fromUtf8(cbuf);
 						}
 
-						if( buffer.startsWith( TQString::fromLatin1( "<message " ) ) )
+						if( buffer.startsWith( TQString::tqfromLatin1( "<message " ) ) )
 						{
 							msgBlock = buffer;
 
 							// find the end of the message block
-							while( !feof( f ) && buffer != TQString::fromLatin1( "</message>\n" ) /*strcmp("</message>\n", cbuf )*/ )
+							while( !feof( f ) && buffer != TQString::tqfromLatin1( "</message>\n" ) /*strcmp("</message>\n", cbuf )*/ )
 							{
 								fgets(cbuf, CBUFLENGTH, f);
 								buffer = TQString::fromUtf8(cbuf);
@@ -178,7 +178,7 @@ void HistoryPlugin::convertOldHistory()
 							msgelement = xmllist.documentElement();
 							node = msgelement.firstChild();
 
-							if( msgelement.attribute( TQString::fromLatin1( "direction" ) ) == TQString::fromLatin1( "inbound" ) )
+							if( msgelement.attribute( TQString::tqfromLatin1( "direction" ) ) == TQString::tqfromLatin1( "inbound" ) )
 								dir = Kopete::Message::Inbound;
 							else
 								dir = Kopete::Message::Outbound;
@@ -194,12 +194,12 @@ void HistoryPlugin::convertOldHistory()
 									element = node.toElement();
 									tagname = element.tagName();
 
-									if( tagname == TQString::fromLatin1( "srcnick" ) )
+									if( tagname == TQString::tqfromLatin1( "srcnick" ) )
 										nick = element.text();
 
-									else if( tagname == TQString::fromLatin1( "date" ) )
+									else if( tagname == TQString::tqfromLatin1( "date" ) )
 										date = element.text();
-									else if( tagname == TQString::fromLatin1( "body" ) )
+									else if( tagname == TQString::tqfromLatin1( "body" ) )
 										body = element.text().stripWhiteSpace();
 								}
 
@@ -213,11 +213,11 @@ void HistoryPlugin::convertOldHistory()
 								if(!docElem.isNull())
 								{
 									TQDate date(year,month,1);
-									TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
-											TQString::fromLatin1( "/" ) +
-											contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+									TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+											TQString::tqfromLatin1( "/" ) +
+											contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
 											date.toString(".yyyyMM");
-									KSaveFile file(  locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) )  );
+									KSaveFile file(  locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) )  );
 									if( file.status() == 0 )
 									{
 										TQTextStream *stream = file.textStream();
@@ -254,7 +254,7 @@ void HistoryPlugin::convertOldHistory()
 								headElem.appendChild(contactElem);
 								TQDomElement importElem = doc.createElement( "imported" );
 								importElem.setAttribute( "from",  fi->fileName() );
-								importElem.setAttribute( "date", TQDateTime::currentDateTime().toString()  );
+								importElem.setAttribute( "date", TQDateTime::tqcurrentDateTime().toString()  );
 								headElem.appendChild(importElem);
 							}
 							TQDomElement msgElem = doc.createElement( "msg" );
@@ -275,11 +275,11 @@ void HistoryPlugin::convertOldHistory()
 					if(!docElem.isNull())
 					{
 						TQDate date(year,month,1);
-						TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
-								TQString::fromLatin1( "/" ) +
-								contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+						TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+								TQString::tqfromLatin1( "/" ) +
+								contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
 								date.toString(".yyyyMM");
-						KSaveFile file(  locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) )  );
+						KSaveFile file(  locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) )  );
 						if( file.status() == 0 )
 						{
 							TQTextStream *stream = file.textStream();
@@ -310,12 +310,12 @@ bool HistoryPlugin::detectOldHistory()
 		return false;
 
 
-	TQDir d( locateLocal( "data", TQString::fromLatin1( "kopete/logs")) );
+	TQDir d( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs")) );
 	d.setFilter( TQDir::Dirs  );
 	if(d.count() >= 3)  // '.' and '..' are included
 		return false;  //the new history already exists
 
-	TQDir d2( locateLocal( "data", TQString::fromLatin1( "kopete")) );
+	TQDir d2( locateLocal( "data", TQString::tqfromLatin1( "kopete")) );
 	d2.setFilter( TQDir::Dirs  );
 	const TQFileInfoList *list = d2.entryInfoList();
 	TQFileInfoListIterator it( *list );
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 4b4877c2..c4f5418f 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -35,12 +35,12 @@
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqdatetime.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -95,7 +95,7 @@ int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const
 
 HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	const char* name) : KDialogBase(parent, name, false,
-		i18n("History for %1").arg(mc->displayName()), 0), mSearching(false)
+		i18n("History for %1").tqarg(mc->displayName()), 0), mSearching(false)
 {
 	TQString fontSize;
 	TQString htmlCode;
@@ -148,7 +148,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	mHtmlView->setMarginWidth(4);
 	mHtmlView->setMarginHeight(4);
 	mHtmlView->setFocusPolicy(TQ_NoFocus);
-	mHtmlView->setSizePolicy(
+	mHtmlView->tqsetSizePolicy(
 	TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	l->addWidget(mHtmlView);
 
@@ -157,7 +157,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 
 	mHtmlPart->begin();
 	htmlCode = "<html><head>" + fontStyle + "</head><body class=\"hf\"></body></html>";
-	mHtmlPart->write( TQString::fromLatin1( htmlCode.latin1() ) );
+	mHtmlPart->write( TQString::tqfromLatin1( htmlCode.latin1() ) );
 	mHtmlPart->end();
 
 	
@@ -175,7 +175,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	//initActions
 	KActionCollection* ac = new KActionCollection(this);
 	mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
-	mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
+	mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
 
 	resize(650, 700);
 	centerOnScreen(this);
@@ -255,13 +255,13 @@ void HistoryDialog::init(Kopete::Contact *c)
 {
 	// Get year and month list
 	TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" );
-	const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) );
+	const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) );
 	TQFileInfo *fi;
 	
 
 	// BEGIN check if there are Kopete 0.7.x
 	TQDir d1(locateLocal("data",TQString("kopete/logs/")+
-			c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-"))
+			c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
 					   ));
 	d1.setFilter( TQDir::Files | TQDir::NoSymLinks );
 	d1.setSorting( TQDir::Name );
@@ -288,9 +288,9 @@ void HistoryDialog::init(Kopete::Contact *c)
 	// END of kopete 0.7.x check
 
 	TQString logDir = locateLocal("data",TQString("kopete/logs/")+
-			c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) +
-					TQString::fromLatin1( "/" ) +
-					c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )
+			c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
+					TQString::tqfromLatin1( "/" ) +
+					c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
 								);
 	TQDir d(logDir);
 	d.setFilter( TQDir::Files | TQDir::NoSymLinks );
@@ -339,16 +339,16 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs)
 		htmlBody.removeChild(htmlBody.childNodes().item(htmlBody.childNodes().length() - 1));
 	// ----
 
-	TQString dir = (TQApplication::reverseLayout() ? TQString::fromLatin1("rtl") :
-		TQString::fromLatin1("ltr"));
+	TQString dir = (TQApplication::reverseLayout() ? TQString::tqfromLatin1("rtl") :
+		TQString::tqfromLatin1("ltr"));
 
 	TQValueList<Kopete::Message>::iterator it = msgs.begin();
 
 
 	TQString accountLabel;
 	TQString resultHTML = "<b><font color=\"red\">" + (*it).timestamp().date().toString() + "</font></b><br/>";
-	DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span"));
-	newNode.setAttribute(TQString::fromLatin1("dir"), dir);
+	DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span"));
+	newNode.setAttribute(TQString::tqfromLatin1("dir"), dir);
 	newNode.setInnerHTML(resultHTML);
 	mHtmlPart->htmlDocument().body().appendChild(newNode);
 
@@ -384,8 +384,8 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs)
 									: "<font color=\"" + KopetePrefs::prefs()->textColor().light(200).name() + "\"><b>&lt;</b></font> ")
 					+ body + "<br/>";
 	
-			newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span"));
-			newNode.setAttribute(TQString::fromLatin1("dir"), dir);
+			newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span"));
+			newNode.setAttribute(TQString::tqfromLatin1("dir"), dir);
 			newNode.setInnerHTML(resultHTML);
 	
 			mHtmlPart->htmlDocument().body().appendChild(newNode);
@@ -553,7 +553,7 @@ void HistoryDialog::slotContactChanged(int index)
 	else
 	{
 		mMetaContact = mMetaContactList.at(index-1);
-        setCaption(i18n("History for %1").arg(mMetaContact->displayName()));
+        setCaption(i18n("History for %1").tqarg(mMetaContact->displayName()));
 		init();
 	}
 }
@@ -597,16 +597,16 @@ void HistoryDialog::slotCopy()
 	if ( qsSelection.isEmpty() ) return;
 	
 	disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
-	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard);
-	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection);
+	TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Clipboard);
+	TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Selection);
 	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
 }
 
 void HistoryDialog::slotCopyURL()
 {
 	disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
-	TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard);
-	TQApplication::clipboard()->setText( mURL, TQClipboard::Selection);
+	TQApplication::tqclipboard()->setText( mURL, TQClipboard::Clipboard);
+	TQApplication::tqclipboard()->setText( mURL, TQClipboard::Selection);
 	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection()));
 }
 
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index 4b1798ae..b8608ac9 100644
--- a/kopete/plugins/history/historyguiclient.cpp
+++ b/kopete/plugins/history/historyguiclient.cpp
@@ -41,7 +41,7 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name
 	TQPtrList<Kopete::Contact> mb=m_manager->members();
 	m_logger=new HistoryLogger( mb.first() , this );
 
-	actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" );
+	actionLast=new KAction( i18n("History Last" ), TQString::tqfromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" );
 	actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" );
 	actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" );
 
diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp
index f03d165b..02bc1b2f 100644
--- a/kopete/plugins/history/historylogger.cpp
+++ b/kopete/plugins/history/historylogger.cpp
@@ -45,7 +45,7 @@ HistoryLogger::HistoryLogger( Kopete::MetaContact *m,  TQObject *parent, const c
 	m_metaContact=m;
 	m_hideOutgoing=false;
 	m_cachedMonth=-1;
-	m_realMonth=TQDate::currentDate().month();
+	m_realMonth=TQDate::tqcurrentDate().month();
 	m_oldSens=Default;
 
 	//the contact may be destroyed, for example, if the contact changes its metacontact
@@ -63,7 +63,7 @@ HistoryLogger::HistoryLogger( Kopete::Contact *c,  TQObject *parent, const char
 	m_cachedMonth=-1;
 	m_metaContact=c->metaContact();
 	m_hideOutgoing=false;
-	m_realMonth=TQDate::currentDate().month();
+	m_realMonth=TQDate::tqcurrentDate().month();
 	m_oldSens=Default;
 
 	//the contact may be destroyed, for example, if the contact changes its metacontact
@@ -107,14 +107,14 @@ void HistoryLogger::setCurrentMonth(int month)
 
 TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int month , bool canLoad , bool* contain)
 {
-	if(m_realMonth!=TQDate::currentDate().month())
+	if(m_realMonth!=TQDate::tqcurrentDate().month())
 	{ //We changed month, our indice are not correct anymore, clean memory.
 	  // or we will see what i called "the 31 midnight bug"(TM) :-)  -Olivier
 		m_documents.clear();
 		m_cachedMonth=-1;
 		m_currentMonth++; //Not usre it's ok, but should work;
 		m_oldMonth++;     // idem
-		m_realMonth=TQDate::currentDate().month();
+		m_realMonth=TQDate::tqcurrentDate().month();
 	}
 
 	if(!m_metaContact)
@@ -137,7 +137,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int
 		return documents[month];
 
 
-	TQDomDocument doc =  getDocument(c, TQDate::currentDate().addMonths(0-month), canLoad, contain);
+	TQDomDocument doc =  getDocument(c, TQDate::tqcurrentDate().addMonths(0-month), canLoad, contain);
 
 	documents.insert(month, doc);
 	m_documents[c]=documents;
@@ -253,8 +253,8 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co
 		TQDomElement headElem = doc.createElement( "head" );
 		docElem.appendChild( headElem );
 		TQDomElement dateElem = doc.createElement( "date" );
-		dateElem.setAttribute( "year",  TQString::number(TQDate::currentDate().year()) );
-		dateElem.setAttribute( "month", TQString::number(TQDate::currentDate().month()) );
+		dateElem.setAttribute( "year",  TQString::number(TQDate::tqcurrentDate().year()) );
+		dateElem.setAttribute( "month", TQString::number(TQDate::tqcurrentDate().month()) );
 		headElem.appendChild(dateElem);
 		TQDomElement myselfElem = doc.createElement( "contact" );
 		myselfElem.setAttribute( "type",  "myself" );
@@ -280,7 +280,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co
 	// On hight-traffic channel, saving can take lots of CPU. (because the file is big)
 	// So i wait a time proportional to the time needed to save..
 
-	const TQString filename=getFileName(c,TQDate::currentDate());
+	const TQString filename=getFileName(c,TQDate::tqcurrentDate());
 	if(!m_toSaveFileName.isEmpty() && m_toSaveFileName != filename)
 	{ //that mean the contact or the month has changed, save it now.
 		saveToDisk();
@@ -376,8 +376,8 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(TQDate date)
 					to.append( dir==Kopete::Message::Inbound ? (*it)->account()->myself() : *it );
 
 					Kopete::Message msg(dt, from, to, msgElem2.text(), dir);
-					msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>")
-							.arg( dt.toString(Qt::LocalDate), msg.escapedBody() ),
+					msg.setBody( TQString::tqfromLatin1("<span title=\"%1\">%2</span>")
+							.tqarg( dt.toString(Qt::LocalDate), msg.escapedBody() ),
 							Kopete::Message::RichText);
 				
 
@@ -403,7 +403,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(TQDate date)
 TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 	const Kopete::Contact *c, Sens sens, bool reverseOrder, bool colorize)
 {
-	//TQDate dd =  TQDate::currentDate().addMonths(0-m_currentMonth);
+	//TQDate dd =  TQDate::tqcurrentDate().addMonths(0-m_currentMonth);
 
 	TQValueList<Kopete::Message> messages;
 
@@ -490,7 +490,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 					if( !msgElem2.isNull() && msgElem2.tagName()=="msg")
 					{
 						rxTime.search(msgElem2.attribute("time"));
-						TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth);
+						TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth);
 						TQDateTime dt( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt(), rxTime.cap(5).toUInt()  ) );
 						if(!timestamp.isValid() || ((sens==Chronological )? dt < timestamp : dt > timestamp) )
 						{
@@ -587,23 +587,23 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 					{
 						//parse timestamp only if it was not already parsed
 						rxTime.search(msgElem.attribute("time"));
-						TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth);
+						TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth);
 						timestamp=TQDateTime( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt() , rxTime.cap(5).toUInt() ) );
 					}
 
 					Kopete::Message msg(timestamp, from, to, msgElem.text(), dir);
 					if (colorize)
 					{
-						msg.setBody( TQString::fromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>")
-							.arg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
+						msg.setBody( TQString::tqfromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>")
+							.tqarg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
 							Kopete::Message::RichText
 						);
 						msg.setFg( fgColor );
 					}
 					else
 					{
-						msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>")
-							.arg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
+						msg.setBody( TQString::tqfromLatin1("<span title=\"%1\">%2</span>")
+							.tqarg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
 							Kopete::Message::RichText
 						);
 					}
@@ -635,7 +635,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 							TQRegExp rx("(\\d+) (\\d+):(\\d+):(\\d+)");
 							rx.search(msgElem.attribute("time"));
 
-							TQDate d = TQDate::currentDate().addMonths(0-m_currentMonth);
+							TQDate d = TQDate::tqcurrentDate().addMonths(0-m_currentMonth);
 							timestamp = TQDateTime(
 								TQDate(d.year(), d.month(), rx.cap(1).toUInt()),
 								TQTime( rx.cap(2).toUInt(), rx.cap(3).toUInt() ) );
@@ -663,25 +663,25 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 TQString HistoryLogger::getFileName(const Kopete::Contact* c, TQDate date)
 {
 	
-	TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
-		TQString::fromLatin1( "/" ) +
-		c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
-		TQString::fromLatin1( "/" ) +
-	c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+	TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+		TQString::tqfromLatin1( "/" ) +
+		c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+		TQString::tqfromLatin1( "/" ) +
+	c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
 		date.toString(".yyyyMM");
 
-	TQString filename=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ;
+	TQString filename=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ;
 
 	//Check if there is a kopete 0.7.x file
 	TQFileInfo fi(filename);
 	if(!fi.exists())
 	{
-		name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
-			TQString::fromLatin1( "/" ) +
-			c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+		name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+			TQString::tqfromLatin1( "/" ) +
+			c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
 			date.toString(".yyyyMM");
 
-		TQString filename2=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ;
+		TQString filename2=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ;
 
 		TQFileInfo fi2(filename2);
 		if(fi2.exists())
@@ -702,7 +702,7 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c)
 
 	// BEGIN check if there are Kopete 0.7.x
 	TQDir d1(locateLocal("data",TQString("kopete/logs/")+
-		c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-"))
+		c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
 		));
 	d1.setFilter( TQDir::Files | TQDir::NoSymLinks );
 	d1.setSorting( TQDir::Name );
@@ -712,10 +712,10 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c)
 
 	while ( (fi = it1.current()) != 0 )
 	{
-		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )))
+		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )))
 		{
 			rx.search(fi->fileName());
-			int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt();
+			int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt();
 
 			if(result < 0)
 			{
@@ -730,9 +730,9 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c)
 
 
 	TQDir d(locateLocal("data",TQString("kopete/logs/")+
-		c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) +
-		TQString::fromLatin1( "/" ) +
-		c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )
+		c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
+		TQString::tqfromLatin1( "/" ) +
+		c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
 		));
 
 	d.setFilter( TQDir::Files | TQDir::NoSymLinks );
@@ -742,10 +742,10 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c)
 	TQFileInfoListIterator it( *list );
 	while ( (fi = it.current()) != 0 )
 	{
-		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )))
+		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )))
 		{
 			rx.search(fi->fileName());
-			int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt();
+			int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt();
 			if(result < 0)
 			{
 				kdWarning(14310) << k_funcinfo << "Kopete only found log file made in the future. Check your date!" << endl;
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index a6069289..8cd76682 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -45,7 +45,7 @@ HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQString
 : Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this )
 {
 	KAction *viewMetaContactHistory = new KAction( i18n("View &History" ),
-		TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()),
+		TQString::tqfromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()),
 		actionCollection(), "viewMetaContactHistory" );
 	viewMetaContactHistory->setEnabled(
 		Kopete::ContactList::self()->selectedMetaContacts().count() == 1 );
@@ -136,7 +136,7 @@ void HistoryPlugin::slotViewHistory()
 
 void HistoryPlugin::slotViewCreated( KopeteView* v )
 {
-	if(v->plugin()->pluginInfo()->pluginName() != TQString::fromLatin1("kopete_chatwindow") )
+	if(v->plugin()->pluginInfo()->pluginName() != TQString::tqfromLatin1("kopete_chatwindow") )
 		return;  //Email chat windows are not supported.
 
 	bool autoChatWindow = HistoryConfig::auto_chatwindow();
diff --git a/kopete/plugins/history/historypreferences.cpp b/kopete/plugins/history/historypreferences.cpp
index 81fd216b..370e6721 100644
--- a/kopete/plugins/history/historypreferences.cpp
+++ b/kopete/plugins/history/historypreferences.cpp
@@ -20,7 +20,7 @@
 #include "historyprefsui.h"
 
 #include <kgenericfactory.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui
index 558c68a2..36f3dee2 100644
--- a/kopete/plugins/history/historyprefsui.ui
+++ b/kopete/plugins/history/historyprefsui.ui
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>90</height>
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index 8d7ca4b2..af9f1bce 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>300</width>
             <height>200</height>
@@ -35,7 +35,7 @@
         </property>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="name">
                         <cstring>statusLabel</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>20</height>
@@ -64,7 +64,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -109,13 +109,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>150</width>
                             <height>32767</height>
@@ -136,7 +136,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>tqlayout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -160,13 +160,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>140</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -207,13 +207,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>0</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -237,7 +237,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>0</width>
                         <height>0</height>
@@ -253,7 +253,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -323,7 +323,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index 9aa61c05..e4062905 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 #include <tqimage.h>
 #include <tqregexp.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 #include "kopetechatsession.h"
 #include "kopeteview.h"
@@ -64,7 +64,7 @@ void LatexGUIClient::slotPreview()
 	}
 
 	msg=Kopete::Message( msg.from() , msg.to() ,
-						 i18n("<b>Preview of the latex message :</b> <br />%1").arg(msg.plainBody()),
+						 i18n("<b>Preview of the latex message :</b> <br />%1").tqarg(msg.plainBody()),
 						 Kopete::Message::Internal , Kopete::Message::RichText);
 	m_manager->appendMessage(msg) ;
 }
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index d6b636a6..4b0ab594 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -20,7 +20,7 @@
 #include <tqimage.h>
 #include <tqbuffer.h>
 #include <tqcstring.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -145,7 +145,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg )
 				TQBuffer buffer( ba );
 				buffer.open( IO_WriteOnly );
 				renderedImage.save( &buffer, "PNG" );
-				TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").arg( KCodecs::base64Encode( ba ) );
+				TQString imageURL = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) );
 				replaceMap[match] = imageURL;
 			}
 			#else
@@ -230,9 +230,9 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula)
 	int hDPI, vDPI;
 	hDPI = LatexConfig::self()->horizontalDPI();
 	vDPI = LatexConfig::self()->verticalDPI();
-	p << m_convScript <<  argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.arg(fileName) /*<< argumentFormat*/ << latexFormula  ;
+	p << m_convScript <<  argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.tqarg(fileName) /*<< argumentFormat*/ << latexFormula  ;
 			
-	kdDebug() << k_funcinfo  << " Rendering " << m_convScript << " " <<  argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl;
+	kdDebug() << k_funcinfo  << " Rendering " << m_convScript << " " <<  argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.tqarg(fileName) << endl;
 			
 	// FIXME our sucky sync filter API limitations :-)
 	p.start(KProcess::Block);
diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp
index 86143114..ff02c831 100644
--- a/kopete/plugins/latex/latexpreferences.cpp
+++ b/kopete/plugins/latex/latexpreferences.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <kparts/componentfactory.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui
index 2d036a3c..bad68932 100644
--- a/kopete/plugins/latex/latexprefsbase.ui
+++ b/kopete/plugins/latex/latexprefsbase.ui
@@ -50,7 +50,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -59,7 +59,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -83,7 +83,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>280</width>
                                     <height>20</height>
@@ -94,7 +94,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -128,7 +128,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
index a8e0c383..889d4d30 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobject.h>
 #include <tqcheckbox.h>
 
diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui
index f8fd22c7..cf90dc57 100644
--- a/kopete/plugins/motionautoaway/motionawayprefs.ui
+++ b/kopete/plugins/motionautoaway/motionawayprefs.ui
@@ -60,7 +60,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout21</cstring>
+                        <cstring>tqlayout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -87,7 +87,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>95</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -136,7 +136,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -174,7 +174,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -201,7 +201,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -212,7 +212,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -241,7 +241,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>180</width>
                                     <height>20</height>
@@ -260,7 +260,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 5fb799c1..711dc665 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -64,7 +64,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg)
 		MSNInvitation::parseInvitation(msg); //for the cookie
 
 		unsigned int result = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
-					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).arg(m_contact->metaContact()->displayName()),
+					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).tqarg(m_contact->metaContact()->displayName()),
 					i18n("MSN Plugin") , i18n("Accept"),i18n("Refuse"));
 
 		MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@@ -162,7 +162,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 	
 	KConfig *config=KGlobal::config();
 	config->setGroup("Netmeeting Plugin");
-	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
+	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").tqarg(ip_address);
 	
 	kdDebug() << k_funcinfo << app <<  endl ;
 	
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 69003a12..313eb197 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <kcombobox.h>
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index 0c0838fb..5725a2ae 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -26,7 +26,7 @@
 
 This is not the same as webcam chat you can find in the newer Windows Messenger®,  but uses the older NetMeeting chat you can find in old versions.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -46,7 +46,7 @@ This is not the same as webcam chat you can find in the newer Windows MessengerÂ
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -98,7 +98,7 @@ This is not the same as webcam chat you can find in the newer Windows MessengerÂ
             <property name="text">
                 <string>&lt;b&gt;%1&lt;/b&gt; will be replaced by the ip to call</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -112,7 +112,7 @@ This is not the same as webcam chat you can find in the newer Windows MessengerÂ
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>60</height>
diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp
index 78d6914b..fe58aba4 100644
--- a/kopete/plugins/nowlistening/nljuk.cpp
+++ b/kopete/plugins/nowlistening/nljuk.cpp
@@ -58,7 +58,7 @@ void NLJuk::update()
 		
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Album");
+			arg << TQString::tqfromLatin1("Album");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
@@ -72,7 +72,7 @@ void NLJuk::update()
 		
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Artist");
+			arg << TQString::tqfromLatin1("Artist");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
@@ -86,7 +86,7 @@ void NLJuk::update()
 
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Title");
+			arg << TQString::tqfromLatin1("Title");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a9148187..4c929a4c 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -298,7 +298,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				// KDE4 TODO: Use the new status message framework, and remove this "hack".
 				if( isPlaying )
 				{
-					advert = TQString("[Music]%1").arg(mediaList);
+					advert = TQString("[Music]%1").tqarg(mediaList);
 				}
 
 			}
@@ -308,7 +308,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				{
 					// Check for the now listening message in parenthesis, 
 					// include the header to not override other messages in parenthesis.
-					TQRegExp statusSong( TQString(" \\(%1.*\\)$").arg( NowListeningConfig::header()) );
+					TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) );
 					
 					// HACK: Don't keep appending the now listened song. Replace it in the status message.
 					advert = a->myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString();
@@ -318,11 +318,11 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 					{
 						if(statusSong.search(advert) != -1)
 						{
-							advert = advert.replace(statusSong, TQString(" (%1)").arg(mediaPlayerAdvert(false)) );
+							advert = advert.replace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) );
 						}
 						else
 						{
-							advert += TQString(" (%1)").arg( mediaPlayerAdvert(false) );
+							advert += TQString(" (%1)").tqarg( mediaPlayerAdvert(false) );
 						}
 					}
 					else
@@ -336,7 +336,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				}
 			}
 
-			a->setOnlineStatus(a->myself()->onlineStatus(), advert);
+			a->setOnlineStatus(a->myself()->onlinetqStatus(), advert);
 		}
 	}
 }
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index 9770bd6b..bd0cb983 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -19,7 +19,7 @@
 */
 #include <tqspinbox.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <klistbox.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index 125ff80b..21d2f0e9 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -32,7 +32,7 @@
             <property name="text">
                 <string>&lt;b&gt;Share Your Musical Taste&lt;/b&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
@@ -64,7 +64,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -86,13 +86,13 @@
                                     <string>%track, %artist, %album, %player will be substituted if known.
 Expressions in brackets depend on a substitution being made.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -105,7 +105,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>Start with:</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -127,7 +127,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>For each track:</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -149,7 +149,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>Conjunction (if &gt;1 track):</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -178,7 +178,7 @@ Expressions in brackets depend on a substitution being made.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -259,7 +259,7 @@ in place of your status message.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -281,7 +281,7 @@ in place of your status message.</string>
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout2_2</cstring>
+                            <cstring>tqlayout2_2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -332,7 +332,7 @@ in place of your status message.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -352,7 +352,7 @@ in place of your status message.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs
index 80854a86..4884da4f 100644
--- a/kopete/plugins/smpppdcs/Changelog.smpppdcs
+++ b/kopete/plugins/smpppdcs/Changelog.smpppdcs
@@ -19,7 +19,7 @@ Changelog
 * using KConfigXT for configuration
 * using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package),
   no more own implementation
-* experimental implementation of the the KDED-NetworkStatus (not active, yet)
+* experimental implementation of the the KDED-NetworktqStatus (not active, yet)
 * significantly speeded up automatic detection of a SMPPPD
 * BUGFIX: reloading the plugin in a already running Kopete will no more 
   result in an inactive plugin
diff --git a/kopete/plugins/smpppdcs/detector.h b/kopete/plugins/smpppdcs/detector.h
index 094de9e5..1889a84f 100644
--- a/kopete/plugins/smpppdcs/detector.h
+++ b/kopete/plugins/smpppdcs/detector.h
@@ -48,7 +48,7 @@ public:
      */
 	virtual ~Detector() {}
 
-    virtual void checkStatus() const = 0;
+    virtual void checktqStatus() const = 0;
 	
 	virtual void smpppdServerChange() {}
 
diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp
index f1ed21b5..ca800e7f 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.cpp
+++ b/kopete/plugins/smpppdcs/detectornetstat.cpp
@@ -27,7 +27,7 @@ DetectorNetstat::~DetectorNetstat() {
     delete m_process;
 }
 
-void DetectorNetstat::checkStatus() const {
+void DetectorNetstat::checktqStatus() const {
     kdDebug(14312) << k_funcinfo << endl;
 
     if(m_process) {
@@ -59,14 +59,14 @@ void DetectorNetstat::checkStatus() const {
 void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) {
     // Look for a default gateway
     kdDebug(14312) << k_funcinfo << endl;
-    m_buffer += TQString::fromLatin1(buffer, buflen);
+    m_buffer += TQString::tqfromLatin1(buffer, buflen);
     kdDebug(14312) << m_buffer << endl;
 }
 
 void DetectorNetstat::slotProcessExited(KProcess *process) {
     kdDebug(14312) << k_funcinfo << m_buffer << endl;
     if(process == m_process) {
-        m_connector->setConnectedStatus(m_buffer.contains("default"));
+        m_connector->setConnectedtqStatus(m_buffer.contains("default"));
         m_buffer = TQString();
         delete m_process;
         m_process = 0L;
diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h
index 548b903f..1f6d1161 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.h
+++ b/kopete/plugins/smpppdcs/detectornetstat.h
@@ -38,7 +38,7 @@ public:
     DetectorNetstat(IConnector* connector);
     virtual ~DetectorNetstat();
 
-    virtual void checkStatus() const;
+    virtual void checktqStatus() const;
 
 private slots:
     // Original cs-plugin code
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
index e2b1ae19..e8af4158 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
@@ -22,44 +22,44 @@
 #include "iconnector.h"
 #include "detectornetworkstatus.h"
 
-DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector) 
+DetectorNetworktqStatus::DetectorNetworktqStatus(IConnector* connector) 
 	: Detector(connector), m_connManager(NULL) {
 	
 	m_connManager = ConnectionManager::self();
-	connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)),
-			this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus)));
+	connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)),
+			this, TQT_SLOT(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)));
 }
 
-DetectorNetworkStatus::~DetectorNetworkStatus() {}
+DetectorNetworktqStatus::~DetectorNetworktqStatus() {}
 
-void DetectorNetworkStatus::checkStatus() const {
+void DetectorNetworktqStatus::checktqStatus() const {
 	// needs to do nothing
 }
 
-void DetectorNetworkStatus::statusChanged(const TQString& host, NetworkStatus::EnumStatus status) {
+void DetectorNetworktqStatus::statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status) {
 	switch(status) {
-		case NetworkStatus::Offline:
+		case NetworktqStatus::Offline:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl;
 			break;
-		case NetworkStatus::OfflineFailed:
+		case NetworktqStatus::OfflineFailed:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl;
 			break;
-		case NetworkStatus::OfflineDisconnected:
+		case NetworktqStatus::OfflineDisconnected:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl;
 			break;
-		case NetworkStatus::ShuttingDown:
+		case NetworktqStatus::ShuttingDown:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl;
 			break;
-		case NetworkStatus::Establishing:
+		case NetworktqStatus::Establishing:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl;
 			break;
-		case NetworkStatus::Online:
+		case NetworktqStatus::Online:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl;
 			break;
-		case NetworkStatus::NoNetworks:
+		case NetworktqStatus::NoNetworks:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl;
 			break;
-		case NetworkStatus::Unreachable:
+		case NetworktqStatus::Unreachable:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Unreachable" << endl;
 			break;
 	}
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.h b/kopete/plugins/smpppdcs/detectornetworkstatus.h
index 850be008..1c1896e6 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.h
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.h
@@ -27,22 +27,22 @@ class ConnectionManager;
 /**
 	@author Heiko Sch&auml;fer <heiko@rangun.de>
 */
-class DetectorNetworkStatus : protected TQObject, public Detector
+class DetectorNetworktqStatus : protected TQObject, public Detector
 {
 	Q_OBJECT
   TQ_OBJECT
 	
-	DetectorNetworkStatus(const DetectorNetworkStatus&);
-	DetectorNetworkStatus& operator=(const DetectorNetworkStatus&);
+	DetectorNetworktqStatus(const DetectorNetworktqStatus&);
+	DetectorNetworktqStatus& operator=(const DetectorNetworktqStatus&);
 
 public:
-    DetectorNetworkStatus(IConnector* connector);
-    virtual ~DetectorNetworkStatus();
+    DetectorNetworktqStatus(IConnector* connector);
+    virtual ~DetectorNetworktqStatus();
 	
-	virtual void checkStatus() const;
+	virtual void checktqStatus() const;
 
 protected slots:
-	void statusChanged(const TQString& host, NetworkStatus::EnumStatus status);
+	void statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status);
 	
 private:
 	ConnectionManager * m_connManager;
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 772090d9..1b932d6d 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -31,9 +31,9 @@ DetectorSMPPPD::DetectorSMPPPD(IConnector * connector)
 DetectorSMPPPD::~DetectorSMPPPD() {}
 
 /*!
-    \fn DetectorSMPPPD::checkStatus()
+    \fn DetectorSMPPPD::checktqStatus()
  */
-void DetectorSMPPPD::checkStatus() const {
+void DetectorSMPPPD::checktqStatus() const {
     kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl;
 
 #ifndef NOKINTERNETDCOP
@@ -41,10 +41,10 @@ void DetectorSMPPPD::checkStatus() const {
     if(kapp->dcopClient() && m_kinternetApp != "") {
         switch(getConnectionStatusDCOP()) {
         case CONNECTED:
-            m_connector->setConnectedStatus(true);
+            m_connector->setConnectedtqStatus(true);
             return;
         case DISCONNECTED:
-            m_connector->setConnectedStatus(false);
+            m_connector->setConnectedtqStatus(false);
             return;
         default:
             break;
@@ -63,9 +63,9 @@ void DetectorSMPPPD::checkStatus() const {
 	c.setPassword(SMPPPDCSConfig::self()->password().utf8());
 
     if(c.connect(server, port)) {
-        m_connector->setConnectedStatus(c.isOnline());
+        m_connector->setConnectedtqStatus(c.isOnline());
     } else {
         kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl;
-        m_connector->setConnectedStatus(false);
+        m_connector->setConnectedtqStatus(false);
     }
 }
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.h b/kopete/plugins/smpppdcs/detectorsmpppd.h
index 197fe65b..cba377e0 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.h
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.h
@@ -39,7 +39,7 @@ public:
     DetectorSMPPPD(IConnector* connector);
     virtual ~DetectorSMPPPD();
 
-    virtual void checkStatus() const;
+    virtual void checktqStatus() const;
 
 };
 
diff --git a/kopete/plugins/smpppdcs/iconnector.h b/kopete/plugins/smpppdcs/iconnector.h
index c4846862..ab63ec71 100644
--- a/kopete/plugins/smpppdcs/iconnector.h
+++ b/kopete/plugins/smpppdcs/iconnector.h
@@ -37,9 +37,9 @@ public:
      * This method needs to get reimplemented at classes which implement
      * this interface.
      *
-     * @param newStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
+     * @param newtqStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
      */
-    virtual void setConnectedStatus(bool newStatus) = 0;
+    virtual void setConnectedtqStatus(bool newtqStatus) = 0;
 };
 
 #endif
diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
index 1868893f..ef29d992 100644
--- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
+++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
@@ -96,7 +96,7 @@ bool Unsettled::connect(Client * client, const TQString& server, uint port) {
                       clg.exactMatch(response)) {
 				if(password(client) != TQString()) {
                     // we are challenged, ok, respond
-					write(client, TQString("response = %1\n").arg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
+					write(client, TQString("response = %1\n").tqarg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
                     response = read(client)[0];
                     if(ver.exactMatch(response)) {
 						setServerID(client, response);
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.cpp b/kopete/plugins/smpppdcs/onlineinquiry.cpp
index 4cab45d7..99dc7d5c 100644
--- a/kopete/plugins/smpppdcs/onlineinquiry.cpp
+++ b/kopete/plugins/smpppdcs/onlineinquiry.cpp
@@ -35,11 +35,11 @@ bool OnlineInquiry::isOnline(bool useSMPPPD) {
 		m_detector = new DetectorNetstat(this);
     }
 	
-	m_detector->checkStatus();
+	m_detector->checktqStatus();
 
     return m_online;
 }
 
-void OnlineInquiry::setConnectedStatus(bool newStatus) {
-    m_online = newStatus;
+void OnlineInquiry::setConnectedtqStatus(bool newtqStatus) {
+    m_online = newtqStatus;
 }
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.h b/kopete/plugins/smpppdcs/onlineinquiry.h
index 278c1e9f..7a0fcef2 100644
--- a/kopete/plugins/smpppdcs/onlineinquiry.h
+++ b/kopete/plugins/smpppdcs/onlineinquiry.h
@@ -35,7 +35,7 @@ public:
 
     bool isOnline(bool useSMPPPD);
 
-    virtual void setConnectedStatus(bool newStatus);
+    virtual void setConnectedtqStatus(bool newtqStatus);
 
 private:
     Detector * m_detector;
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
index f17f2ca9..0aad71d0 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppd
 
 SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */)
         : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name),
-        m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(NULL), m_timer(NULL),
+        m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL),
 m_onlineInquiry(NULL) {
 
     kdDebug(14312) << k_funcinfo << endl;
@@ -51,7 +51,7 @@ m_onlineInquiry(NULL) {
     m_detectorNetstat = new DetectorNetstat(this);
 
     // experimental, not used yet
-    m_detectorNetworkStatus = new DetectorNetworkStatus(this);
+    m_detectorNetworktqStatus = new DetectorNetworktqStatus(this);
 
     // we wait for the allPluginsLoaded signal, to connect
     // as early as possible after startup, but not before
@@ -72,7 +72,7 @@ SMPPPDCSPlugin::~SMPPPDCSPlugin() {
     delete m_timer;
     delete m_detectorSMPPPD;
     delete m_detectorNetstat;
-    delete m_detectorNetworkStatus;
+    delete m_detectorNetworktqStatus;
     delete m_onlineInquiry;
 }
 
@@ -80,7 +80,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() {
 
     if(Kopete::PluginManager::self()->isAllPluginsLoaded()) {
         m_timer = new TQTimer();
-        connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
+        connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
 
 		if(SMPPPDCSConfig::self()->useSmpppd()) {
             m_timer->start(30000);
@@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() {
             m_timer->start(60000);
         }
 
-        slotCheckStatus();
+        slotChecktqStatus();
     }
 }
 
@@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const {
 	return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd());
 }
 
-void SMPPPDCSPlugin::slotCheckStatus() {
+void SMPPPDCSPlugin::slotChecktqStatus() {
 	
 	// reread config to get changes
 	SMPPPDCSConfig::self()->readConfig();
 	
 	if(SMPPPDCSConfig::self()->useSmpppd()) {
-        m_detectorSMPPPD->checkStatus();
+        m_detectorSMPPPD->checktqStatus();
     } else {
-        m_detectorNetstat->checkStatus();
+        m_detectorNetstat->checktqStatus();
     }
 }
 
-void SMPPPDCSPlugin::setConnectedStatus( bool connected ) {
+void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) {
     kdDebug(14312) << k_funcinfo << connected << endl;
 
     // We have to handle a few cases here. First is the machine is connected, and the plugin thinks
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h
index 5214ecc5..24697ca7 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.h
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h
@@ -77,7 +77,7 @@ public:
      *
      * @see SMPPPDCSPrefs
      */
-    virtual void setConnectedStatus( bool newStatus );
+    virtual void setConnectedtqStatus( bool newtqStatus );
 
     virtual TQString detectionMethod() const;
 
@@ -87,7 +87,7 @@ public slots:
     void smpppdServerChanged(const TQString& server);
 
 private slots:
-    void slotCheckStatus();
+    void slotChecktqStatus();
     void allPluginsLoaded();
 
 private:
@@ -99,7 +99,7 @@ private:
 
     Detector      * m_detectorSMPPPD;
     Detector      * m_detectorNetstat;
-    Detector      * m_detectorNetworkStatus;
+    Detector      * m_detectorNetworktqStatus;
     bool            m_pluginConnected;
     TQTimer        * m_timer;
     OnlineInquiry * m_onlineInquiry;
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index a722dc32..3c486135 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <tqradiobutton.h>
 
@@ -54,7 +54,7 @@ SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name
 		}
 		
 		if(it.current()->inherits("Kopete::ManagedConnectionAccount")) {
-			protoName += TQString(", %1").arg(i18n("connection status is managed by Kopete"));
+			protoName += TQString(", %1").tqarg(i18n("connection status is managed by Kopete"));
 		}
 		
 		TQCheckListItem * cli = new TQCheckListItem(m_ui->accountList, 
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index efe7ede5..1bbb6664 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -37,7 +37,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -54,7 +54,7 @@
                                     <cstring>csMethod</cstring>
                                 </property>
                                 <property name="title">
-                                    <string>Method of Connection Status Detection</string>
+                                    <string>Method of Connection tqStatus Detection</string>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -120,7 +120,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>341</width>
                                                         <height>20</height>
@@ -168,7 +168,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -203,7 +203,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>6</height>
diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui
index e10c3c3a..6b22e3f9 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationui.ui
+++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -101,7 +101,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
index a06e30a9..cfb103c2 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
@@ -64,7 +64,7 @@ void SMPPPDSearcher::searchNetwork() {
 void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) {
     kdDebug(14312) << k_funcinfo << endl;
 
-    TQString myBuf = TQString::fromLatin1(buf,len);
+    TQString myBuf = TQString::tqfromLatin1(buf,len);
     TQRegExp rex("^[ ]{10}.*inet addr:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*Mask:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})");
     // tokenize the string into lines
     TQStringList toks = TQStringList::split("\n", myBuf);
@@ -82,7 +82,7 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf
     kdDebug(14312) << k_funcinfo << endl;
 
     TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*");
-    TQString myBuf = TQString::fromLatin1(buf,len);
+    TQString myBuf = TQString::tqfromLatin1(buf,len);
 
     if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) {
         // if netstat -r found no gateway we search the network
diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp
index d811e4d2..c178b39b 100644
--- a/kopete/plugins/statistics/statisticscontact.cpp
+++ b/kopete/plugins/statistics/statisticscontact.cpp
@@ -28,10 +28,10 @@
 #include "statisticscontact.h"
 #include "statisticsdb.h"
 
-StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldStatus(Kopete::OnlineStatus::Unknown)
+StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldtqStatus(Kopete::OnlineStatus::Unknown)
 {
 	m_isChatWindowOpen = false;
-	m_oldStatusDateTime = TQDateTime::currentDateTime();
+	m_oldStatusDateTime = TQDateTime::tqcurrentDateTime();
 	
 	// Last*Changed are always false at start
 	m_timeBetweenTwoMessagesChanged  = false;
@@ -60,7 +60,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
 	// Generate statisticsContactId or get it from database
 	TQStringList buffer = m_db->query(TQString("SELECT statisticid FROM contacts "
 						"WHERE contactid LIKE '%1';"
-						).arg(c->contactId()));
+						).tqarg(c->contactId()));
 
 	if (buffer.isEmpty())
 	{
@@ -68,7 +68,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
 		if ( !c->metaContact()->metaContactId().isEmpty() &&
 			!m_db->query(TQString("SELECT metacontactid FROM commonstats "
 						"WHERE metacontactid LIKE '%1';"
-						).arg(c->metaContact()->metaContactId())).isEmpty())
+						).tqarg(c->metaContact()->metaContactId())).isEmpty())
 		{
 			// Use old style id
 			m_statisticsContactId = c->metaContact()->metaContactId();
@@ -81,7 +81,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
 		
 		// Assign contactId to m_statisticsContactId
 		m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');"
-				).arg(m_statisticsContactId).arg(c->contactId()));
+				).tqarg(m_statisticsContactId).tqarg(c->contactId()));
 	}
 	else
 	{
@@ -107,7 +107,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
 	
 	
 	// Get last time a message was received
-	m_lastMessageReceived = TQDateTime::currentDateTime();
+	m_lastMessageReceived = TQDateTime::tqcurrentDateTime();
 
 
 	// Check for lastPresent
@@ -129,11 +129,11 @@ void StatisticsContact::contactAdded( Kopete::Contact *c )
 		// Check if contact is allready in database if not add it
 		if (m_db->query(TQString("SELECT id FROM contacts "
 					"WHERE statisticid LIKE '%1' AND contactid LIKE '%2';"
-					).arg(m_statisticsContactId).arg(c->contactId())).isEmpty())
+					).tqarg(m_statisticsContactId).tqarg(c->contactId())).isEmpty())
 		{
 			// Assign contactId to m_statisticsContactId
 			m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');"
-				   ).arg(m_statisticsContactId).arg(c->contactId()));
+				   ).tqarg(m_statisticsContactId).tqarg(c->contactId()));
 		}
 		kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
 	}
@@ -151,7 +151,7 @@ void StatisticsContact::contactRemoved( Kopete::Contact *c )
 	
 	kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
 	m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1' AND contactid LIKE '%2';"
-			   ).arg(m_statisticsContactId).arg(c->contactId()));
+			   ).tqarg(m_statisticsContactId).tqarg(c->contactId()));
 }
 
 void StatisticsContact::removeFromDB()
@@ -160,9 +160,9 @@ void StatisticsContact::removeFromDB()
 		return;
 	
 	kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
-	m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").arg(m_statisticsContactId));
-	m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId));
-	m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId));
+	m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").tqarg(m_statisticsContactId));
+	m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId));
+	m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId));
 	
 	m_statisticsContactId = TQString();
 }
@@ -176,7 +176,7 @@ void StatisticsContact::commonStatsSave(const TQString name, const TQString stat
 		return;
 	
 	m_db->query(TQString("UPDATE commonstats SET statvalue1 = '%1', statvalue2='%2'"
-			"WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").arg(statVar1).arg(statVar2).arg(name).arg(m_statisticsContactId));
+			"WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").tqarg(statVar1).tqarg(statVar2).tqarg(name).tqarg(m_statisticsContactId));
 	
 }
 
@@ -196,7 +196,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1
 	if (m_statisticsContactId.isEmpty())
 		return;
 	
-	TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").arg(name, m_statisticsContactId));
+	TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").tqarg(name, m_statisticsContactId));
 	if (!buffer.isEmpty())
 	{
 		statVar1 = buffer[0];
@@ -204,7 +204,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1
 	}
 	else
 	{
-		m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").arg(m_statisticsContactId, name));
+		m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").tqarg(m_statisticsContactId, name));
 		statVar1 = defaultValue1;
 		statVar2 = defaultValue2;
 	}
@@ -234,18 +234,18 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1
 void StatisticsContact::newMessageReceived(Kopete::Message& m)
 {
 	kdDebug() << "statistics: new message received" << endl;
-	TQDateTime currentDateTime = TQDateTime::currentDateTime();
+	TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
 	
 	if (m_timeBetweenTwoMessagesOn != -1 && m_isChatWindowOpen)
 	{
-		m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(currentDateTime))/(1 + m_timeBetweenTwoMessagesOn);
+		m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(tqcurrentDateTime))/(1 + m_timeBetweenTwoMessagesOn);
 
 	}
 	
 	setIsChatWindowOpen(true);
 	
 	m_timeBetweenTwoMessagesOn += 1;
-	m_lastMessageReceived = currentDateTime;
+	m_lastMessageReceived = tqcurrentDateTime;
 	
 	
 	// Message lenght
@@ -254,7 +254,7 @@ void StatisticsContact::newMessageReceived(Kopete::Message& m)
 	
 	// Last talked
 	/// @todo do this in message sent too. So we need setLastTalk()
-	m_lastTalk = currentDateTime;
+	m_lastTalk = tqcurrentDateTime;
 	
 	m_messageLengthChanged = true;
 	m_lastTalkChanged = true;
@@ -269,32 +269,32 @@ void StatisticsContact::onlineStatusChanged(Kopete::OnlineStatus::StatusType sta
 	if (m_statisticsContactId.isEmpty())
 		return;
 	
-	TQDateTime currentDateTime = TQDateTime::currentDateTime();
+	TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
 	
-	/// We don't want to log if oldStatus is unknown
+	/// We don't want to log if oldtqStatus is unknown
 	/// the change could not be a real one; see StatisticsPlugin::slotMySelfOnlineStatusChanged
-	if (m_oldStatus != Kopete::OnlineStatus::Unknown)
+	if (m_oldtqStatus != Kopete::OnlineStatus::Unknown)
 	{
 		
-		kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldStatus) << endl;
+		kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldtqStatus) << endl;
 		m_db->query(TQString("INSERT INTO contactstatus "
 		"(metacontactid, status, datetimebegin, datetimeend) "
-				"VALUES('%1', '%2', '%3', '%4'" ");").arg(m_statisticsContactId).arg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).arg(TQString::number(m_oldStatusDateTime.toTime_t())).arg(TQString::number(currentDateTime.toTime_t())));
+				"VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldtqStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(tqcurrentDateTime.toTime_t())));
 	}
 	
-	if (m_oldStatus == Kopete::OnlineStatus::Online || m_oldStatus == Kopete::OnlineStatus::Away)
+	if (m_oldtqStatus == Kopete::OnlineStatus::Online || m_oldtqStatus == Kopete::OnlineStatus::Away)
 	// If the last status was Online or Away, the last time contact was present is the time he goes offline
 	{
-		m_lastPresent = currentDateTime;
+		m_lastPresent = tqcurrentDateTime;
 		m_lastPresentChanged = true;
 	}
 
-	m_oldStatus = status;
-	m_oldStatusDateTime = currentDateTime;
+	m_oldtqStatus = status;
+	m_oldStatusDateTime = tqcurrentDateTime;
 
 }
 
-bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status)
+bool StatisticsContact::wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status)
 {
 	if (m_statisticsContactId.isEmpty())
 		return false;
@@ -303,7 +303,7 @@ bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusTyp
 			"FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 "
 			"AND status LIKE '%4' "
 			"ORDER BY datetimebegin;"
-		).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t()).arg(Kopete::OnlineStatus::statusTypeToString(status)));	
+		).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t()).tqarg(Kopete::OnlineStatus::statusTypeToString(status)));	
 	
 	if (!values.isEmpty()) return true;
 	
@@ -318,7 +318,7 @@ TQString StatisticsContact::statusAt(TQDateTime dt)
 	TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
 			"FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 "
 			"ORDER BY datetimebegin;"
-			).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t()));	
+			).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t()));	
 	
 	if (!values.isEmpty()) return Kopete::OnlineStatus(Kopete::OnlineStatus::statusStringToType(values[0])).description();
 	else return "";
@@ -337,7 +337,7 @@ TQString StatisticsContact::mainStatusDate(const TQDate& date)
 			"(datetimebegin >= %2 AND datetimebegin <= %3 OR "
 			"datetimeend >= %4 AND datetimeend <= %5) "
 			"ORDER BY datetimebegin;"
-							 ).arg(m_statisticsContactId).arg(dt1.toTime_t()).arg(dt2.toTime_t()).arg(dt1.toTime_t()).arg(dt2.toTime_t());
+							 ).tqarg(m_statisticsContactId).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t()).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t());
 	kdDebug() << request << endl;
 	TQStringList values = m_db->query(request);
 	
@@ -389,8 +389,8 @@ TQValueList<TQTime> StatisticsContact::mainEvents(const Kopete::OnlineStatus::St
 	if (m_statisticsContactId.isEmpty())
 		return mainEvents;
 	
-	TQDateTime currentDateTime = TQDateTime::currentDateTime();
-	buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").arg(m_statisticsContactId));
+	TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+	buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").tqarg(m_statisticsContactId));
 	
 	
 	// Only select the events for which the previous is not Unknown AND the status is status.
diff --git a/kopete/plugins/statistics/statisticscontact.h b/kopete/plugins/statistics/statisticscontact.h
index 9d7f6575..1559e1fd 100644
--- a/kopete/plugins/statistics/statisticscontact.h
+++ b/kopete/plugins/statistics/statisticscontact.h
@@ -55,9 +55,9 @@ public:
 	TQString statisticsContactId() { return m_statisticsContactId; }
 	
 	/** \brief Access method
-	 *  \return m_oldStatus
+	 *  \return m_oldtqStatus
 	 */
-	Kopete::OnlineStatus::StatusType oldStatus() { return m_oldStatus; }
+	Kopete::OnlineStatus::StatusType oldtqStatus() { return m_oldtqStatus; }
 	
 	/** \brief Access method
 	 *  \return m_oldStatusDateTime
@@ -106,7 +106,7 @@ public:
 	/**
 	 * \returns true if contact was status at dt, false else.
 	 */
-	bool wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status);
+	bool wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status);
 	
 	/**
 	 * \returns the status of the contact at dt. Return false if dt is invalid.
@@ -209,9 +209,9 @@ private:
 	
 	/** 
 	 * The interest of statistics contact is to manage the changes of status
-	 * in order to correctly update the database. That's why here we keep the oldStatus
+	 * in order to correctly update the database. That's why here we keep the oldtqStatus
 	 */
-	Kopete::OnlineStatus::StatusType m_oldStatus;
+	Kopete::OnlineStatus::StatusType m_oldtqStatus;
 	/// We keep the old status datetime here
 	TQDateTime m_oldStatusDateTime;
 		
diff --git a/kopete/plugins/statistics/statisticsdcopiface.h b/kopete/plugins/statistics/statisticsdcopiface.h
index 9a769935..36336ae2 100644
--- a/kopete/plugins/statistics/statisticsdcopiface.h
+++ b/kopete/plugins/statistics/statisticsdcopiface.h
@@ -60,15 +60,15 @@ k_dcop:
 	/**
 	 * \returns return the status of the contact at datetime.
 	 */
-	virtual TQString dcopStatus(TQString id, TQString datetime) = 0;
+	virtual TQString dcoptqStatus(TQString id, TQString datetime) = 0;
 	/**
 	 * \returns return the status of the contact at timeStamp.
 	 */
-	virtual TQString dcopStatus(TQString id, int timeStamp) = 0;
+	virtual TQString dcoptqStatus(TQString id, int timeStamp) = 0;
 	/**
 	 * \returns the main status (most used status) of the contact id at date (not time) timeStamp. Will take the day where timeStamp is.
 	 */
-	virtual TQString dcopMainStatus(TQString id, int timeStamp) = 0;
+	virtual TQString dcopMaintqStatus(TQString id, int timeStamp) = 0;
 };
 
 #endif // STATISTICSDCOP_H
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index 9bea7995..3c0a67c1 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -17,9 +17,9 @@
 #include <tqtabwidget.h>
 #include <tqwidget.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcombobox.h>
 #include <tqstring.h>
 
@@ -42,7 +42,7 @@
 
 StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* parent,
 	const char* name) : KDialogBase(parent, name, false,
-	i18n("Statistics for %1").arg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact)
+	i18n("Statistics for %1").tqarg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact)
 {	
 	mainWidget = new StatisticsWidget(this);
 	setMainWidget(mainWidget);
@@ -63,7 +63,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db,
 	mainWidget->tabWidget->setCurrentPage(0);
 	
 	mainWidget->timePicker->setTime(TQTime::currentTime());
-	mainWidget->datePicker->setDate(TQDate::currentDate());
+	mainWidget->datePicker->setDate(TQDate::tqcurrentDate());
 	connect(mainWidget->askButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAskButtonClicked()));
 	
 	setFocus();
@@ -107,7 +107,7 @@ void StatisticsDialog::slotOpenURLRequest(const KURL& url, const KParts::URLArgs
 void StatisticsDialog::generatePageForMonth(const int monthOfYear)
 {
 	TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
-	"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId()));	
+	"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId()));	
 	
 	TQStringList values2;
 	
@@ -129,7 +129,7 @@ void StatisticsDialog::generatePageForMonth(const int monthOfYear)
 void StatisticsDialog::generatePageForDay(const int dayOfWeek)
 {
 	TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
-	"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId()));	
+	"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId()));	
 	
 	TQStringList values2;
 	
@@ -190,8 +190,8 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 	"margin-right: 5px;"
 	"padding:3px 3px 3px 10px;}"
 	"</style></head><body>" + 
-	i18n("<h1>Statistics for %1</h1>").arg(m_contact->metaContact()->displayName()) +
-	"<h3>%1</h3><hr>").arg(subTitle));
+	i18n("<h1>Statistics for %1</h1>").tqarg(m_contact->metaContact()->displayName()) +
+	"<h3>%1</h3><hr>").tqarg(subTitle));
 	
 	generalHTMLPart->write(i18n("<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General summary view\">General</a></b><br>"
 	"<span title=\"Select the a day or a month to view the stat for\"><b>Days: </b>"
@@ -265,7 +265,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 		TQDateTime dateTime2;
 		dateTime2.setTime_t(values[i+2].toInt());
 		
-		if (dateTime1.date() == TQDate::currentDate() || dateTime2.date() == TQDate::currentDate())
+		if (dateTime1.date() == TQDate::tqcurrentDate() || dateTime2.date() == TQDate::tqcurrentDate())
 			today = true;
 		else today = false;
 		
@@ -351,7 +351,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 			}
 			else color="white";
 		
-			todayString.append(TQString("<tr style=\"color:%1\"><td>%2</td><td>%3</td><td>%4</td></tr>").arg(color, status, dateTime1.time().toString(), dateTime2.time().toString()));
+			todayString.append(TQString("<tr style=\"color:%1\"><td>%2</td><td>%3</td><td>%4</td></tr>").tqarg(color, status, dateTime1.time().toString(), dateTime2.time().toString()));
 		
 		}
 		
@@ -386,11 +386,11 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 	// Some "total times"
 	generalHTMLPart->write(i18n("<div class=\"statgroup\">"));
 	generalHTMLPart->write(i18n("<b title=\"The total time I have been able to see %1 status\">"
-		"Total seen time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalTime)));
+		"Total seen time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalTime)));
 	generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 online\">"
-		"Total online time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOnlineTime)));
-	generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 away\">Total busy time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalAwayTime)));
-	generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 offline\">Total offline time :</b> %2 hour(s)").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOfflineTime)));
+		"Total online time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOnlineTime)));
+	generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 away\">Total busy time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalAwayTime)));
+	generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 offline\">Total offline time :</b> %2 hour(s)").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOfflineTime)));
 	generalHTMLPart->write(TQString("</div>"));
 
 	if (subTitle == i18n("General information"))
@@ -399,25 +399,25 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 	 */
 	{
 		generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
-		generalHTMLPart->write(i18n("<b>Average message length :</b> %1 characters<br>").arg(m_contact->messageLength()));
-		generalHTMLPart->write(i18n("<b>Time between two messages : </b> %1 second(s)").arg(m_contact->timeBetweenTwoMessages()));
+		generalHTMLPart->write(i18n("<b>Average message length :</b> %1 characters<br>").tqarg(m_contact->messageLength()));
+		generalHTMLPart->write(i18n("<b>Time between two messages : </b> %1 second(s)").tqarg(m_contact->timeBetweenTwoMessages()));
 		generalHTMLPart->write(TQString("</div>"));
 	
 		generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
-		generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk())));
-		generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent())));
+		generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastTalk())));
+		generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastPresent())));
 		generalHTMLPart->write(TQString("</div>"));
 
 		//generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
-		//generalHTMLPart->write(i18n("<b title=\"%1 uses to set his status online at these hours (EXPERIMENTAL)\">Main online events :</b><br>").arg(m_contact->metaContact()->displayName()));
+		//generalHTMLPart->write(i18n("<b title=\"%1 uses to set his status online at these hours (EXPERIMENTAL)\">Main online events :</b><br>").tqarg(m_contact->metaContact()->displayName()));
 		//TQValueList<TQTime> mainEvents = m_contact->mainEvents(Kopete::OnlineStatus::Online);
 		//for (uint i=0; i<mainEvents.count(); i++)
-		//generalHTMLPart->write(TQString("%1<br>").arg(mainEvents[i].toString()));
+		//generalHTMLPart->write(TQString("%1<br>").tqarg(mainEvents[i].toString()));
 		//generalHTMLPart->write(TQString("</div>"));
  
 		generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">");
-		generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").arg(
-				Kopete::OnlineStatus(m_contact->oldStatus()).description(),
+		generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").tqarg(
+				Kopete::OnlineStatus(m_contact->oldtqStatus()).description(),
 				KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime())));
 		generalHTMLPart->write(TQString("</div>"));
 	}
@@ -440,7 +440,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 				+TQString("\" src=\"file://")
 				+colorPath
 				+"\" width=\"4%\" title=\""
-				+i18n("Between %1:00 and %2:00, I was able to see %3 status %4% of the hour.").arg(i).arg((i+1)%24).arg(m_contact->metaContact()->displayName()).arg(hrWidth)
+				+i18n("Between %1:00 and %2:00, I was able to see %3 status %4% of the hour.").tqarg(i).tqarg((i+1)%24).tqarg(m_contact->metaContact()->displayName()).tqarg(hrWidth)
 				+TQString("\">");
 	}
 	generalHTMLPart->write(chartString);
@@ -478,7 +478,7 @@ void StatisticsDialog::generatePageGeneral()
 	TQStringList values;
 	values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
 				"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;")
-				.arg(m_contact->statisticsContactId()));
+				.tqarg(m_contact->statisticsContactId()));
 	generatePageFromTQStringList(values, i18n("General information"));
 }
 
@@ -524,9 +524,9 @@ void StatisticsDialog::slotAskButtonClicked()
 	if (mainWidget->questionComboBox->currentItem()==0)
 	{
 		TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3")
-		    .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
-		    .arg(m_contact->metaContact()->displayName())
-		    .arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())));
+		    .tqarg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
+		    .tqarg(m_contact->metaContact()->displayName())
+		    .tqarg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())));
 		mainWidget->answerEdit->setText(text);
 	}
 	else if (mainWidget->questionComboBox->currentItem()==1)
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 5e19b73c..b28ce8ce 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -53,7 +53,7 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ
 
 {
 	KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ),
-		TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
+		TQString::tqfromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
 		actionCollection(), "viewMetaContactStatistics" );
 	viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1);
 
@@ -205,59 +205,59 @@ bool StatisticsPlugin::dcopWasOnline(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Online); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Online); 
 }
 
 bool StatisticsPlugin::dcopWasOnline(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Away); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Away); 
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Offline); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Offline); 
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
 }
 
-bool StatisticsPlugin::dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status)
+bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status)
 {
 	kdDebug() << k_funcinfo << "statistics - DCOP wasOnline :" << id << endl;
 	
 	if (dateTime.isValid() && statisticsContactMap.contains(id))
 	{
-		return statisticsContactMap[id]->wasStatus(dateTime, status);
+		return statisticsContactMap[id]->wastqStatus(dateTime, status);
 	}
 	
 	return false;	
 }
 
-TQString StatisticsPlugin::dcopStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcoptqStatus(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);
-	return dcopStatus(id, dt.toString());
+	return dcoptqStatus(id, dt.toString());
 
 }
 
-TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime)
+TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime)
 {
 	TQDateTime dt = TQDateTime::fromString(dateTime);
 	
@@ -269,7 +269,7 @@ TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime)
 	return "";
 }
 
-TQString StatisticsPlugin::dcopMainStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);
diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h
index d6f75c81..467bd6b8 100644
--- a/kopete/plugins/statistics/statisticsplugin.h
+++ b/kopete/plugins/statistics/statisticsplugin.h
@@ -61,7 +61,7 @@ class KActionCollection;
  * 
  * <table>
   * <tr>
- * <td>Event</td><td>Changes to database</td><td>oldStatus</td>
+ * <td>Event</td><td>Changes to database</td><td>oldtqStatus</td>
  * </tr>
   * <tr>
  * <td>John 17:44 Away <i>(connexion)</i></td><td> - <i>(oldstatus was offline)</i></td><td>oldstatus = away </td>
@@ -191,12 +191,12 @@ public slots:
 	bool dcopWasOffline(TQString id, int timeStamp);
 	bool dcopWasOffline(TQString id, TQString dt);
 	
-	bool dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status);
+	bool dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status);
 	
-	TQString dcopStatus(TQString id, TQString dateTime);
-	TQString dcopStatus(TQString id, int timeStamp);
+	TQString dcoptqStatus(TQString id, TQString dateTime);
+	TQString dcoptqStatus(TQString id, int timeStamp);
 	
-	TQString dcopMainStatus(TQString id, int timeStamp);
+	TQString dcopMaintqStatus(TQString id, int timeStamp);
 
 private:	
 	StatisticsDB *m_db;
diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui
index 4c53d8e2..87dd1b4d 100644
--- a/kopete/plugins/statistics/statisticswidget.ui
+++ b/kopete/plugins/statistics/statisticswidget.ui
@@ -52,7 +52,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout11</cstring>
+                                    <cstring>tqlayout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -68,7 +68,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>31</height>
@@ -77,7 +77,7 @@
                                     </spacer>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout9</cstring>
+                                            <cstring>tqlayout9</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -98,7 +98,7 @@
                                             </widget>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>layout7</cstring>
+                                                    <cstring>tqlayout7</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -127,7 +127,7 @@
                                                         <property name="sizeType">
                                                             <enum>Expanding</enum>
                                                         </property>
-                                                        <property name="sizeHint">
+                                                        <property name="tqsizeHint">
                                                             <size>
                                                                 <width>40</width>
                                                                 <height>20</height>
@@ -148,7 +148,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>60</width>
                                                 <height>41</height>
@@ -172,7 +172,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout5</cstring>
+                                    <cstring>tqlayout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -181,12 +181,12 @@
                                     <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
-                                                <string>Contact Status at Date &amp; Time</string>
+                                                <string>Contact tqStatus at Date &amp; Time</string>
                                             </property>
                                         </item>
                                         <item>
                                             <property name="text">
-                                                <string>Most Used Status at Date</string>
+                                                <string>Most Used tqStatus at Date</string>
                                             </property>
                                         </item>
                                         <property name="name">
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index 33aef893..e567f1a8 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index 2dd1ab85..79b1cbde 100644
--- a/kopete/plugins/texteffect/texteffectprefs.ui
+++ b/kopete/plugins/texteffect/texteffectprefs.ui
@@ -96,7 +96,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>81</height>
@@ -206,7 +206,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>279</height>
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 64febcaa..64f2e8e7 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -17,7 +17,7 @@
     *                                                                       *
     *************************************************************************
     Patched by Francesco Rossi <redsh@email.it> in order to support new 
-    google translation page layout (13-sept-2007)
+    google translation page tqlayout (13-sept-2007)
 */
 
 #include <tqapplication.h>
@@ -284,7 +284,7 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	while ( !m_completed[ job ] )
 		tqApp->processEvents();
 
-	TQString data = TQString::fromLatin1( m_data[ job ] );
+	TQString data = TQString::tqfromLatin1( m_data[ job ] );
 
 	// After hacks, we need to clean
 	m_data.remove( job );
@@ -364,7 +364,7 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr
 		msg.setBody( translated, msg.format() );
 		break;
 	case ShowOriginal:
-		msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).arg( translated, msg.plainBody() ), msg.format() );
+		msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).tqarg( translated, msg.plainBody() ), msg.format() );
 		break;
 	case ShowDialog:
 	{
diff --git a/kopete/plugins/translator/translatorprefsbase.ui b/kopete/plugins/translator/translatorprefsbase.ui
index 7a92eccc..7a8d2c5a 100644
--- a/kopete/plugins/translator/translatorprefsbase.ui
+++ b/kopete/plugins/translator/translatorprefsbase.ui
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index d62c9c34..cd7ed095 100644
--- a/kopete/plugins/webpresence/DESIGN
+++ b/kopete/plugins/webpresence/DESIGN
@@ -8,5 +8,5 @@ Every so often, it writes a file containing a snapshot of who is online and who
 
 Use KIO::NetAccess to upload the files!
 
-Getting Info about Local User's Status
+Getting Info about Local User's tqStatus
 Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol.  So we need to know (protocol, uin, status).
diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl
index f768ccf5..5dac1837 100644
--- a/kopete/plugins/webpresence/webpresence_html.xsl
+++ b/kopete/plugins/webpresence/webpresence_html.xsl
@@ -17,7 +17,7 @@
 	<xsl:template match="webpresence">
 		<html>
 			<head>
-				<title>My IM Status</title>
+				<title>My IM tqStatus</title>
 			</head>
 			<body>
 				<p class="name"><xsl:value-of select="name"/></p>
diff --git a/kopete/plugins/webpresence/webpresence_xhtml.xsl b/kopete/plugins/webpresence/webpresence_xhtml.xsl
index 9d749c14..4ba456d5 100644
--- a/kopete/plugins/webpresence/webpresence_xhtml.xsl
+++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl
@@ -16,7 +16,7 @@
 	<xsl:template match="webpresence">
 		<html>
 			<head>
-				<title>My IM Status</title>
+				<title>My IM tqStatus</title>
 			</head>
 			<body>
 				<p class="name"><xsl:value-of select="name"/></p>
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index bb7b9d4c..88de6c07 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile()
 	// insert the current date/time
 	TQDomElement date = doc.createElement( "listdate" );
 	TQDomText t = doc.createTextNode( 
-			KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+			KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 	date.appendChild( t );
 	root.appendChild( date );
 
@@ -272,30 +272,30 @@ KTempFile* WebPresencePlugin::generateFile()
 			accName.appendChild( accNameText );
 			acc.appendChild( accName );
 
-			TQDomElement accStatus = doc.createElement( "accountstatus" );
+			TQDomElement acctqStatus = doc.createElement( "accountstatus" );
 			TQDomText statusText = doc.createTextNode( ( me )
-					? statusAsString( me->onlineStatus() )
+					? statusAsString( me->onlinetqStatus() )
 					: notKnown ) ;
-			accStatus.appendChild( statusText );
+			acctqStatus.appendChild( statusText );
 
 			// Dont add these if we're shutting down, because the result
 			// would be quite weird.
 			if ( !shuttingDown ) {
 
 				// Add away message as an attribute, if one exists.
-				if ( me->onlineStatus().status() == Kopete::OnlineStatus::Away &&
+				if ( me->onlinetqStatus().status() == Kopete::OnlineStatus::Away &&
 						!me->property("awayMessage").value().toString().isEmpty() ) {
-					accStatus.setAttribute( "awayreason",
+					acctqStatus.setAttribute( "awayreason",
 							me->property("awayMessage").value().toString() );
 				}
 
 				// Add the online status description as an attribute, if one exits.
-				if ( !me->onlineStatus().description().isEmpty() ) {
-					accStatus.setAttribute( "statusdescription",
-							me->onlineStatus().description() );
+				if ( !me->onlinetqStatus().description().isEmpty() ) {
+					acctqStatus.setAttribute( "statusdescription",
+							me->onlinetqStatus().description() );
 				}
 			}
-			acc.appendChild( accStatus );
+			acc.appendChild( acctqStatus );
 
 			if ( showAddresses )
 			{
@@ -430,13 +430,13 @@ ProtocolList WebPresencePlugin::allProtocols()
 	return result;
 }
 
-TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newStatus )
+TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newtqStatus )
 {
 	if (shuttingDown)
 		return "OFFLINE";
 
 	TQString status;
-	switch ( newStatus.status() )
+	switch ( newtqStatus.status() )
 	{
 	case Kopete::OnlineStatus::Online:
 		status = "ONLINE";
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index 04babfa2..8ce3407a 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.h
+++ b/kopete/plugins/webpresence/webpresenceplugin.h
@@ -109,7 +109,7 @@ protected:
 	/**
 	 * Converts numeric status to a string
 	 */
-	TQString statusAsString( const Kopete::OnlineStatus &newStatus );
+	TQString statusAsString( const Kopete::OnlineStatus &newtqStatus );
 	/**
      * Schedules writes
 	 */
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index ea1d227e..e25458ee 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kgenericfactory.h>
 #include <kautoconfig.h>
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index 0a676973..41518bb4 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>449</width>
                             <height>0</height>
@@ -159,7 +159,7 @@ Note that some web browsers do not support XHTML. You should also make sure your
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -175,7 +175,7 @@ Note that some web browsers do not support XHTML. You should also make sure your
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -260,7 +260,7 @@ images/winpopup_protocol.png</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -276,7 +276,7 @@ images/winpopup_protocol.png</string>
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -313,7 +313,7 @@ images/winpopup_protocol.png</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>93</height>