Rename old tq methods that no longer need a unique name

58 files changed, 311 insertions, 311 deletions

diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
index 65e808f4..113ec95e 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
@@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder()
 {
 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
 
-	return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") );
+	return getFolder( mgr->root(), TQString::fromLatin1("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::tqfromLatin1(data);
+	TQString temp = TQString::fromLatin1(data);
 	TQRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>");
 	int pos = rx.search( temp );
 	TQTextCodec *codec;
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 3826b869..694ce451 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -211,7 +211,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 								protocol,
 								*it,
 								aliasCommand,
-								TQString::tqfromLatin1("Custom alias for %1").tqarg(aliasCommand),
+								TQString::fromLatin1("Custom alias for %1").tqarg(aliasCommand),
 								Kopete::CommandHandler::UserAlias
 							);
 
@@ -241,8 +241,8 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 void AliasPreferences::save()
 {
 	KConfig *config = KGlobal::config();
-	config->deleteGroup( TQString::tqfromLatin1("AliasPlugin") );
-	config->setGroup( TQString::tqfromLatin1("AliasPlugin") );
+	config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
+	config->setGroup( TQString::fromLatin1("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::tqfromLatin1("\\s+") );
+	TQRegExp spaces( TQString::fromLatin1("\\s+") );
 
-	if( alias.startsWith( TQString::tqfromLatin1("/") ) )
+	if( alias.startsWith( TQString::fromLatin1("/") ) )
 		alias = alias.section( '/', 1 );
-	if( command.startsWith( TQString::tqfromLatin1("/") ) )
+	if( command.startsWith( TQString::fromLatin1("/") ) )
 		command = command.section( '/', 1 );
 
 	if( id == 0 )
@@ -309,7 +309,7 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto
 			*it,
 			alias,
 			command,
-			TQString::tqfromLatin1("Custom alias for %1").tqarg(command),
+			TQString::fromLatin1("Custom alias for %1").tqarg(command),
 			Kopete::CommandHandler::UserAlias,
 			0,
 			argc
@@ -328,7 +328,7 @@ void AliasPreferences::slotAddAlias()
 	if( addDialog.exec() == TQDialog::Accepted )
 	{
 		TQString alias = addDialog.alias->text();
-		if( alias.startsWith( TQString::tqfromLatin1("/") ) )
+		if( alias.startsWith( TQString::fromLatin1("/") ) )
 			alias = alias.section( '/', 1 );
 
 		if( alias.contains( TQRegExp("[_=]") ) )
@@ -418,7 +418,7 @@ void AliasPreferences::slotEditAlias()
 		if( editDialog.exec() == TQDialog::Accepted )
 		{
 			TQString alias = editDialog.alias->text();
-			if( alias.startsWith( TQString::tqfromLatin1("/") ) )
+			if( alias.startsWith( TQString::fromLatin1("/") ) )
 				alias = alias.section( '/', 1 );
 			if( alias.contains( TQRegExp("[_=]") ) )
 			{
diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui
index ca558f4b..e31ef3e4 100644
--- a/kopete/plugins/autoreplace/autoreplaceprefs.ui
+++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui
@@ -135,7 +135,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
index e540277e..d6365c0a 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( slotChecktqStatus() ) );
+	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) );
 	m_timer->start( 60000 );
 
 	m_pluginConnected = false;
@@ -49,7 +49,7 @@ ConnectionStatusPlugin::~ConnectionStatusPlugin()
 	delete m_process;
 }
 
-void ConnectionStatusPlugin::slotChecktqStatus()
+void ConnectionStatusPlugin::slotCheckStatus()
 {
 	kdDebug( 14301 ) << k_funcinfo << endl;
 
@@ -87,7 +87,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process )
 
 	if ( process == m_process )
 	{
-		setConnectedtqStatus( m_buffer.contains( "default" ) );
+		setConnectedStatus( 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::tqfromLatin1( buffer, buflen );
+	m_buffer += TQString::fromLatin1( buffer, buflen );
 	//kdDebug( 14301 ) << qsBuffer << endl;
 }
 
-void ConnectionStatusPlugin::setConnectedtqStatus( bool connected )
+void ConnectionStatusPlugin::setConnectedStatus( bool connected )
 {
 	//kdDebug( 14301 ) << k_funcinfo << endl;
 
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h
index e0efdb9a..c030c71c 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.h
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h
@@ -36,7 +36,7 @@ public:
 	~ConnectionStatusPlugin();
 
 private slots:
-	void slotChecktqStatus();
+	void slotCheckStatus();
 	void slotProcessStdout( KProcess *process, char *buffer, int len );
 
 	/**
@@ -45,7 +45,7 @@ private slots:
 	void slotProcessExited( KProcess *process );
 
 private:
-	void setConnectedtqStatus( bool newtqStatus );
+	void setConnectedStatus( bool newStatus );
 
 	bool m_pluginConnected;
 	KProcess *m_process;
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 11f30f48..898e7f1a 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::tqfromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
-	m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::tqfromLatin1("off") ) ;
+	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") ) ;
 
 	setXMLFile("cryptographychatui.rc");
 }
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 135cf636..9ee1a3c7 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -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::tqfromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
+const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(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::tqfromLatin1("-----BEGIN PGP MESSAGE----") )
-		 || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) )
+	if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") )
+		 || !body.contains( TQString::fromLatin1("-----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::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) )
-					.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
-					.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "&nbsp; " ) );
+				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; " ) );
 			}
 
-			msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+			msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 				+ i18n("Outgoing Encrypted Message: ")
-				+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+				+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 				+ plainBody
-				+ TQString::tqfromLatin1(" </td></tr></table>")
+				+ TQString::fromLatin1(" </td></tr></table>")
 				, Kopete::Message::RichText );
 		}
 
@@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
 			body = Kopete::Message::escape( body );
 		}
 
-		msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+		msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
 			+ i18n("Incoming Encrypted Message: ")
-			+ TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+			+ TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
 			+ body
-			+ TQString::tqfromLatin1(" </td></tr></table>")
+			+ TQString::fromLatin1(" </td></tr></table>")
 			, Kopete::Message::RichText );
 	}
 
diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui
index 00a7b4c0..2a6ec002 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>50</height>
diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
index fb71e0a1..8a5b1379 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index e095c0e8..41bdda8f 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -163,7 +163,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
   keysListpr->setSelected(keysListpr->firstChild(),true);
 
   page->show();
-  resize(this->tqminimumSize());
+  resize(this->minimumSize());
   setMainWidget(page);
 }
 
diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp
index 2cfab23b..d6e04d7f 100644
--- a/kopete/plugins/highlight/highlightconfig.cpp
+++ b/kopete/plugins/highlight/highlightconfig.cpp
@@ -78,11 +78,11 @@ void HighlightConfig::load()
 {
 	m_filters.clear(); //clear filters
 
-	TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) );
+	TQString filename = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) );
 	if( filename.isEmpty() )
 		return ;
 
-	TQDomDocument filterList( TQString::tqfromLatin1( "highlight-plugin" ) );
+	TQDomDocument filterList( TQString::fromLatin1( "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::tqfromLatin1("filter")
+//			if( element.tagName() == TQString::fromLatin1("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::tqfromLatin1( "display-name" ) )
+						if( filterElement.tagName() == TQString::fromLatin1( "display-name" ) )
 						{
 							filtre->displayName = filterElement.text();
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "search" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "search" ) )
 						{
 							filtre->search = filterElement.text();
 
-							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" ) );
+							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" ) );
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "FG" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "FG" ) )
 						{
 							filtre->FG = filterElement.text();
-							filtre->setFG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->setFG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "BG" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "BG" ) )
 						{
 							filtre->BG = filterElement.text();
-							filtre->setBG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->setBG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "importance" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "importance" ) )
 						{
 							filtre->importance = filterElement.text().toUInt();
-							filtre->setImportance= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->setImportance= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "sound" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "sound" ) )
 						{
 							filtre->soundFN = filterElement.text();
-							filtre->playSound = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->playSound = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
 						}
-						else if( filterElement.tagName() == TQString::tqfromLatin1( "raise" ) )
+						else if( filterElement.tagName() == TQString::fromLatin1( "raise" ) )
 						{
-							filtre->raiseView = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) );
+							filtre->raiseView = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) );
 						}
 					}
 					filterNode = filterNode.nextSibling();
@@ -154,7 +154,7 @@ void HighlightConfig::load()
 void HighlightConfig::save()
 {
 
-	TQString fileName = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) );
+	TQString fileName = locateLocal( "appdata", TQString::fromLatin1( "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::tqfromLatin1(
+		TQString xml = TQString::fromLatin1(
 			"<?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::tqfromLatin1( "  <filter>\n    <display-name>" )
+			xml += TQString::fromLatin1( "  <filter>\n    <display-name>" )
 				+ TQStyleSheet::escape(filtre->displayName)
-				+ TQString::tqfromLatin1( "</display-name>\n" );
+				+ TQString::fromLatin1( "</display-name>\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("    <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("    <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("    <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("    <importance set=\"") + TQString::number( static_cast<int>( filtre->setImportance ) ) +
-				TQString::tqfromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::tqfromLatin1( "</importance>\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("    <sound set=\"") + TQString::number( static_cast<int>( filtre->playSound ) ) +
-				TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::tqfromLatin1( "</sound>\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("    <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) +
-				TQString::tqfromLatin1( "\"></raise>\n" );
+			xml += TQString::fromLatin1("    <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) +
+				TQString::fromLatin1( "\"></raise>\n" );
 
-			xml += TQString::tqfromLatin1( "  </filter>\n" );
+			xml += TQString::fromLatin1( "  </filter>\n" );
 		}
 
-		xml += TQString::tqfromLatin1( "</highlight-plugin>\n" );
+		xml += TQString::fromLatin1( "</highlight-plugin>\n" );
 
 		*stream << xml;
 	}
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index eaca281c..7138396c 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -177,7 +177,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -277,7 +277,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>21</height>
@@ -328,7 +328,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>21</height>
@@ -379,7 +379,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>21</height>
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 76b29a5c..64af8c81 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::tqfromLatin1( "kopete"));
+	TQString kopetedir=locateLocal( "data", TQString::fromLatin1( "kopete"));
 	TQDir d( kopetedir ); //d should point to ~/.kde/share/apps/kopete/
 
 	d.setFilter( TQDir::Dirs  );
@@ -155,12 +155,12 @@ void HistoryPlugin::convertOldHistory()
 							buffer += TQString::fromUtf8(cbuf);
 						}
 
-						if( buffer.startsWith( TQString::tqfromLatin1( "<message " ) ) )
+						if( buffer.startsWith( TQString::fromLatin1( "<message " ) ) )
 						{
 							msgBlock = buffer;
 
 							// find the end of the message block
-							while( !feof( f ) && buffer != TQString::tqfromLatin1( "</message>\n" ) /*strcmp("</message>\n", cbuf )*/ )
+							while( !feof( f ) && buffer != TQString::fromLatin1( "</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::tqfromLatin1( "direction" ) ) == TQString::tqfromLatin1( "inbound" ) )
+							if( msgelement.attribute( TQString::fromLatin1( "direction" ) ) == TQString::fromLatin1( "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::tqfromLatin1( "srcnick" ) )
+									if( tagname == TQString::fromLatin1( "srcnick" ) )
 										nick = element.text();
 
-									else if( tagname == TQString::tqfromLatin1( "date" ) )
+									else if( tagname == TQString::fromLatin1( "date" ) )
 										date = element.text();
-									else if( tagname == TQString::tqfromLatin1( "body" ) )
+									else if( tagname == TQString::fromLatin1( "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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
-											TQString::tqfromLatin1( "/" ) +
-											contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+									TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+											TQString::fromLatin1( "/" ) +
+											contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
 											date.toString(".yyyyMM");
-									KSaveFile file(  locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) )  );
+									KSaveFile file(  locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".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::tqcurrentDateTime().toString()  );
+								importElem.setAttribute( "date", TQDateTime::currentDateTime().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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
-								TQString::tqfromLatin1( "/" ) +
-								contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+						TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+								TQString::fromLatin1( "/" ) +
+								contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
 								date.toString(".yyyyMM");
-						KSaveFile file(  locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) )  );
+						KSaveFile file(  locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) )  );
 						if( file.status() == 0 )
 						{
 							TQTextStream *stream = file.textStream();
@@ -310,12 +310,12 @@ bool HistoryPlugin::detectOldHistory()
 		return false;
 
 
-	TQDir d( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs")) );
+	TQDir d( locateLocal( "data", TQString::fromLatin1( "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::tqfromLatin1( "kopete")) );
+	TQDir d2( locateLocal( "data", TQString::fromLatin1( "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 c4f5418f..45c639a7 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -148,7 +148,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	mHtmlView->setMarginWidth(4);
 	mHtmlView->setMarginHeight(4);
 	mHtmlView->setFocusPolicy(TQ_NoFocus);
-	mHtmlView->tqsetSizePolicy(
+	mHtmlView->setSizePolicy(
 	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::tqfromLatin1( htmlCode.latin1() ) );
+	mHtmlPart->write( TQString::fromLatin1( 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::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
+	mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) );
+	const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) );
 	TQFileInfo *fi;
 	
 
 	// BEGIN check if there are Kopete 0.7.x
 	TQDir d1(locateLocal("data",TQString("kopete/logs/")+
-			c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
+			c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-"))
 					   ));
 	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::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
-					TQString::tqfromLatin1( "/" ) +
-					c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
+			c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) +
+					TQString::fromLatin1( "/" ) +
+					c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )
 								);
 	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::tqfromLatin1("rtl") :
-		TQString::tqfromLatin1("ltr"));
+	TQString dir = (TQApplication::reverseLayout() ? TQString::fromLatin1("rtl") :
+		TQString::fromLatin1("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::tqfromLatin1("span"));
-	newNode.setAttribute(TQString::tqfromLatin1("dir"), dir);
+	DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span"));
+	newNode.setAttribute(TQString::fromLatin1("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::tqfromLatin1("span"));
-			newNode.setAttribute(TQString::tqfromLatin1("dir"), dir);
+			newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span"));
+			newNode.setAttribute(TQString::fromLatin1("dir"), dir);
 			newNode.setInnerHTML(resultHTML);
 	
 			mHtmlPart->htmlDocument().body().appendChild(newNode);
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index b8608ac9..4b1798ae 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::tqfromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" );
+	actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "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 02bc1b2f..c79c11c0 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::tqcurrentDate().month();
+	m_realMonth=TQDate::currentDate().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::tqcurrentDate().month();
+	m_realMonth=TQDate::currentDate().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::tqcurrentDate().month())
+	if(m_realMonth!=TQDate::currentDate().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::tqcurrentDate().month();
+		m_realMonth=TQDate::currentDate().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::tqcurrentDate().addMonths(0-month), canLoad, contain);
+	TQDomDocument doc =  getDocument(c, TQDate::currentDate().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::tqcurrentDate().year()) );
-		dateElem.setAttribute( "month", TQString::number(TQDate::tqcurrentDate().month()) );
+		dateElem.setAttribute( "year",  TQString::number(TQDate::currentDate().year()) );
+		dateElem.setAttribute( "month", TQString::number(TQDate::currentDate().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::tqcurrentDate());
+	const TQString filename=getFileName(c,TQDate::currentDate());
 	if(!m_toSaveFileName.isEmpty() && m_toSaveFileName != filename)
 	{ //that mean the contact or the month has changed, save it now.
 		saveToDisk();
@@ -376,7 +376,7 @@ 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::tqfromLatin1("<span title=\"%1\">%2</span>")
+					msg.setBody( TQString::fromLatin1("<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::tqcurrentDate().addMonths(0-m_currentMonth);
+	//TQDate dd =  TQDate::currentDate().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::tqcurrentDate().addMonths(0-m_currentMonth);
+						TQDate d=TQDate::currentDate().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,14 +587,14 @@ 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::tqcurrentDate().addMonths(0-m_currentMonth);
+						TQDate d=TQDate::currentDate().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::tqfromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>")
+						msg.setBody( TQString::fromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>")
 							.tqarg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
 							Kopete::Message::RichText
 						);
@@ -602,7 +602,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
 					}
 					else
 					{
-						msg.setBody( TQString::tqfromLatin1("<span title=\"%1\">%2</span>")
+						msg.setBody( TQString::fromLatin1("<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::tqcurrentDate().addMonths(0-m_currentMonth);
+							TQDate d = TQDate::currentDate().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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
-		TQString::tqfromLatin1( "/" ) +
-		c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
-		TQString::tqfromLatin1( "/" ) +
-	c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+	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( "-" ) ) +
 		date.toString(".yyyyMM");
 
-	TQString filename=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ;
+	TQString filename=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ;
 
 	//Check if there is a kopete 0.7.x file
 	TQFileInfo fi(filename);
 	if(!fi.exists())
 	{
-		name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
-			TQString::tqfromLatin1( "/" ) +
-			c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) +
+		name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
+			TQString::fromLatin1( "/" ) +
+			c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) +
 			date.toString(".yyyyMM");
 
-		TQString filename2=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ;
+		TQString filename2=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".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::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
+		c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-"))
 		));
 	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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )))
+		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )))
 		{
 			rx.search(fi->fileName());
-			int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt();
+			int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().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::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
-		TQString::tqfromLatin1( "/" ) +
-		c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
+		c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) +
+		TQString::fromLatin1( "/" ) +
+		c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )
 		));
 
 	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::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )))
+		if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) )))
 		{
 			rx.search(fi->fileName());
-			int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt();
+			int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().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 8cd76682..a6069289 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::tqfromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()),
+		TQString::fromLatin1( "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::tqfromLatin1("kopete_chatwindow") )
+	if(v->plugin()->pluginInfo()->pluginName() != TQString::fromLatin1("kopete_chatwindow") )
 		return;  //Email chat windows are not supported.
 
 	bool autoChatWindow = HistoryConfig::auto_chatwindow();
diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui
index 36f3dee2..558c68a2 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>90</height>
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index af9f1bce..35891bf9 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>200</height>
@@ -45,7 +45,7 @@
                     <property name="name">
                         <cstring>statusLabel</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>20</height>
@@ -109,13 +109,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>150</width>
                             <height>32767</height>
@@ -160,13 +160,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>140</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -207,13 +207,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>0</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -237,7 +237,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>0</width>
                         <height>0</height>
@@ -323,7 +323,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 4b0ab594..62aef452 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -145,7 +145,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg )
 				TQBuffer buffer( ba );
 				buffer.open( IO_WriteOnly );
 				renderedImage.save( &buffer, "PNG" );
