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

diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index dfbb93a4..2ee61e97 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -44,8 +44,8 @@
 
 using Kopete::UserInfoDialog;
 
-GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* parent )
-: Kopete::Contact( account, TQString::number( uin ), parent ), uin_( uin )
+GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* tqparent )
+: Kopete::Contact( account, TQString::number( uin ), tqparent ), uin_( uin )
 {
 	msgManager_ = 0L;
 	account_ = static_cast<GaduAccount*>( account );
@@ -66,21 +66,21 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco
 	setFileCapable( true );
 
 	//offline
-	setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) );
+	setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) );
 
 	setProperty( Kopete::Global::Properties::self()->nickName(), name );
 }
 
-QString
+TQString
 GaduContact::identityId() const
 {
-	return parentIdentity_;
+	return tqparentIdentity_;
 }
 
 void
 GaduContact::setParentIdentity( const TQString& id)
 {
-	parentIdentity_ = id;
+	tqparentIdentity_ = id;
 }
 
 uin_t
@@ -96,7 +96,7 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint
 
 	//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);
 
@@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint
 
 
 void
-GaduContact::changedStatus( KGaduNotify* newstatus )
+GaduContact::changedtqStatus( KGaduNotify* newstatus )
 {
 	if ( newstatus->description.isNull() ) {
-		setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
+		setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
 		removeProperty( GaduProtocol::protocol()->propAwayMessage );
 	}
 	else {
-		setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
+		setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
 		setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description );
 	}
 
@@ -230,7 +230,7 @@ GaduContact::slotUserInfo()
 
 	dlg->setName( metaContact()->displayName() );
 	dlg->setId( TQString::number( uin_ ) );
-	dlg->setStatus( onlineStatus().description() );
+	dlg->settqStatus( onlinetqStatus().description() );
 	dlg->setAwayMessage( description_ );
 	dlg->show();
 }
@@ -277,7 +277,7 @@ GaduContactsList::ContactLine*
 GaduContact::contactDetails()
 {
 	Kopete::GroupList		groupList;
-	QString			groups;
+	TQString			groups;
 
 	GaduContactsList::ContactLine* cl = new GaduContactsList::ContactLine;
 
@@ -315,7 +315,7 @@ GaduContact::contactDetails()
 	return cl;
 }
 
-QString
+TQString
 GaduContact::findBestContactName( const GaduContactsList::ContactLine* cl )
 {
 	TQString name;