From 6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 28 Nov 2018 00:04:05 +0900 Subject: Adapted to new KPasswordEdit::password() signature. This relates to bug 2961. Signed-off-by: Michele Calgaro --- kcontrol/hwmanager/cryptpassworddlg.cpp | 5 +++-- kcontrol/hwmanager/hwmanager.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'kcontrol/hwmanager') diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp index 1d66d89c1..b0f0e1cd8 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.cpp +++ b/kcontrol/hwmanager/cryptpassworddlg.cpp @@ -90,7 +90,8 @@ CryptPasswordDialog::~CryptPasswordDialog() TQByteArray CryptPasswordDialog::password() { if (m_base->textPasswordButton->isOn() == true) { - m_password.duplicate(m_base->textPasswordEntry->password(), strlen(m_base->textPasswordEntry->password())); + TQCString pass = m_base->textPasswordEntry->password().utf8(); + m_password.duplicate(pass, pass.length()); if (m_useCard) *m_useCard = false; } else if (m_base->filePasswordButton->isOn() == true) { @@ -109,7 +110,7 @@ void CryptPasswordDialog::processLockouts() { m_base->textPasswordEntry->setEnabled(true); m_base->filePasswordURL->setEnabled(false); m_base->textPasswordEntry->setFocus(); - if (strlen(m_base->textPasswordEntry->password()) > 0) { + if (m_base->textPasswordEntry->password().length() > 0) { enableButtonOK(true); } else { diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 1cd8b04e0..5a5fb3e99 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -229,7 +229,7 @@ void TDEHWManager::deviceChanged(TDEGenericDevice* device) { } void TDEHWManager::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) { - TQCString password; + TQString password; int result = KPasswordDialog::getPassword(password, prompt); if (result == KPasswordDialog::Accepted) { cdevice->setProvidedPin(password); -- cgit v1.2.3