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

diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 0d544d27..e34518b7 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -38,9 +38,9 @@ namespace Kopete {
 namespace UI {
 
 
-AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 )
+AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 )
 {
-	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) );
+	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) );
 	connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) );
 	connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) );
 }
@@ -66,7 +66,7 @@ void AddressBookLinkWidget::slotClearAddressee()
 	edtAddressee->clear();
 	btnClear->setEnabled( false );
 	KABC::Addressee mrEmpty;
-	mSelectedUid = TQString::null;
+	mSelectedUid = TQString();
 	emit addresseeChanged( mrEmpty );
 }
 
@@ -74,11 +74,11 @@ void AddressBookLinkWidget::slotSelectAddressee()
 {
 	TQString message;
 	if ( mMetaContact )
-		message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() );
+		message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() );
  	else
 		message = i18n("Choose the corresponding entry in the address book" );
 
-	Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString::null ), this );
+	Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString() ), this );
 	int result = dialog.exec();
 
 	KABC::Addressee addr;
@@ -88,7 +88,7 @@ void AddressBookLinkWidget::slotSelectAddressee()
 
 		edtAddressee->setText( addr.realName() );
 		btnClear->setEnabled( !addr.isEmpty() );
-		mSelectedUid = ( addr.isEmpty() ? TQString::null : addr.uid() );
+		mSelectedUid = ( addr.isEmpty() ? TQString() : addr.uid() );
 		emit addresseeChanged( addr );
 	}
 }