-				TQString imageURL = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) );
+				TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) );
 				replaceMap[match] = imageURL;
 			}
 			#else
diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui
index bad68932..365e159b 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -83,7 +83,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>280</width>
                                     <height>20</height>
@@ -128,7 +128,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui
index cf90dc57..f673ccb7 100644
--- a/kopete/plugins/motionautoaway/motionawayprefs.ui
+++ b/kopete/plugins/motionautoaway/motionawayprefs.ui
@@ -87,7 +87,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>95</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -201,7 +201,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -241,7 +241,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>180</width>
                                     <height>20</height>
@@ -260,7 +260,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index 5725a2ae..ac5dc03e 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>60</height>
diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp
index fe58aba4..78d6914b 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::tqfromLatin1("Album");
+			arg << TQString::fromLatin1("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::tqfromLatin1("Artist");
+			arg << TQString::fromLatin1("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::tqfromLatin1("Title");
+			arg << TQString::fromLatin1("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 4c929a4c..dc67a0ab 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -336,7 +336,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				}
 			}
 
-			a->setOnlineStatus(a->myself()->onlinetqStatus(), advert);
+			a->setOnlineStatus(a->myself()->onlineStatus(), advert);
 		}
 	}
 }
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index 21d2f0e9..dcc48d8f 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -178,7 +178,7 @@ Expressions in brackets depend on a substitution being made.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <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="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -332,7 +332,7 @@ in place of your status message.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs
index 4884da4f..80854a86 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-NetworktqStatus (not active, yet)
+* experimental implementation of the the KDED-NetworkStatus (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 1889a84f..094de9e5 100644
--- a/kopete/plugins/smpppdcs/detector.h
+++ b/kopete/plugins/smpppdcs/detector.h
@@ -48,7 +48,7 @@ public:
      */
 	virtual ~Detector() {}
 
-    virtual void checktqStatus() const = 0;
+    virtual void checkStatus() const = 0;
 	
 	virtual void smpppdServerChange() {}
 
diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp
index ca800e7f..f1ed21b5 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.cpp
+++ b/kopete/plugins/smpppdcs/detectornetstat.cpp
@@ -27,7 +27,7 @@ DetectorNetstat::~DetectorNetstat() {
     delete m_process;
 }
 
-void DetectorNetstat::checktqStatus() const {
+void DetectorNetstat::checkStatus() const {
     kdDebug(14312) << k_funcinfo << endl;
 
     if(m_process) {
@@ -59,14 +59,14 @@ void DetectorNetstat::checktqStatus() const {
 void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) {
     // Look for a default gateway
     kdDebug(14312) << k_funcinfo << endl;
-    m_buffer += TQString::tqfromLatin1(buffer, buflen);
+    m_buffer += TQString::fromLatin1(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->setConnectedtqStatus(m_buffer.contains("default"));
+        m_connector->setConnectedStatus(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 1f6d1161..548b903f 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 checktqStatus() const;
+    virtual void checkStatus() const;
 
 private slots:
     // Original cs-plugin code
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
index e8af4158..e2b1ae19 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
@@ -22,44 +22,44 @@
 #include "iconnector.h"
 #include "detectornetworkstatus.h"
 
-DetectorNetworktqStatus::DetectorNetworktqStatus(IConnector* connector) 
+DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector) 
 	: Detector(connector), m_connManager(NULL) {
 	
 	m_connManager = ConnectionManager::self();
-	connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)),
-			this, TQT_SLOT(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)));
+	connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)),
+			this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus)));
 }
 
