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

diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp
index cf0e2932..f1323f45 100644
--- a/kopete/libkopete/kopetepasswordedaccount.cpp
+++ b/kopete/libkopete/kopetepasswordedaccount.cpp
@@ -28,17 +28,17 @@ struct Kopete::PasswordedAccount::Private
 	Private( const TQString &group, uint maxLen, bool allowBlankPassword ) :
 		password( group, maxLen, allowBlankPassword, "mPassword" ) {}
 	Kopete::Password password;
-	Kopete::OnlineStatus initialStatus;
+	Kopete::OnlineStatus initialtqStatus;
 };
 
-Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name )
- : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, false ) )
+Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, const char *name )
+ : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) )
 {
 }
 
-Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen,
+Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen,
 	bool allowBlankPassword, const char *name )
- : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) )
+ : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) )
 {
 }
 
@@ -58,12 +58,12 @@ void Kopete::PasswordedAccount::connect( )
 	connect( s );
 }
 
-void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStatus )
+void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqStatus )
 {
 	// check that the networkstatus is up
 
 	// warn user somewhere
-	d->initialStatus = initialStatus;
+	d->initialtqStatus = initialtqStatus;
 	TQString cached = password().cachedValue();
 	if( !cached.isNull() || d->password.allowBlankPassword() )
 	{
@@ -80,19 +80,19 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStat
 TQString Kopete::PasswordedAccount::passwordPrompt()
 {
 	if ( password().isWrong() )
-		return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() );
+		return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() );
 	else
-		return i18n( "Please enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() );
+		return i18n( "Please enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() );
 }
 
-Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus()
+Kopete::OnlineStatus Kopete::PasswordedAccount::initialtqStatus()
 {
-	return d->initialStatus;
+	return d->initialtqStatus;
 }
 
 bool Kopete::PasswordedAccount::removeAccount()
 {
-	password().set(TQString::null);
+	password().set(TQString());
 	return Kopete::Account::removeAccount();
 }