1 files changed, 33 insertions, 33 deletions

diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp
index a9e812cd..89e9ea29 100644
--- a/kopete/libkopete/kopetecontactlistelement.cpp
+++ b/kopete/libkopete/kopetecontactlistelement.cpp
@@ -90,21 +90,21 @@ const TQValueList<TQDomElement> ContactListElement::toXML()
 {
 	TQDomDocument pluginData;
 	TQValueList<TQDomElement> pluginNodes;
-	pluginData.appendChild( pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ) );
+	pluginData.appendChild( pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ) );
 
 	if ( !d->pluginData.isEmpty() )
 	{
 		TQMap<TQString, TQMap<TQString, TQString> >::ConstIterator pluginIt;
 		for ( pluginIt = d->pluginData.begin(); pluginIt != d->pluginData.end(); ++pluginIt )
 		{
-			TQDomElement pluginElement = pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) );
-			pluginElement.setAttribute( TQString::tqfromLatin1( "plugin-id" ), pluginIt.key()  );
+			TQDomElement pluginElement = pluginData.createElement( TQString::fromLatin1( "plugin-data" ) );
+			pluginElement.setAttribute( TQString::fromLatin1( "plugin-id" ), pluginIt.key()  );
 
 			TQMap<TQString, TQString>::ConstIterator it;
 			for ( it = pluginIt.data().begin(); it != pluginIt.data().end(); ++it )
 			{
-				TQDomElement pluginDataField = pluginData.createElement( TQString::tqfromLatin1( "plugin-data-field" ) );
-				pluginDataField.setAttribute( TQString::tqfromLatin1( "key" ), it.key()  );
+				TQDomElement pluginDataField = pluginData.createElement( TQString::fromLatin1( "plugin-data-field" ) );
+				pluginDataField.setAttribute( TQString::fromLatin1( "key" ), it.key()  );
 				pluginDataField.appendChild( pluginData.createTextNode(  it.data()  ) );
 				pluginElement.appendChild( pluginDataField );
 			}
@@ -115,39 +115,39 @@ const TQValueList<TQDomElement> ContactListElement::toXML()
 	}
 	if ( !d->icons.isEmpty() )
 	{
-		TQDomElement iconsElement = pluginData.createElement( TQString::tqfromLatin1( "custom-icons" ) );
-		iconsElement.setAttribute( TQString::tqfromLatin1( "use" ), d->useCustomIcon ?  TQString::tqfromLatin1( "1" ) : TQString::tqfromLatin1( "0" ) );
+		TQDomElement iconsElement = pluginData.createElement( TQString::fromLatin1( "custom-icons" ) );
+		iconsElement.setAttribute( TQString::fromLatin1( "use" ), d->useCustomIcon ?  TQString::fromLatin1( "1" ) : TQString::fromLatin1( "0" ) );
 
 		for ( TQMap<IconState, TQString >::ConstIterator it = d->icons.begin(); it != d->icons.end(); ++it )
 		{
-			TQDomElement iconElement = pluginData.createElement( TQString::tqfromLatin1( "icon" ) );
+			TQDomElement iconElement = pluginData.createElement( TQString::fromLatin1( "icon" ) );
 			TQString stateStr;
 			switch ( it.key() )
 			{
 			case Open:
-				stateStr = TQString::tqfromLatin1( "open" );
+				stateStr = TQString::fromLatin1( "open" );
 				break;
 			case Closed:
-				stateStr = TQString::tqfromLatin1( "closed" );
+				stateStr = TQString::fromLatin1( "closed" );
 				break;
 			case Online:
-				stateStr = TQString::tqfromLatin1( "online" );
+				stateStr = TQString::fromLatin1( "online" );
 				break;
 			case Away:
-				stateStr = TQString::tqfromLatin1( "away" );
+				stateStr = TQString::fromLatin1( "away" );
 				break;
 			case Offline:
-				stateStr = TQString::tqfromLatin1( "offline" );
+				stateStr = TQString::fromLatin1( "offline" );
 				break;
 			case Unknown:
-				stateStr = TQString::tqfromLatin1( "unknown" );
+				stateStr = TQString::fromLatin1( "unknown" );
 				break;
 			case None:
 			default:
-				stateStr = TQString::tqfromLatin1( "none" );
+				stateStr = TQString::fromLatin1( "none" );
 				break;
 			}
-			iconElement.setAttribute( TQString::tqfromLatin1( "state" ), stateStr );
+			iconElement.setAttribute( TQString::fromLatin1( "state" ), stateStr );
 			iconElement.appendChild( pluginData.createTextNode( it.data() )  );
 			iconsElement.appendChild( iconElement );
 		}
@@ -159,52 +159,52 @@ const TQValueList<TQDomElement> ContactListElement::toXML()
 
 bool ContactListElement::fromXML( const TQDomElement& element )
 {
-	if ( element.tagName() == TQString::tqfromLatin1( "plugin-data" ) )
+	if ( element.tagName() == TQString::fromLatin1( "plugin-data" ) )
 	{
 		TQMap<TQString, TQString> pluginData;
-		TQString pluginId = element.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() );
+		TQString pluginId = element.attribute( TQString::fromLatin1( "plugin-id" ), TQString() );
 
 		//in kopete 0.6 the AIM protocol was called OSCAR
-		if ( pluginId == TQString::tqfromLatin1( "OscarProtocol" ) )
-			pluginId = TQString::tqfromLatin1( "AIMProtocol" );
+		if ( pluginId == TQString::fromLatin1( "OscarProtocol" ) )
+			pluginId = TQString::fromLatin1( "AIMProtocol" );
 
 		TQDomNode field = element.firstChild();
 		while( !field.isNull() )
 		{
 			TQDomElement fieldElement = field.toElement();
-			if ( fieldElement.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) )
+			if ( fieldElement.tagName() == TQString::fromLatin1( "plugin-data-field" ) )
 			{
-				pluginData.insert( fieldElement.attribute( TQString::tqfromLatin1( "key" ),
-					TQString::tqfromLatin1( "undefined-key" ) ), fieldElement.text() );
+				pluginData.insert( fieldElement.attribute( TQString::fromLatin1( "key" ),
+					TQString::fromLatin1( "undefined-key" ) ), fieldElement.text() );
 			}
 			field = field.nextSibling();
 		}
 		d->pluginData.insert( pluginId, pluginData );
 	}
