diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-01 23:39:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-01 23:39:45 +0900 |
| commit | 53fe3bf43aeb43f51f6b6ebb7453938e85c0223b (patch) | |
| tree | d63838d4442041515669c84a02700bbca9f1aa77 /kopete/protocols/jabber/ui | |
| parent | ca937b0c3ebc76d1a079e5d4b22022c4ccb29889 (diff) | |
| download | tdenetwork-53fe3bf43aeb43f51f6b6ebb7453938e85c0223b.tar.gz tdenetwork-53fe3bf43aeb43f51f6b6ebb7453938e85c0223b.zip | |
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kopete/protocols/jabber/ui')
| -rw-r--r-- | kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp | 6 | ||||
| -rw-r--r-- | kopete/protocols/jabber/ui/jabberregisteraccount.cpp | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index c665bf94..c890b158 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -49,7 +49,7 @@ DlgJabberChangePassword::~DlgJabberChangePassword() void DlgJabberChangePassword::slotOk () { - if ( !strlen ( m_mainWidget->peCurrentPassword->password () ) + if ( m_mainWidget->peCurrentPassword->password().length() == 0 || ( m_account->password().cachedValue () != m_mainWidget->peCurrentPassword->password () ) ) { KMessageBox::queuedMessageBox ( this, KMessageBox::Sorry, @@ -58,7 +58,7 @@ void DlgJabberChangePassword::slotOk () return; } - if ( strcmp ( m_mainWidget->peNewPassword1->password (), m_mainWidget->peNewPassword2->password () ) != 0 ) + if ( m_mainWidget->peNewPassword1->password() != m_mainWidget->peNewPassword2->password() ) { KMessageBox::queuedMessageBox ( this, KMessageBox::Sorry, i18n ( "Your new passwords do not match. Please enter them again." ), @@ -66,7 +66,7 @@ void DlgJabberChangePassword::slotOk () return; } - if ( !strlen ( m_mainWidget->peNewPassword1->password () ) ) + if ( !m_mainWidget->peNewPassword1->password().length() ) { KMessageBox::queuedMessageBox ( this, KMessageBox::Sorry, i18n ( "For security reasons, you are not allowed to set an empty password." ), diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index f3d01c76..753636e0 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( mMainWidget->lePassword->password().isEmpty() || + mMainWidget->lePasswordVerify->password().isEmpty() ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) ); valid = false; @@ -155,8 +155,7 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( mMainWidget->lePassword->password() != mMainWidget->lePasswordVerify->password() ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; |