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

diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp
index 67f2d04f..91ca9b27 100644
--- a/kopete/libkopete/kopetetransfermanager.cpp
+++ b/kopete/libkopete/kopetetransfermanager.cpp
@@ -84,11 +84,11 @@ Kopete::Transfer::~Transfer()
 KURL Kopete::Transfer::displayURL( const Kopete::Contact *contact, const TQString &file )
 {
 	KURL url;
-	url.setProtocol( TQString::fromLatin1("kopete") );
+	url.setProtocol( TQString::tqfromLatin1("kopete") );
 
 	TQString host;
 	if( !contact )
-		host = TQString::fromLatin1("unknown origin");
+		host = TQString::tqfromLatin1("unknown origin");
 	else if( contact->metaContact() )
 		host = contact->metaContact()->displayName();
 	else
@@ -158,7 +158,7 @@ Kopete::TransferManager* Kopete::TransferManager::transferManager()
 	return s_transferManager;
 }
 
-Kopete::TransferManager::TransferManager( TQObject *parent ) : TQObject( parent )
+Kopete::TransferManager::TransferManager( TQObject *tqparent ) : TQObject( tqparent )
 {
 	nextID = 0;
 }
@@ -234,7 +234,7 @@ void Kopete::TransferManager::sendFile( const KURL &file, const TQString &fname,
 
 	//If the file location is null, then get it from a file open dialog
 	if( !url.isValid() )
-		url = KFileDialog::getOpenURL( TQString::null, TQString::fromLatin1("*"), 0l, i18n( "Kopete File Transfer" ));
+		url = KFileDialog::getOpenURL( TQString(), TQString::tqfromLatin1("*"), 0l, i18n( "Kopete File Transfer" ));
 	else
 	{
 		filename = fname;