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

diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 4cc9d628..7ddf4041 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -296,7 +296,7 @@ void JabberGroupContact::sendFile ( const KURL &sourceURL, const TQString &/*fil
 
 	// if the file location is null, then get it from a file open dialog
 	if ( !sourceURL.isValid () )
-		filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) );
+		filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) );
 	else
 		filePath = sourceURL.path(-1);
 
@@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( )
 	}
 	
 	//TODO: away message
-	XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
-	account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus );
+	XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
+	account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus );
 }
 
 void JabberGroupContact::slotChangeNick( )
@@ -354,14 +354,14 @@ void JabberGroupContact::slotChangeNick( )
 	
 	bool ok;
 	TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ),
-			i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).arg(rosterItem().jid().userHost()),
+			i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).tqarg(rosterItem().jid().userHost()),
 			mNick, &ok );
 	if ( !ok || !account()->isConnected())
 		return;
 	
 	mNick=futureNewNickName;
 	
-	XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
+	XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
 	account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user()  , mNick , status);
 
 }