-DetectorNetworktqStatus::~DetectorNetworktqStatus() {}
+DetectorNetworkStatus::~DetectorNetworkStatus() {}
 
-void DetectorNetworktqStatus::checktqStatus() const {
+void DetectorNetworkStatus::checkStatus() const {
 	// needs to do nothing
 }
 
-void DetectorNetworktqStatus::statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status) {
+void DetectorNetworkStatus::statusChanged(const TQString& host, NetworkStatus::EnumStatus status) {
 	switch(status) {
-		case NetworktqStatus::Offline:
+		case NetworkStatus::Offline:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl;
 			break;
-		case NetworktqStatus::OfflineFailed:
+		case NetworkStatus::OfflineFailed:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl;
 			break;
-		case NetworktqStatus::OfflineDisconnected:
+		case NetworkStatus::OfflineDisconnected:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl;
 			break;
-		case NetworktqStatus::ShuttingDown:
+		case NetworkStatus::ShuttingDown:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl;
 			break;
-		case NetworktqStatus::Establishing:
+		case NetworkStatus::Establishing:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl;
 			break;
-		case NetworktqStatus::Online:
+		case NetworkStatus::Online:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl;
 			break;
-		case NetworktqStatus::NoNetworks:
+		case NetworkStatus::NoNetworks:
 			kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl;
 			break;
-		case NetworktqStatus::Unreachable:
+		case NetworkStatus::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 1c1896e6..850be008 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 DetectorNetworktqStatus : protected TQObject, public Detector
+class DetectorNetworkStatus : protected TQObject, public Detector
 {
 	Q_OBJECT
   TQ_OBJECT
 	
-	DetectorNetworktqStatus(const DetectorNetworktqStatus&);
-	DetectorNetworktqStatus& operator=(const DetectorNetworktqStatus&);
+	DetectorNetworkStatus(const DetectorNetworkStatus&);
+	DetectorNetworkStatus& operator=(const DetectorNetworkStatus&);
 
 public:
-    DetectorNetworktqStatus(IConnector* connector);
-    virtual ~DetectorNetworktqStatus();
+    DetectorNetworkStatus(IConnector* connector);
+    virtual ~DetectorNetworkStatus();
 	
-	virtual void checktqStatus() const;
+	virtual void checkStatus() const;
 
 protected slots:
-	void statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status);
+	void statusChanged(const TQString& host, NetworkStatus::EnumStatus status);
 	
 private:
 	ConnectionManager * m_connManager;
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 1b932d6d..772090d9 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::checktqStatus()
+    \fn DetectorSMPPPD::checkStatus()
  */
-void DetectorSMPPPD::checktqStatus() const {
+void DetectorSMPPPD::checkStatus() const {
     kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl;
 
 #ifndef NOKINTERNETDCOP
@@ -41,10 +41,10 @@ void DetectorSMPPPD::checktqStatus() const {
     if(kapp->dcopClient() && m_kinternetApp != "") {
         switch(getConnectionStatusDCOP()) {
         case CONNECTED:
-            m_connector->setConnectedtqStatus(true);
+            m_connector->setConnectedStatus(true);
             return;
         case DISCONNECTED:
-            m_connector->setConnectedtqStatus(false);
+            m_connector->setConnectedStatus(false);
             return;
         default:
             break;
@@ -63,9 +63,9 @@ void DetectorSMPPPD::checktqStatus() const {
 	c.setPassword(SMPPPDCSConfig::self()->password().utf8());
 
     if(c.connect(server, port)) {
-        m_connector->setConnectedtqStatus(c.isOnline());
+        m_connector->setConnectedStatus(c.isOnline());
     } else {
         kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl;
-        m_connector->setConnectedtqStatus(false);
+        m_connector->setConnectedStatus(false);
     }
 }
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.h b/kopete/plugins/smpppdcs/detectorsmpppd.h
index cba377e0..197fe65b 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 checktqStatus() const;
+    virtual void checkStatus() const;
 
 };
 
diff --git a/kopete/plugins/smpppdcs/iconnector.h b/kopete/plugins/smpppdcs/iconnector.h
index ab63ec71..c4846862 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 newtqStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
+     * @param newStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
      */
-    virtual void setConnectedtqStatus(bool newtqStatus) = 0;
+    virtual void setConnectedStatus(bool newStatus) = 0;
 };
 
 #endif
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.cpp b/kopete/plugins/smpppdcs/onlineinquiry.cpp
index 99dc7d5c..4cab45d7 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->checktqStatus();
+	m_detector->checkStatus();
 
     return m_online;
 }
 
-void OnlineInquiry::setConnectedtqStatus(bool newtqStatus) {
-    m_online = newtqStatus;
+void OnlineInquiry::setConnectedStatus(bool newStatus) {
+    m_online = newStatus;
 }
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.h b/kopete/plugins/smpppdcs/onlineinquiry.h
index 7a0fcef2..278c1e9f 100644
--- a/kopete/plugins/smpppdcs/onlineinquiry.h
+++ b/kopete/plugins/smpppdcs/onlineinquiry.h
@@ -35,7 +35,7 @@ public:
 
     bool isOnline(bool useSMPPPD);
 
-    virtual void setConnectedtqStatus(bool newtqStatus);
+    virtual void setConnectedStatus(bool newStatus);
 
 private:
     Detector * m_detector;
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
index 0aad71d0..f17f2ca9 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_detectorNetworktqStatus(NULL), m_timer(NULL),
+        m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(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_detectorNetworktqStatus = new DetectorNetworktqStatus(this);
+    m_detectorNetworkStatus = new DetectorNetworkStatus(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_detectorNetworktqStatus;
+    delete m_detectorNetworkStatus;
     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(slotChecktqStatus()));
+        connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
 
 		if(SMPPPDCSConfig::self()->useSmpppd()) {
             m_timer->start(30000);
@@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() {
             m_timer->start(60000);
         }
 
-        slotChecktqStatus();
+        slotCheckStatus();
     }
 }
 
@@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const {
 	return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd());
 }
 
-void SMPPPDCSPlugin::slotChecktqStatus() {
+void SMPPPDCSPlugin::slotCheckStatus() {
 	
 	// reread config to get changes
 	SMPPPDCSConfig::self()->readConfig();
 	
 	if(SMPPPDCSConfig::self()->useSmpppd()) {
-        m_detectorSMPPPD->checktqStatus();
+        m_detectorSMPPPD->checkStatus();
     } else {
-        m_detectorNetstat->checktqStatus();
+        m_detectorNetstat->checkStatus();
     }
 }
 
-void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) {
+void SMPPPDCSPlugin::setConnectedStatus( 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 24697ca7..5214ecc5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.h
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h
@@ -77,7 +77,7 @@ public:
      *
      * @see SMPPPDCSPrefs
      */
-    virtual void setConnectedtqStatus( bool newtqStatus );
+    virtual void setConnectedStatus( bool newStatus );
 
     virtual TQString detectionMethod() const;
 
@@ -87,7 +87,7 @@ public slots:
     void smpppdServerChanged(const TQString& server);
 
 private slots:
-    void slotChecktqStatus();
+    void slotCheckStatus();
     void allPluginsLoaded();
 
 private:
@@ -99,7 +99,7 @@ private:
 
     Detector      * m_detectorSMPPPD;
     Detector      * m_detectorNetstat;
-    Detector      * m_detectorNetworktqStatus;
+    Detector      * m_detectorNetworkStatus;
     bool            m_pluginConnected;
     TQTimer        * m_timer;
     OnlineInquiry * m_onlineInquiry;
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index 1bbb6664..f8be184a 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -54,7 +54,7 @@
                                     <cstring>csMethod</cstring>
                                 </property>
                                 <property name="title">
-                                    <string>Method of Connection tqStatus Detection</string>
+                                    <string>Method of Connection Status Detection</string>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -120,7 +120,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>341</width>
                                                         <height>20</height>
@@ -168,7 +168,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -203,7 +203,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>6</height>
diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui
index 6b22e3f9..7c88f07f 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationui.ui
+++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui
@@ -101,7 +101,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
index cfb103c2..a06e30a9 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::tqfromLatin1(buf,len);
+    TQString myBuf = TQString::fromLatin1(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::tqfromLatin1(buf,len);
+    TQString myBuf = TQString::fromLatin1(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 c178b39b..3a03b7bc 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_oldtqStatus(Kopete::OnlineStatus::Unknown)
+StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldStatus(Kopete::OnlineStatus::Unknown)
 {
 	m_isChatWindowOpen = false;
-	m_oldStatusDateTime = TQDateTime::tqcurrentDateTime();
+	m_oldStatusDateTime = TQDateTime::currentDateTime();
 	
 	// Last*Changed are always false at start
 	m_timeBetweenTwoMessagesChanged  = false;
@@ -107,7 +107,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
 	
 	
 	// Get last time a message was received
-	m_lastMessageReceived = TQDateTime::tqcurrentDateTime();
+	m_lastMessageReceived = TQDateTime::currentDateTime();
 
 
 	// Check for lastPresent
@@ -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 tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+	TQDateTime currentDateTime = TQDateTime::currentDateTime();
 	
 	if (m_timeBetweenTwoMessagesOn != -1 && m_isChatWindowOpen)
 	{
-		m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(tqcurrentDateTime))/(1 + m_timeBetweenTwoMessagesOn);
+		m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(currentDateTime))/(1 + m_timeBetweenTwoMessagesOn);
 
 	}
 	
 	setIsChatWindowOpen(true);
 	
 	m_timeBetweenTwoMessagesOn += 1;
-	m_lastMessageReceived = tqcurrentDateTime;
+	m_lastMessageReceived = currentDateTime;
 	
 	
 	// 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 = tqcurrentDateTime;
+	m_lastTalk = currentDateTime;
 	
 	m_messageLengthChanged = true;
 	m_lastTalkChanged = true;
@@ -269,32 +269,32 @@ void StatisticsContact::onlineStatusChanged(Kopete::OnlineStatus::StatusType sta
 	if (m_statisticsContactId.isEmpty())
 		return;
 	
-	TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+	TQDateTime currentDateTime = TQDateTime::currentDateTime();
 	
-	/// We don't want to log if oldtqStatus is unknown
+	/// We don't want to log if oldStatus is unknown
 	/// the change could not be a real one; see StatisticsPlugin::slotMySelfOnlineStatusChanged
-	if (m_oldtqStatus != Kopete::OnlineStatus::Unknown)
+	if (m_oldStatus != Kopete::OnlineStatus::Unknown)
 	{
 		
-		kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldtqStatus) << endl;
+		kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldStatus) << endl;
 		m_db->query(TQString("INSERT INTO contactstatus "
 		"(metacontactid, status, datetimebegin, datetimeend) "
-				"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())));
+				"VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(currentDateTime.toTime_t())));
 	}
 	
-	if (m_oldtqStatus == Kopete::OnlineStatus::Online || m_oldtqStatus == Kopete::OnlineStatus::Away)
+	if (m_oldStatus == Kopete::OnlineStatus::Online || m_oldStatus == 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 = tqcurrentDateTime;
+		m_lastPresent = currentDateTime;
 		m_lastPresentChanged = true;
 	}
 
-	m_oldtqStatus = status;
-	m_oldStatusDateTime = tqcurrentDateTime;
+	m_oldStatus = status;
+	m_oldStatusDateTime = currentDateTime;
 
 }
 
-bool StatisticsContact::wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status)
+bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status)
 {
 	if (m_statisticsContactId.isEmpty())
 		return false;
@@ -389,7 +389,7 @@ TQValueList<TQTime> StatisticsContact::mainEvents(const Kopete::OnlineStatus::St
 	if (m_statisticsContactId.isEmpty())
 		return mainEvents;
 	
-	TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+	TQDateTime currentDateTime = TQDateTime::currentDateTime();
 	buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").tqarg(m_statisticsContactId));
 	
 	
diff --git a/kopete/plugins/statistics/statisticscontact.h b/kopete/plugins/statistics/statisticscontact.h
index 1559e1fd..9d7f6575 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_oldtqStatus
+	 *  \return m_oldStatus
 	 */
-	Kopete::OnlineStatus::StatusType oldtqStatus() { return m_oldtqStatus; }
+	Kopete::OnlineStatus::StatusType oldStatus() { return m_oldStatus; }
 	
 	/** \brief Access method
 	 *  \return m_oldStatusDateTime
@@ -106,7 +106,7 @@ public:
 	/**
 	 * \returns true if contact was status at dt, false else.
 	 */
-	bool wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status);
+	bool wasStatus(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 oldtqStatus
+	 * in order to correctly update the database. That's why here we keep the oldStatus
 	 */
-	Kopete::OnlineStatus::StatusType m_oldtqStatus;
+	Kopete::OnlineStatus::StatusType m_oldStatus;
 	/// 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 36336ae2..9a769935 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 dcoptqStatus(TQString id, TQString datetime) = 0;
+	virtual TQString dcopStatus(TQString id, TQString datetime) = 0;
 	/**
 	 * \returns return the status of the contact at timeStamp.
 	 */
-	virtual TQString dcoptqStatus(TQString id, int timeStamp) = 0;
+	virtual TQString dcopStatus(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 dcopMaintqStatus(TQString id, int timeStamp) = 0;
+	virtual TQString dcopMainStatus(TQString id, int timeStamp) = 0;
 };
 
 #endif // STATISTICSDCOP_H
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index 3c0a67c1..b4ca0861 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -63,7 +63,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db,
 	mainWidget->tabWidget->setCurrentPage(0);
 	
 	mainWidget->timePicker->setTime(TQTime::currentTime());
-	mainWidget->datePicker->setDate(TQDate::tqcurrentDate());
+	mainWidget->datePicker->setDate(TQDate::currentDate());
 	connect(mainWidget->askButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAskButtonClicked()));
 	
 	setFocus();
@@ -265,7 +265,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
 		TQDateTime dateTime2;
 		dateTime2.setTime_t(values[i+2].toInt());
 		
-		if (dateTime1.date() == TQDate::tqcurrentDate() || dateTime2.date() == TQDate::tqcurrentDate())
+		if (dateTime1.date() == TQDate::currentDate() || dateTime2.date() == TQDate::currentDate())
 			today = true;
 		else today = false;
 		
@@ -417,7 +417,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
  
 		generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">");
 		generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").tqarg(
-				Kopete::OnlineStatus(m_contact->oldtqStatus()).description(),
+				Kopete::OnlineStatus(m_contact->oldStatus()).description(),
 				KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime())));
 		generalHTMLPart->write(TQString("</div>"));
 	}
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index b28ce8ce..5e19b73c 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::tqfromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
+		TQString::fromLatin1( "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 dcopWastqStatus(id, dt, Kopete::OnlineStatus::Online); 
+	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Online); 
 }
 
 bool StatisticsPlugin::dcopWasOnline(TQString id, TQString dateTime)
 {
-	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
+	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Away); 
+	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Away); 
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, TQString dateTime)
 {
-	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
+	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Offline); 
+	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Offline); 
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, TQString dateTime)
 {
-	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
+	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
 }
 
-bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status)
+bool StatisticsPlugin::dcopWasStatus(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]->wastqStatus(dateTime, status);
+		return statisticsContactMap[id]->wasStatus(dateTime, status);
 	}
 	
 	return false;	
 }
 
-TQString StatisticsPlugin::dcoptqStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcopStatus(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);
-	return dcoptqStatus(id, dt.toString());
+	return dcopStatus(id, dt.toString());
 
 }
 
-TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime)
+TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime)
 {
 	TQDateTime dt = TQDateTime::fromString(dateTime);
 	
@@ -269,7 +269,7 @@ TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime)
 	return "";
 }
 
-TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcopMainStatus(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 467bd6b8..d6f75c81 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>oldtqStatus</td>
+ * <td>Event</td><td>Changes to database</td><td>oldStatus</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 dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status);
+	bool dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status);
 	
-	TQString dcoptqStatus(TQString id, TQString dateTime);
-	TQString dcoptqStatus(TQString id, int timeStamp);
+	TQString dcopStatus(TQString id, TQString dateTime);
+	TQString dcopStatus(TQString id, int timeStamp);
 	
-	TQString dcopMaintqStatus(TQString id, int timeStamp);
+	TQString dcopMainStatus(TQString id, int timeStamp);
 
 private:	
 	StatisticsDB *m_db;
diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui
index 87dd1b4d..b0f6ea27 100644
--- a/kopete/plugins/statistics/statisticswidget.ui
+++ b/kopete/plugins/statistics/statisticswidget.ui
@@ -68,7 +68,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>31</height>
@@ -127,7 +127,7 @@
                                                         <property name="sizeType">
                                                             <enum>Expanding</enum>
                                                         </property>
-                                                        <property name="tqsizeHint">
+                                                        <property name="sizeHint">
                                                             <size>
                                                                 <width>40</width>
                                                                 <height>20</height>
@@ -148,7 +148,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>60</width>
                                                 <height>41</height>
@@ -181,12 +181,12 @@
                                     <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
-                                                <string>Contact tqStatus at Date &amp; Time</string>
+                                                <string>Contact Status at Date &amp; Time</string>
                                             </property>
                                         </item>
                                         <item>
                                             <property name="text">
-                                                <string>Most Used tqStatus at Date</string>
+                                                <string>Most Used Status at Date</string>
                                             </property>
                                         </item>
                                         <property name="name">
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index 79b1cbde..2dd1ab85 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="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>81</height>
@@ -206,7 +206,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>279</height>
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 64f2e8e7..61b303e1 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -284,7 +284,7 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	while ( !m_completed[ job ] )
 		tqApp->processEvents();
 
