1 files changed, 21 insertions, 21 deletions

diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 502504f2..f7fbb373 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -300,14 +300,14 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList
 	TQString pic;
 
 	//maybe an extension was given, so try to find the exact file
-	pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt );
+	pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt );
 
 	if( pic.isNull() )
-		pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".mng" ) );
+		pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".mng" ) );
 	if ( pic.isNull() )
-		pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".png" ) );
+		pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".png" ) );
 	if ( pic.isNull() )
-		pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".gif" ) );
+		pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".gif" ) );
 
 	if( !pic.isNull() ) // only add if we found one file
 	{
@@ -328,15 +328,15 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList
 			// Unless we do so, ChatMessagePart::slotScrollView does not work properly and causing
 			// HTMLPart not to be scrolled to the very last message.
 			p.load( e.picPath );
-			result = TQString::tqfromLatin1( "<img align=\"center\" src=\"" ) + 
+			result = TQString::fromLatin1( "<img align=\"center\" src=\"" ) + 
 				  e.picPath + 
-				  TQString::tqfromLatin1( "\" title=\"" ) +
+				  TQString::fromLatin1( "\" title=\"" ) +
 				  matchEscaped + 
-				  TQString::tqfromLatin1( "\" width=\"" ) +
+				  TQString::fromLatin1( "\" width=\"" ) +
 				  TQString::number( p.width() ) +
-				  TQString::tqfromLatin1( "\" height=\"" ) +
+				  TQString::fromLatin1( "\" height=\"" ) +
 				  TQString::number( p.height() ) +
-				  TQString::tqfromLatin1( "\" />" );
+				  TQString::fromLatin1( "\" />" );
 
 			e.picHTMLCode = result;
 			e.matchTextEscaped = matchEscaped;
@@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme )
 	d->emoticonAndPicList.clear();
 	d->emoticonMap.clear();
 
-	TQString filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::tqfromLatin1( "/emoticons.xml" ) );
+	TQString filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/emoticons.xml" ) );
 	if(!filename.isEmpty())
 		return initEmoticon_emoticonsxml( filename );
-	filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::tqfromLatin1( "/icondef.xml" ) );
+	filename= KGlobal::dirs()->findResource( "emoticons",  d->theme + TQString::fromLatin1( "/icondef.xml" ) );
 	if(!filename.isEmpty())
 		return initEmoticon_JEP0038( filename );
 	kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl;
@@ -376,7 +376,7 @@ void Emoticons::initEmoticons( const TQString &theme )
 
 void Emoticons::initEmoticon_emoticonsxml( const TQString & filename)
 {
-	TQDomDocument emoticonMap( TQString::tqfromLatin1( "messaging-emoticon-map" ) );	
+	TQDomDocument emoticonMap( TQString::fromLatin1( "messaging-emoticon-map" ) );	
 	
 	TQFile mapFile( filename );
 	mapFile.open( IO_ReadOnly );
@@ -389,10 +389,10 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename)
 		TQDomElement element = node.toElement();
 		if( !element.isNull() )
 		{
-			if( element.tagName() == TQString::tqfromLatin1( "emoticon" ) )
+			if( element.tagName() == TQString::fromLatin1( "emoticon" ) )
 			{
 				TQString emoticon_file = element.attribute(
-						TQString::tqfromLatin1( "file" ), TQString() );
+						TQString::fromLatin1( "file" ), TQString() );
 				TQStringList items;
 
 				TQDomNode emoticonNode = node.firstChild();
@@ -401,7 +401,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename)
 					TQDomElement emoticonElement = emoticonNode.toElement();
 					if( !emoticonElement.isNull() )
 					{
-						if( emoticonElement.tagName() == TQString::tqfromLatin1( "string" ) )
+						if( emoticonElement.tagName() == TQString::fromLatin1( "string" ) )
 						{
 							items << emoticonElement.text();
 						}
@@ -432,7 +432,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename)
 
 void Emoticons::initEmoticon_JEP0038( const TQString & filename)
 {
-	TQDomDocument emoticonMap( TQString::tqfromLatin1( "icondef" ) );	
+	TQDomDocument emoticonMap( TQString::fromLatin1( "icondef" ) );	
 	
 	TQFile mapFile( filename );
 	mapFile.open( IO_ReadOnly );
@@ -445,7 +445,7 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename)
 		TQDomElement element = node.toElement();
 		if( !element.isNull() )
 		{
-			if( element.tagName() == TQString::tqfromLatin1( "icon" ) )
+			if( element.tagName() == TQString::fromLatin1( "icon" ) )
 			{
 				TQStringList items;
 				TQString emoticon_file;
@@ -456,16 +456,16 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename)
 					TQDomElement emoticonElement = emoticonNode.toElement();
 					if( !emoticonElement.isNull() )
 					{
-						if( emoticonElement.tagName() == TQString::tqfromLatin1( "text" ) )
+						if( emoticonElement.tagName() == TQString::fromLatin1( "text" ) )
 						{
 							//TODO xml:lang
 							items << emoticonElement.text();
 						}
-						else if( emoticonElement.tagName() == TQString::tqfromLatin1( "object" ) && emoticon_file.isEmpty() )
+						else if( emoticonElement.tagName() == TQString::fromLatin1( "object" ) && emoticon_file.isEmpty() )
 						{
 							TQString mime= emoticonElement.attribute(
-									TQString::tqfromLatin1( "mime" ), TQString::tqfromLatin1("image/*") );
-							if(mime.startsWith(TQString::tqfromLatin1("image/")) && !mime.endsWith(TQString::tqfromLatin1("/svg+xml")))
+									TQString::fromLatin1( "mime" ), TQString::fromLatin1("image/*") );
+							if(mime.startsWith(TQString::fromLatin1("image/")) && !mime.endsWith(TQString::fromLatin1("/svg+xml")))
 							{
 								emoticon_file = emoticonElement.text();
 							}