From 5988388361bf5d6c78aa57984765fc39dadaf19b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 3 Dec 2018 22:23:58 +0900
Subject: Adapted to new KPasswordEdit::password() signature. This relates to
 bug 2961.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 src/askpass/tdesvn-askpass.cpp       | 4 ++--
 src/ksvnwidgets/authdialogimpl.cpp   | 4 ++--
 src/svnfrontend/ccontextlistener.cpp | 2 +-
 src/tdesvnd/tdesvnd_dcop.cpp         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp
index a744c81..1b03eee 100644
--- a/src/askpass/tdesvn-askpass.cpp
+++ b/src/askpass/tdesvn-askpass.cpp
@@ -52,10 +52,10 @@ int main(int argc, char** argv)
     } else {
         prompt = TDECmdLineArgs::parsedArgs()->arg(0);
     }
-    TQCString pw;
+    TQString pw;
     KPasswordDialog::disableCoreDumps();
     if (KPasswordDialog::getPassword(pw,prompt,0)==KPasswordDialog::Accepted) {
-        std::cout << pw.data() << std::endl;
+        std::cout << pw.local8Bit().data() << std::endl;
         /* cleanup memory */
         pw.replace(0,pw.length(),"0");
         return 0;
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp
index fc9ab46..dba4efc 100644
--- a/src/ksvnwidgets/authdialogimpl.cpp
+++ b/src/ksvnwidgets/authdialogimpl.cpp
@@ -54,8 +54,8 @@ const TQString AuthDialogImpl::Username()const
 const TQString AuthDialogImpl::Password()
 {
 #if 0
-    /* as described in interface description wie must make a copy of string */
-    curPass = TQString::fromUtf8(m_PasswordEdit->password());
+    /* as described in interface description we must make a copy of string */
+    curPass = m_PasswordEdit->password();
     return curPass;
 #endif
     return m_PasswordEdit->text();
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 572b2a4..c66eede 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -293,7 +293,7 @@ bool CContextListener::contextSslClientCertPwPrompt (TQString & password,
 {
     maysave = false;
     emit waitShow(true);
-    TQCString npass;
+    TQString npass;
     int keep = 1;
     int res = KPasswordDialog::getPassword(npass,
         i18n("Enter password for realm %1").arg(realm),
diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp
index 442dfae..6e58707 100644
--- a/src/tdesvnd/tdesvnd_dcop.cpp
+++ b/src/tdesvnd/tdesvnd_dcop.cpp
@@ -236,13 +236,13 @@ int tdesvnd_dcop::get_sslaccept(TQString hostname,TQString fingerprint,TQString
 TQStringList tdesvnd_dcop::get_sslclientcertpw(TQString realm)
 {
     TQStringList resList;
-    TQCString npass;
+    TQString npass;
     int keep = 1;
     int res = KPasswordDialog::getPassword(npass,i18n("Enter password for realm %1").arg(realm),&keep);
     if (res!=KPasswordDialog::Accepted) {
         return resList;
     }
-    resList.append(TQString(npass));
+    resList.append(npass);
     if (keep) {
         resList.append("true");
     } else {
-- 
cgit v1.2.3