From 53fe3bf43aeb43f51f6b6ebb7453938e85c0223b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 1 Dec 2018 23:39:45 +0900 Subject: Adapted to new KPasswordEdit::password() signature. This relates to bug 2961. Signed-off-by: Michele Calgaro --- kopete/protocols/jabber/jabberaccount.cpp | 2 +- kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp | 6 +++--- kopete/protocols/jabber/ui/jabberregisteraccount.cpp | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'kopete/protocols/jabber') diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 4cc2c866..3fa61483 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -1515,7 +1515,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T { case JabberClient::InvalidPasswordForMUC: { - TQCString password; + TQString password; int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node())); if (result == KPasswordDialog::Accepted) m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password); 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; -- cgit v1.2.1