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

diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index baa4fb60..b165c9f4 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -65,8 +65,8 @@ public:
 	TQImage pictureData;
 };
 
-MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent, const char * /* name */ )
-: TQWidget( parent ), KopeteEditAccountWidget( account )
+MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ )
+: TQWidget( tqparent ), KopeteEditAccountWidget( account )
 {
 	d = new MSNEditAccountWidgetPrivate;
 
@@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 
 	d->ui = new MSNEditAccountUI( this );
 
-	d->autoConfig = new KAutoConfig( d->ui );
+	d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) );
 	d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" );
 	d->autoConfig->addWidget( d->ui->privacy_page, "MSN" );
 	//the JabberAccount need to be saved as text, and can't be handled by kautoconfig
@@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 		d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" );
 
 		d->pictureUrl = locateLocal( "appdata", "msnpicture-" +
-			account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" );
+			account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" );
 		d->ui->m_displayPicture->setPixmap( d->pictureUrl );
 
 		d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" ));
@@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply()
 	if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() )
 	{
 		d->pictureUrl = locateLocal( "appdata", "msnpicture-" +
-				account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" );
+				account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" );
 		if ( d->pictureData.save( d->pictureUrl, "PNG" ) )
 		{
 			static_cast<MSNAccount *>( account() )->setPictureUrl( d->pictureUrl );
@@ -291,7 +291,7 @@ void MSNEditAccountWidget::slotAllow()
 	MSNNotifySocket *notify = static_cast<MSNAccount *>( account() )->notifySocket();
 	if ( !notify )
 		return;
-	notify->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null );
+	notify->removeContact( handle, MSNProtocol::BL, TQString(), TQString() );
 
 	d->ui->m_BL->takeItem( item );
 	d->ui->m_AL->insertItem( item );
@@ -310,7 +310,7 @@ void MSNEditAccountWidget::slotBlock()
 	if ( !notify )
 		return;
 
-	notify->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null );
+	notify->removeContact( handle, MSNProtocol::AL, TQString(), TQString() );
 
 	d->ui->m_AL->takeItem( item );
 	d->ui->m_BL->insertItem( item );
@@ -327,7 +327,7 @@ void MSNEditAccountWidget::slotSelectImage()
 {
 	TQString path = 0;
 	bool remoteFile = false;
-	KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "MSN Display Picture" ) );
+	KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "MSN Display Picture" ) );
 	if( filePath.isEmpty() )
 		return;