-	TQString data = TQString::tqfromLatin1( m_data[ job ] );
+	TQString data = TQString::fromLatin1( m_data[ job ] );
 
 	// After hacks, we need to clean
 	m_data.remove( job );
diff --git a/kopete/plugins/translator/translatorprefsbase.ui b/kopete/plugins/translator/translatorprefsbase.ui
index 7a8d2c5a..7a92eccc 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index cd7ed095..d62c9c34 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 tqStatus
+Getting Info about Local User's Status
 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 5dac1837..f768ccf5 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 tqStatus</title>
+				<title>My IM Status</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 4ba456d5..9d749c14 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 tqStatus</title>
+				<title>My IM Status</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 88de6c07..bb7b9d4c 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::tqcurrentDateTime() ) );
+			KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
 	date.appendChild( t );
 	root.appendChild( date );
 
@@ -272,30 +272,30 @@ KTempFile* WebPresencePlugin::generateFile()
 			accName.appendChild( accNameText );
 			acc.appendChild( accName );
 
-			TQDomElement acctqStatus = doc.createElement( "accountstatus" );
+			TQDomElement accStatus = doc.createElement( "accountstatus" );
 			TQDomText statusText = doc.createTextNode( ( me )
-					? statusAsString( me->onlinetqStatus() )
+					? statusAsString( me->onlineStatus() )
 					: notKnown ) ;
