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

diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 5edc1b27..329ba8e8 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -61,7 +61,7 @@ public:
 	const TQString configGroup;
 	/** Is the password being remembered? */
 	bool remembered;
-	/** The current password in the KConfig file, or TQString::null if no password there */
+	/** The current password in the KConfig file, or TQString() if no password there */
 	TQString passwordFromKConfig;
 	/** The maximum length allowed for this password, or -1 if there is no limit */
 	uint maximumLength;
@@ -146,7 +146,7 @@ public:
 		if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() )
 			return mPassword.d->passwordFromKConfig;
 
-		return TQString::null;
+		return TQString();
 	}
 
 	void finished( const TQString &result )
@@ -215,7 +215,7 @@ public:
 
 	void slotCancelPressed()
 	{
-		finished( TQString::null );
+		finished( TQString() );
 	}
 
 private:
@@ -276,7 +276,7 @@ public:
 		if ( mWallet && mWallet->writePassword( mPassword.d->configGroup, mNewPass ) == 0 )
 		{
 			mPassword.d->remembered = true;
-			mPassword.d->passwordFromKConfig = TQString::null;
+			mPassword.d->passwordFromKConfig = TQString();
 			mPassword.writeConfig();
 			return true;
 		}
@@ -288,13 +288,13 @@ public:
 
 			//NOTE: This will start a nested event loop. However, this is fine; the only code we
 			// call after this point is in Kopete::Password, so as long as we've not been deleted
-			// everything should work out OK. We have no parent TQObject, so we should survive.
+			// everything should work out OK. We have no tqparent TQObject, so we should survive.
 			if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(),
 			        i18n( "<qt>Kopete is unable to save your password securely in your wallet;<br>"
 			              "do you want to save the password in the <b>unsafe</b> configuration file instead?</qt>" ),
 			        i18n( "Unable to Store Secure Password" ),
-			        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ),
-			        TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue )
+			        KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ) ),
+			        TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue )
 			{
 				return false;
 			}
@@ -329,7 +329,7 @@ public:
 		if ( clearPassword() )
 		{
 			mPassword.setWrong( true );
-			mPassword.d->cachedValue = TQString::null;
+			mPassword.d->cachedValue = TQString();
 		}
 
 		delete this;
@@ -339,7 +339,7 @@ public:
 		kdDebug( 14010 ) << k_funcinfo << " clearing password" << endl;
 
 		mPassword.d->remembered = false;
-		mPassword.d->passwordFromKConfig = TQString::null;
+		mPassword.d->passwordFromKConfig = TQString();
 		mPassword.writeConfig();
 		if ( mWallet )
 			mWallet->removeEntry( mPassword.d->configGroup );
@@ -385,7 +385,7 @@ void Kopete::Password::readConfig()
 
 	TQString passwordCrypted = config->readEntry( "Password" );
 	if ( passwordCrypted.isNull() )
-		d->passwordFromKConfig = TQString::null;
+		d->passwordFromKConfig = TQString();
 	else
 		d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted );
 
@@ -448,7 +448,7 @@ void Kopete::Password::setWrong( bool bWrong )
 	d->isWrong = bWrong;
 	writeConfig();
 
-	if ( bWrong ) d->cachedValue = TQString::null;
+	if ( bWrong ) d->cachedValue = TQString();
 }
 
 void Kopete::Password::requestWithoutPrompt( TQObject *returnObj, const char *slot )