From ffaea4da9ce34f36672d59a1678bf81f38435317 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 2 Dec 2018 00:35:50 +0900 Subject: [PATCH] Adapted to new KPasswordEdit::password() signature. This relates to bug 2961. Signed-off-by: Michele Calgaro --- vcs/subversion/kdevsvnd.cpp | 9 +++++---- vcs/subversion/kdevsvnd.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index c1faf65e..1fc4afc8 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -74,16 +74,17 @@ TQString KDevSvnd::sslCertFile() TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file")); return fileName; } -TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) + +TQString KDevSvnd::sslPasswdDlg(TQString promptMsg) { - TQCString passwd; + TQString passwd; int ret = KPasswordDialog::getPassword( passwd,promptMsg ); if( ret == KPasswordDialog::Accepted ){ - TQCString retstr; + TQString retstr; retstr.setNum(1); return retstr + passwd; } else{ - TQCString nullstr; + TQString nullstr; nullstr.setNum(-1); return nullstr; } diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 438520e1..a3a1c2f6 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -44,7 +44,7 @@ k_dcop: TQString commitDialog(TQString); int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); TQString sslCertFile(); - TQCString sslPasswdDlg(TQString promptMsg); + TQString sslPasswdDlg(TQString promptMsg); };