diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
tree | 591f1dc22278addb439726c42896376b17bb42bd /kopete/libkopete/kopetepasswordedaccount.cpp | |
parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/libkopete/kopetepasswordedaccount.cpp')
-rw-r--r-- | kopete/libkopete/kopetepasswordedaccount.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index 9c946d21..68dd7917 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::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + 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::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) + : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->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,14 +80,14 @@ 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() |