-			acctqStatus.appendChild( statusText );
+			accStatus.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->onlinetqStatus().status() == Kopete::OnlineStatus::Away &&
+				if ( me->onlineStatus().status() == Kopete::OnlineStatus::Away &&
 						!me->property("awayMessage").value().toString().isEmpty() ) {
-					acctqStatus.setAttribute( "awayreason",
+					accStatus.setAttribute( "awayreason",
 							me->property("awayMessage").value().toString() );
 				}
 
 				// Add the online status description as an attribute, if one exits.
-				if ( !me->onlinetqStatus().description().isEmpty() ) {
-					acctqStatus.setAttribute( "statusdescription",
-							me->onlinetqStatus().description() );
+				if ( !me->onlineStatus().description().isEmpty() ) {
+					accStatus.setAttribute( "statusdescription",
+							me->onlineStatus().description() );
 				}
 			}
-			acc.appendChild( acctqStatus );
+			acc.appendChild( accStatus );
 
 			if ( showAddresses )
 			{
@@ -430,13 +430,13 @@ ProtocolList WebPresencePlugin::allProtocols()
 	return result;
 }
 
-TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newtqStatus )
+TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newStatus )
 {
 	if (shuttingDown)
 		return "OFFLINE";
 
 	TQString status;
-	switch ( newtqStatus.status() )
+	switch ( newStatus.status() )
 	{
 	case Kopete::OnlineStatus::Online:
 		status = "ONLINE";
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index 8ce3407a..04babfa2 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 &newtqStatus );
+	TQString statusAsString( const Kopete::OnlineStatus &newStatus );
 	/**
      * Schedules writes
 	 */
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index 41518bb4..5c6632d8 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>449</width>
                             <height>0</height>
@@ -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="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -276,7 +276,7 @@ images/winpopup_protocol.png</string>
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>93</height>