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, 12 insertions, 12 deletions

diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index cffc65f9..a380d3c4 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 	switch ( item.subscription().type () )
 	{
 		case XMPP::Subscription::None:
-			setProperty ( protocol()->propSubscriptionStatus,
+			setProperty ( protocol()->propSubscriptiontqStatus,
 						  i18n ( "You cannot see each others' status." ) );
 			break;
 		case XMPP::Subscription::To:
-			setProperty ( protocol()->propSubscriptionStatus,
+			setProperty ( protocol()->propSubscriptiontqStatus,
 						  i18n ( "You can see this contact's status but they cannot see your status." ) );
 			break;
 		case XMPP::Subscription::From:
-			setProperty ( protocol()->propSubscriptionStatus,
+			setProperty ( protocol()->propSubscriptiontqStatus,
 						  i18n ( "This contact can see your status but you cannot see their status." ) );
 			break;
 		case XMPP::Subscription::Both:
-			setProperty ( protocol()->propSubscriptionStatus,
+			setProperty ( protocol()->propSubscriptiontqStatus,
 						  i18n ( "You can see each others' status." ) );
 			break;
 	}
@@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 		// find all groups our contact is in but that are not in the server side roster
 		for ( unsigned i = 0; i < metaContact()->groups().count (); i++ )
 		{
-			if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () )
+			if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () )
 				groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) );
 		}
 	
@@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 		* risk removing the contact from the visible contact list. In this
 		* case, we need to make sure at least the top level group stays.
 		*/
-		if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) )
+		if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) )
 		{
 			groupsToRemoveFrom.remove ( Kopete::Group::topLevel () );
 		}
@@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 	setDontSync ( false );
 	
 	//can't do it now because it's called from contructor at a point some virtual function are not available
-	TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus()));
+	TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus()));
 
 }
 
@@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList ()
 	setProperty ( protocol()->propAvailableResources, resourceListStr );
 }
 
-void JabberBaseContact::reevaluateStatus ()
+void JabberBaseContact::reevaluatetqStatus ()
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl;
 
@@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData,
 	// Contact id and display name are already set for us, only add the rest
 	serializedData["JID"] = mRosterItem.jid().full();
 
-	serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (","));
+	serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (","));
 }
 
 void JabberBaseContact::slotUserInfo( )
@@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 	// update vCard cache timestamp if this is not a temporary contact
 	if ( metaContact() && !metaContact()->isTemporary () )
 	{
-		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
+		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
 	}
 
 	
@@ -630,9 +630,9 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 
 	TQImage contactPhoto;
 	TQString fullJid =  mRosterItem.jid().full();
-	TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-")  +".png");
+	TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-")  +".png");
 	
-	// photo() is a QByteArray
+	// photo() is a TQByteArray
 	if ( !vCard.photo().isEmpty() )
 	{
 		kdDebug( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Contact has a photo embedded into his vCard." << endl;