-	else if ( element.tagName() == TQString::tqfromLatin1( "custom-icons" ) )
+	else if ( element.tagName() == TQString::fromLatin1( "custom-icons" ) )
 	{
-		d->useCustomIcon= element.attribute( TQString::tqfromLatin1( "use" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" );
+		d->useCustomIcon= element.attribute( TQString::fromLatin1( "use" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" );
 		TQDomNode ic = element.firstChild();
 		while( !ic.isNull() )
 		{
 			TQDomElement iconElement = ic.toElement();
-			if ( iconElement.tagName() == TQString::tqfromLatin1( "icon" ) )
+			if ( iconElement.tagName() == TQString::fromLatin1( "icon" ) )
 			{
-				TQString stateStr = iconElement.attribute( TQString::tqfromLatin1( "state" ), TQString() );
+				TQString stateStr = iconElement.attribute( TQString::fromLatin1( "state" ), TQString() );
 				TQString icon = iconElement.text();
 				IconState state = None;
 
-				if ( stateStr == TQString::tqfromLatin1( "open" ) )
+				if ( stateStr == TQString::fromLatin1( "open" ) )
 					state = Open;
-				if ( stateStr == TQString::tqfromLatin1( "closed" ) )
+				if ( stateStr == TQString::fromLatin1( "closed" ) )
 					state = Closed;
-				if ( stateStr == TQString::tqfromLatin1( "online" ) )
+				if ( stateStr == TQString::fromLatin1( "online" ) )
 					state = Online;
-				if ( stateStr == TQString::tqfromLatin1( "offline" ) )
+				if ( stateStr == TQString::fromLatin1( "offline" ) )
 					state = Offline;
-				if ( stateStr == TQString::tqfromLatin1( "away" ) )
+				if ( stateStr == TQString::fromLatin1( "away" ) )
 					state = Away;
-				if ( stateStr == TQString::tqfromLatin1( "unknown" ) )
+				if ( stateStr == TQString::fromLatin1( "unknown" ) )
 					state = Unknown;
 
 				d->icons[ state ] = icon;