From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:33:51 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kopete/libkopete/kopeteprotocol.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'kopete/libkopete/kopeteprotocol.cpp')

diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp
index d6910ebd..89b4f919 100644
--- a/kopete/libkopete/kopeteprotocol.cpp
+++ b/kopete/libkopete/kopeteprotocol.cpp
@@ -47,7 +47,7 @@ public:
 	ContactPropertyTmpl mStickLastSeen;
 	ContactPropertyTmpl mStickFullName;
 	
-	Kopete::OnlineStatus accountNotConnectedtqStatus;
+	Kopete::OnlineStatus accountNotConnectedStatus;
 };
 
 Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name )
@@ -58,7 +58,7 @@ Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name )
 	d->mStickFullName = Global::Properties::self()->fullName();
 	d->unloading = false;
 	d->capabilities = 0;
-	d->accountNotConnectedtqStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::tqfromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) );
+	d->accountNotConnectedStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::fromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) );
 }
 
 Protocol::~Protocol()
@@ -87,9 +87,9 @@ void Protocol::setCapabilities( unsigned int capabilities )
 }
 
 
-Kopete::OnlineStatus Protocol::accountOfflinetqStatus() const
+Kopete::OnlineStatus Protocol::accountOfflineStatus() const
 {
-	return d->accountNotConnectedtqStatus;
+	return d->accountNotConnectedStatus;
 }
 
 void Protocol::slotAccountOnlineStatusChanged( Contact *self )
@@ -174,11 +174,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact )
 
 		// Preset the contactId and displayName, if the plugin doesn't want to save
 		// them, or use its own format, it can call clear() on the provided list
-		sd[ TQString::tqfromLatin1( "contactId" ) ] =   c->contactId();
+		sd[ TQString::fromLatin1( "contactId" ) ] =   c->contactId();
 		//TODO(nick) remove
-		sd[ TQString::tqfromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString();
+		sd[ TQString::fromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString();
 		if(c->account())
-			sd[ TQString::tqfromLatin1( "accountId" ) ] = c->account()->accountId();
+			sd[ TQString::fromLatin1( "accountId" ) ] = c->account()->accountId();
 
 		// If there's an index field preset it too
 		TQString index = c->protocol()->addressBookIndexField();
@@ -226,13 +226,13 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact )
 		//        we can devise a better API, but with the constantly changing
 		//        requirements every time I learn more about kabc I'd better no touch
 		//        the API yet - Martijn
-		if( it.key().startsWith( TQString::tqfromLatin1( "messaging/" ) ) )
+		if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) )
 		{
-			metaContact->setAddressBookField( this, it.key(), TQString::tqfromLatin1( "All" ), it.data() );
+			metaContact->setAddressBookField( this, it.key(), TQString::fromLatin1( "All" ), it.data() );
 //			kdDebug(14010) << k_funcinfo << "metaContact->setAddressBookField( " << this << ", " << it.key() << ", \"All\", " << it.data() << " );" << endl;
 		}
 		else
-			metaContact->setAddressBookField( this, TQString::tqfromLatin1( "kopete" ), it.key(), it.data() );
+			metaContact->setAddressBookField( this, TQString::fromLatin1( "kopete" ), it.key(), it.data() );
 	}
 }
 
@@ -250,7 +250,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt
 		serializedDataIterators[ it.key() ] = serializedData[ it.key() ].begin();
 	}
 
-	uint count = serializedData[TQString::tqfromLatin1("contactId")].count();
+	uint count = serializedData[TQString::fromLatin1("contactId")].count();
 
 	// Prepare the independent entries to pass to the plugin's implementation
 	for( uint i = 0; i < count ; i++ )
@@ -263,11 +263,11 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt
 			++( serializedDataIt.data() );
 		}
 
-		const TQString& accountId=sd[ TQString::tqfromLatin1( "accountId" ) ];
+		const TQString& accountId=sd[ TQString::fromLatin1( "accountId" ) ];
 		// myself was allowed in the contactlist in old version of kopete.
 		// But if one keep it on the contactlist now, it may conflict witht he myself metacontact.
 		// So ignore it
-		if(accountId == sd[ TQString::tqfromLatin1( "contactId" ) ] )
+		if(accountId == sd[ TQString::fromLatin1( "contactId" ) ] )
 		{
 			kdDebug( 14010 ) << k_funcinfo << "Myself contact was on the contactlist.xml for account " << accountId << ".  Ignore it" << endl;
 			continue;
@@ -290,10 +290,10 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt
 			//        hack in the serialize code.
 			//        Once this code is actually capable of talking to kabc this hack
 			//        should be removed ASAP! - Martijn
-			if( ( *fieldIt ).startsWith( TQString::tqfromLatin1( "messaging/" ) ) )
-				ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::tqfromLatin1( "All" ) );
+			if( ( *fieldIt ).startsWith( TQString::fromLatin1( "messaging/" ) ) )
+				ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) );
 			else
-				ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::tqfromLatin1( "kopete" ), *fieldIt );
+				ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::fromLatin1( "kopete" ), *fieldIt );
 		}
 
 		// Check if we have an account id. If not we're deserializing a Kopete 0.6 contact
@@ -305,7 +305,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt
 			TQDict<Account> accounts = AccountManager::self()->accounts( this );
 			if ( accounts.count() > 0 )
 			{
-				sd[ TQString::tqfromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey();
+				sd[ TQString::fromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey();
 			}
 			else
 			{
-- 
cgit v1.2.1