Rename old tq methods that no longer need a unique name

1 files changed, 8 insertions, 8 deletions

diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 9415a428..a814ed36 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -49,7 +49,7 @@ class OnlineStatusManager::Private
 	typedef TQMap< OnlineStatus , RegisteredStatusStruct >  ProtocolMap ;
 
 	TQPixmap *nullPixmap;
-	TQMap<Protocol* , ProtocolMap > registeredtqStatus;
+	TQMap<Protocol* , ProtocolMap > registeredStatus;
 	TQDict< TQPixmap > iconCache;
 };
 
@@ -89,10 +89,10 @@ void OnlineStatusManager::registerOnlineStatus( const OnlineStatus &status, cons
 	s.caption=caption;
 	s.categories=categories;
 	s.options=options;
-	d->registeredtqStatus[status.protocol()].insert(status, s );
+	d->registeredStatus[status.protocol()].insert(status, s );
 }
 
-OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories category) const
+OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories category) const
 {
 	/* Each category has a number which is a power of two, so it is possible to have several categories per online status
 	 * the logaritm in base two if this number, which represent the bit which is equal to 1 in the number is chosen to be in a tree
@@ -106,7 +106,7 @@ OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories
 	 *  To get the parent of a key, one just divide per two the number
 	 */
 	
-	Private::ProtocolMap protocolMap=d->registeredtqStatus[protocol];
+	Private::ProtocolMap protocolMap=d->registeredStatus[protocol];
 
 	int categ_nb=-1;  //the logaritm of category
 	uint category_=category;
@@ -137,11 +137,11 @@ TQString OnlineStatusManager::fingerprint( const OnlineStatus &statusFor, const
 {
 	// create a 'fingerprint' to use as a hash key
 	// fingerprint consists of description/icon name/color/overlay name/size/idle state
-	return TQString::tqfromLatin1("%1/%2/%3/%4/%5/%6")
+	return TQString::fromLatin1("%1/%2/%3/%4/%5/%6")
 	                           .tqarg( statusFor.description() )
 	                           .tqarg( icon )
 	                           .tqarg( color.name() )
-	                           .tqarg( statusFor.overlayIcons().join( TQString::tqfromLatin1( "," ) ) )
+	                           .tqarg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) )
 	                           .tqarg( size )
 	                           .tqarg( idle ? 'i' : 'a' );
 }
@@ -340,7 +340,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 				TQImage basisImage = basis->convertToImage();
 				TQImage overlayImage = overlay.convertToImage();
 				TQPoint offset;
-				if ( (*it).endsWith( TQString::tqfromLatin1( "_overlay" ) ) )
+				if ( (*it).endsWith( TQString::fromLatin1( "_overlay" ) ) )
 				{
 					// it is possible to have more than one overlay icon
 					// to avoid overlapping we place them in different corners
@@ -370,7 +370,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 
 void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent)
 {
-	Private::ProtocolMap protocolMap=d->registeredtqStatus[account->protocol()];
+	Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()];
 	Private::ProtocolMap::Iterator it;
 	for ( it = --protocolMap.end(); it != protocolMap.end(); --it )
 	{