diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-27 14:55:23 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-27 14:55:23 +0900 |
| commit | 6ec26d859be239e6db1bb392140db76227a56522 (patch) | |
| tree | 1cae6e9ff2c6537c9454113f54a20b123f3921d1 /tdecert | |
| parent | 82afa07a430c43bc122c7325dc67fb9f3ad6216a (diff) | |
| download | tdelibs-6ec26d859be239e6db1bb392140db76227a56522.tar.gz tdelibs-6ec26d859be239e6db1bb392140db76227a56522.zip | |
KPasswordEdit::password() now returns a TQString instead of a const char *. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdecert')
| -rw-r--r-- | tdecert/tdecertpart.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc index 3c937e9d6..02afc9b75 100644 --- a/tdecert/tdecertpart.cc +++ b/tdecert/tdecertpart.cc @@ -482,7 +482,7 @@ emit completed(); // x-pkcs12 loading ///////////////////////////////////////////////////////////////////////////// if (whatType == "application/x-pkcs12") { - TQCString pass; + TQString pass; _p12 = KSSLPKCS12::loadCertFile(m_file); while (!_p12) { @@ -490,7 +490,7 @@ if (whatType == "application/x-pkcs12") { int rc = KPasswordDialog::getPassword(pass, i18n("Certificate Password")); if (rc != KPasswordDialog::Accepted) break; - _p12 = KSSLPKCS12::loadCertFile(m_file, TQString(pass)); + _p12 = KSSLPKCS12::loadCertFile(m_file, pass); if (!_p12) { rc = KMessageBox::warningContinueCancel(_frame, i18n("The certificate file could not be loaded. Try a different password?"), i18n("Certificate Import"),i18n("Try Different")); |