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

diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index bb20611b..dee7534a 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -47,18 +47,18 @@
 #include "jabberchooseserver.h"
 #include "dlgjabberregisteraccount.h"
 
-JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name )
- : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"),
+JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name )
+ : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"),
  				 KDialogBase::Ok | KDialogBase::Cancel )
 {
 
-	mParentWidget = parent;
+	mParentWidget = tqparent;
 
 	// setup main dialog
 	mMainWidget = new DlgJabberRegisterAccount ( this );
 	setMainWidget ( mMainWidget );
 
-	// replace "Ok" button with a "Register" button
+	// tqreplace "Ok" button with a "Register" button
 	KGuiItem registerButton = KStdGuiItem::ok();
 	registerButton.setText ( i18n ( "Register" ) );
 	setButtonOK ( registerButton );
@@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent,
 	mSuccess = false;
 
 	// get all settings from the main dialog
-	mMainWidget->leServer->setText ( parent->mServer->text () );
-	mMainWidget->leJID->setText ( parent->mID->text () );
-	mMainWidget->lePassword->setText ( parent->mPass->password () );
-	//	mMainWidget->lePasswordVerify->setText ( parent->mPass->password () ); //BUG 114631
-	mMainWidget->sbPort->setValue ( parent->mPort->value () );
-	mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () );
+	mMainWidget->leServer->setText ( tqparent->mServer->text () );
+	mMainWidget->leJID->setText ( tqparent->mID->text () );
+	mMainWidget->lePassword->setText ( tqparent->mPass->password () );
+	//	mMainWidget->lePasswordVerify->setText ( tqparent->mPass->password () ); //BUG 114631
+	mMainWidget->sbPort->setValue ( tqparent->mPort->value () );
+	mMainWidget->cbUseSSL->setChecked ( tqparent->cbUseSSL->isChecked () );
 
 	// connect buttons to slots, ok is already connected by default
 	connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) );
@@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData ()
 	}
 
 	if ( valid &&
-	   ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
-	     TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
+	   ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
+	     TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
 	{
 		mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) );
 		valid = false;
@@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData ()
 	}
 
 	if ( valid &&
-	   ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) !=
-	     TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
+	   ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) !=
+	     TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
 	{
 		mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) );
 		valid = false;
@@ -259,7 +259,7 @@ void JabberRegisterAccount::slotOk ()
 	jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () );
 
 	// start connection, no authentication
-	switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString::null, false ) )
+	switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) )
 	{
 		case JabberClient::NoTLS:
 			// no SSL support, at the connecting stage this means the problem is client-side
@@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone ()
 	{
 		mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) );
 
-		// save settings to parent
+		// save settings to tqparent
 		mParentWidget->mServer->setText ( mMainWidget->leServer->text () );
 		mParentWidget->mID->setText ( mMainWidget->leJID->text () );
 		mParentWidget->mPass->setPassword ( mMainWidget->lePassword->password () );