From 261802a2b1b4afb92a36955a247ff37d59becce2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 2 Dec 2018 16:19:53 +0900 Subject: Adapted to new KPasswordEdit::password() signature. This relates to bug 2961. Signed-off-by: Michele Calgaro --- kftpgrabber/src/kftpbookmarks.cpp | 6 +++--- kftpgrabber/src/kftpbookmarks.h | 2 +- kftpgrabber/src/kftpsession.cpp | 2 +- kftpgrabber/src/widgets/quickconnect.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kftpgrabber/src/kftpbookmarks.cpp b/kftpgrabber/src/kftpbookmarks.cpp index 9c2ec32..144ad37 100644 --- a/kftpgrabber/src/kftpbookmarks.cpp +++ b/kftpgrabber/src/kftpbookmarks.cpp @@ -301,8 +301,8 @@ void Manager::load(const TQString &filename) pwd_entry: int saveToWallet = 1; - TQCString p_pass(KFTPAPI::getInstance()->walletConnection()->getPassword("bookmarkDecryptPwd").ascii()); - if (TQString(p_pass).isNull()) { + TQString p_pass(KFTPAPI::getInstance()->walletConnection()->getPassword("bookmarkDecryptPwd")); + if (p_pass.isNull()) { // Ask the user for a password int ret = KPasswordDialog::getPassword(p_pass, i18n("This bookmark file is encrypted. Please enter key for decryption."), &saveToWallet); @@ -717,7 +717,7 @@ void Manager::setupClient(Site *site, KFTPEngine::Thread *client) // Should we use a X509 certificate ? if (site->getIntProperty("use_cert") && site->getProperty("protocol") == "ftp") { // Ask the user for the decryption password - TQCString certPass; + TQString certPass; KPasswordDialog::getPassword(certPass, i18n("Please provide your X509 certificate decryption password.")); static_cast(client->socket())->setSslClientCertificate(KSSLPKCS12::loadCertFile(site->getProperty("tls_cert_path"), certPass)); diff --git a/kftpgrabber/src/kftpbookmarks.h b/kftpgrabber/src/kftpbookmarks.h index 5e82d47..7f90ae2 100644 --- a/kftpgrabber/src/kftpbookmarks.h +++ b/kftpgrabber/src/kftpbookmarks.h @@ -134,7 +134,7 @@ private: TQCache m_siteCache; TQDomDocument m_document; - TQCString m_decryptKey; + TQString m_decryptKey; TQString m_filename; TQDomNode findSiteElementByUrl(const KURL &url, TQDomNode parent = TQDomNode()); diff --git a/kftpgrabber/src/kftpsession.cpp b/kftpgrabber/src/kftpsession.cpp index fa6c81b..23cd64a 100644 --- a/kftpgrabber/src/kftpsession.cpp +++ b/kftpgrabber/src/kftpsession.cpp @@ -384,7 +384,7 @@ void Session::slotClientEngineEvent(KFTPEngine::Event *event) } case Event::EventPubkeyPassword: { // A public-key authentication password was requested - TQCString pass; + TQString pass; int ret = KPasswordDialog::getPassword(pass, i18n("Please provide your private key decryption password.")); if (ret == KPasswordDialog::Accepted) { diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp index a71a716..0a62f8d 100644 --- a/kftpgrabber/src/widgets/quickconnect.cpp +++ b/kftpgrabber/src/widgets/quickconnect.cpp @@ -367,7 +367,7 @@ void QuickConnectDialog::setupClient(KFTPEngine::Thread *client) // Should we use a X509 certificate ? if (m_protocolAdvancedDialog->isCertChecked() && m_layout->protocolBox->currentItem() == SP_FTP) { // Ask the user for the decryption password - TQCString certPass; + TQString certPass; KPasswordDialog::getPassword(certPass, i18n("Please provide your X509 certificate decryption password.")); static_cast(client->socket())->setSslClientCertificate(KSSLPKCS12::loadCertFile(m_protocolAdvancedDialog->getCertPath(), certPass)); -- cgit v1.2.1