Rename old tq methods that no longer need a unique name

1 files changed, 9 insertions, 9 deletions

diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp
index b0727cce..6e712606 100644
--- a/kopete/libkopete/kabcpersistence.cpp
+++ b/kopete/libkopete/kabcpersistence.cpp
@@ -128,13 +128,13 @@ void KABCPersistence::write( MetaContact * mc )
 		for ( ; it != addressMap.end(); ++it )
 		{
 			// read existing data for this key
-			TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) );
+			TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) );
 			// merge without duplicating
 			TQString toWrite = unionContents( currentCustomForProtocol, it.data().join( TQChar( 0xE000 ) ) );
 			// Note if nothing ends up in the KABC data, this is because insertCustom does nothing if any param is empty.
 			kdDebug( 14010 ) << k_funcinfo << "Writing: " << it.key() << ", " << "All" << ", " << toWrite << endl;
-			theAddressee.insertCustom( it.key(), TQString::tqfromLatin1( "All" ), toWrite );
-			TQString check = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) );
+			theAddressee.insertCustom( it.key(), TQString::fromLatin1( "All" ), toWrite );
+			TQString check = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) );
 		}
 		ab->insertAddressee( theAddressee );
 		//kdDebug( 14010 ) << k_funcinfo << "dumping addressbook before write " << endl;
@@ -274,20 +274,20 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc )
 			splitField( *it, app, name, value );
 			kdDebug( 14010 ) << "app=" << app << " name=" << name << " value=" << value << endl;
 
-			if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) )
+			if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) )
 			{
-				if ( name == TQString::tqfromLatin1( "All" ) )
+				if ( name == TQString::fromLatin1( "All" ) )
 				{
 					kdDebug( 14010 ) << " syncing \"" << app << ":" << name << " with contactlist " << endl;
 					// Get the protocol name from the custom field
 					// by chopping the 'messaging/' prefix from the custom field app name
 					TQString protocolName = app.right( app.length() - 10 );
 					// munge Jabber hack
-					if ( protocolName == TQString::tqfromLatin1( "xmpp" ) )
-						protocolName = TQString::tqfromLatin1( "jabber" );
+					if ( protocolName == TQString::fromLatin1( "xmpp" ) )
+						protocolName = TQString::fromLatin1( "jabber" );
 
 					// Check Kopete supports it
-					Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::tqfromLatin1( "kopete_" ) + protocolName ) );
+					Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::fromLatin1( "kopete_" ) + protocolName ) );
 					if ( !proto )
 					{
 						KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
@@ -339,7 +339,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc )
 							// if not, prompt to add it
 							kdDebug( 14010 ) << proto->pluginId() << "://" << *it << " was not found in the contact list.  Prompting to add..." << endl;
 							if ( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
-									 i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::tqfromLatin1( "ImportFromKABC" ) ) )
+									 i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) )
 							{
 								// Check the accounts for this protocol are all connected
 								// Most protocols do not allow you to add contacts while offline