1 files changed, 9 insertions, 9 deletions
diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp
index 68dd7917..9c946d21 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 initialtqStatus;
+	Kopete::OnlineStatus initialStatus;
 };
 
 Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name )
- : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) )
+ : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, false ) )
 {
 }
 
 Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen,
 	bool allowBlankPassword, const char *name )
- : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) )
+ : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) )
 {
 }
 
@@ -58,12 +58,12 @@ void Kopete::PasswordedAccount::connect( )
 	connect( s );
 }
 
-void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqStatus )
+void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStatus )
 {
 	// check that the networkstatus is up
 
 	// warn user somewhere
-	d->initialtqStatus = initialtqStatus;
+	d->initialStatus = initialStatus;
 	TQString cached = password().cachedValue();
 	if( !cached.isNull() || d->password.allowBlankPassword() )
 	{
@@ -80,14 +80,14 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqSt
 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>" ).tqarg( protocol()->displayName(), accountId() );
+		return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() );
 	else
-		return i18n( "Please enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() );
+		return i18n( "Please enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() );
 }
 
-Kopete::OnlineStatus Kopete::PasswordedAccount::initialtqStatus()
+Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus()
 {
-	return d->initialtqStatus;
+	return d->initialStatus;
 }
 
 bool Kopete::PasswordedAccount::removeAccount()