1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 6321996d..3826b869 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -16,7 +16,7 @@
 #include <kmessagebox.h>
 #include <kconfig.h>
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kplugininfo.h>
 #include <kiconloader.h>
 #include <tqpainter.h>
@@ -81,7 +81,7 @@ class AliasItem : public TQListViewItem
 					if ( isEnabled() || !lv )
 						p->setPen( cg.highlightedText() );
 					else if ( !isEnabled() && lv )
-						p->setPen( lv->palette().disabled().highlightedText() );
+						p->setPen( lv->tqpalette().disabled().highlightedText() );
 				}
 
 				// And last, draw the online status icons
@@ -211,7 +211,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 								protocol,
 								*it,
 								aliasCommand,
-								TQString::fromLatin1("Custom alias for %1").arg(aliasCommand),
+								TQString::tqfromLatin1("Custom alias for %1").tqarg(aliasCommand),
 								Kopete::CommandHandler::UserAlias
 							);
 
@@ -221,7 +221,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 							if( item )
 							{
 								item->protocolList.append( protocol );
-								item->repaint();
+								item->tqrepaint();
 							}
 							else
 							{
@@ -241,8 +241,8 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 void AliasPreferences::save()
 {
 	KConfig *config = KGlobal::config();
-	config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
-	config->setGroup( TQString::fromLatin1("AliasPlugin") );
+	config->deleteGroup( TQString::tqfromLatin1("AliasPlugin") );
+	config->setGroup( TQString::tqfromLatin1("AliasPlugin") );
 
 	TQStringList aliases;
 	AliasItem *item = (AliasItem*)preferencesDialog->aliasList->firstChild();
@@ -271,11 +271,11 @@ void AliasPreferences::save()
 
 void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id )
 {
-	TQRegExp spaces( TQString::fromLatin1("\\s+") );
+	TQRegExp spaces( TQString::tqfromLatin1("\\s+") );
 
-	if( alias.startsWith( TQString::fromLatin1("/") ) )
+	if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 		alias = alias.section( '/', 1 );
-	if( command.startsWith( TQString::fromLatin1("/") ) )
+	if( command.startsWith( TQString::tqfromLatin1("/") ) )
 		command = command.section( '/', 1 );
 
 	if( id == 0 )
@@ -309,7 +309,7 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto
 			*it,
 			alias,
 			command,
-			TQString::fromLatin1("Custom alias for %1").arg(command),
+			TQString::tqfromLatin1("Custom alias for %1").tqarg(command),
 			Kopete::CommandHandler::UserAlias,
 			0,
 			argc
@@ -328,14 +328,14 @@ void AliasPreferences::slotAddAlias()
 	if( addDialog.exec() == TQDialog::Accepted )
 	{
 		TQString alias = addDialog.alias->text();
-		if( alias.startsWith( TQString::fromLatin1("/") ) )
+		if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 			alias = alias.section( '/', 1 );
 
 		if( alias.contains( TQRegExp("[_=]") ) )
 		{
 			KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
 					" alias name cannot contain the characters \"_\" or \"=\"."
-					"</qt>").arg(alias),i18n("Invalid Alias Name") );
+					"</qt>").tqarg(alias),i18n("Invalid Alias Name") );
 		}
 		else
 		{
@@ -353,7 +353,7 @@ void AliasPreferences::slotAddAlias()
 				{
 					KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
 						"command is already being handled by either another alias or "
-						"Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
+						"Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
 					return;
 				}
 			}
@@ -418,13 +418,13 @@ void AliasPreferences::slotEditAlias()
 		if( editDialog.exec() == TQDialog::Accepted )
 		{
 			TQString alias = editDialog.alias->text();
-			if( alias.startsWith( TQString::fromLatin1("/") ) )
+			if( alias.startsWith( TQString::tqfromLatin1("/") ) )
 				alias = alias.section( '/', 1 );
 			if( alias.contains( TQRegExp("[_=]") ) )
 			{
 				KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
 						" alias name cannot contain the characters \"_\" or \"=\"."
-						"</qt>").arg(alias),i18n("Invalid Alias Name") );
+						"</qt>").tqarg(alias),i18n("Invalid Alias Name") );
 			}
 			else
 			{
@@ -449,7 +449,7 @@ void AliasPreferences::slotEditAlias()
 						{
 							KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
 							"command is already being handled by either another alias or "
-							"Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
+							"Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
 						return;
 						}
 					}