TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp
index f21d875a..ca50d514 100644
--- a/kopete/libkopete/kopetemimesourcefactory.cpp
+++ b/kopete/libkopete/kopetemimesourcefactory.cpp
@@ -61,7 +61,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 		*it = KURL::decode_string( *it );
 
 	TQPixmap img;
-	if ( parts[0] == TQString::fromLatin1("kopete-contact-icon") )
+	if ( parts[0] == TQString::tqfromLatin1("kopete-contact-icon") )
 	{
 		if ( parts.size() >= 4 )
 		{
@@ -71,7 +71,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 				Contact *contact = account->contacts()[ parts[3] ];
 				if ( contact )
 				{
-					img = contact->onlineStatus().iconFor( contact );
+					img = contact->onlinetqStatus().iconFor( contact );
 					completed = true;
 				}
 				else
@@ -84,14 +84,14 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 			kdDebug( 14010 ) << k_funcinfo << "kopete-contact-icon: insufficient information in abs_name: " << parts << endl;
 	}
 
-	if ( parts[0] == TQString::fromLatin1("kopete-account-icon") )
+	if ( parts[0] == TQString::tqfromLatin1("kopete-account-icon") )
 	{
 		if ( parts.size() >= 3 )
 		{
 			Account *account = AccountManager::self()->findAccount( parts[1], parts[2] );
 			if ( account )
 			{
-				img = account->myself()->onlineStatus().iconFor( account->myself() );
+				img = account->myself()->onlinetqStatus().iconFor( account->myself() );
 				completed = true;
 			}
 			else
@@ -101,7 +101,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 			kdDebug( 14010 ) << k_funcinfo << "kopete-account-icon: insufficient information in abs_name: " << parts << endl;
 	}
 
-	if ( parts[0] == TQString::fromLatin1("kopete-metacontact-icon") )
+	if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-icon") )
 	{
 		if ( parts.size() >= 2 )
 		{
@@ -116,7 +116,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 			kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-icon: insufficient information in abs_name: " << parts << endl;
 	}
 
-	if ( parts[0] == TQString::fromLatin1("kopete-metacontact-photo") )
+	if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-photo") )
 	{
 		if ( parts.size() >= 2 )
 		{
@@ -133,7 +133,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 			kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-photo: insufficient information in abs_name: " << parts << endl;
 	}
 	
-	if ( parts[0] == TQString::fromLatin1("kopete-onlinestatus-icon") )
+	if ( parts[0] == TQString::tqfromLatin1("kopete-onlinestatus-icon") )
 	{
 		if ( parts.size() >= 2 )
 		{
@@ -146,13 +146,13 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
 			 * To find a valid KOS, we ask Kopete's account manager to locate an existing
 			 * account. We'll use the myself() instance of that account to reference its
 			 * current KOS object, which in turn has access to the global KOS icon cache.
-			 * Note that if the cache has been invalidated in the meantime, we'll just
+			 * Note that if the cache has been tqinvalidated in the meantime, we'll just
 			 * get an empty pixmap back.
 			 */
 			Account *account = AccountManager::self()->accounts().getFirst();
 			if ( account )
 			{
-				img = account->myself()->onlineStatus().iconFor( parts[1] );
+				img = account->myself()->onlinetqStatus().iconFor( parts[1] );
 				completed = true;
 			}
 			else