summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-12-03 22:23:58 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-12-03 22:23:58 +0900
commit5988388361bf5d6c78aa57984765fc39dadaf19b (patch)
treef68deaa5798f1473c9d30b2a623f75855768701f
parent17d4378d306d5c059be30aa5a9a93a9acc18e355 (diff)
downloadtdesvn-5988388361bf5d6c78aa57984765fc39dadaf19b.tar.gz
tdesvn-5988388361bf5d6c78aa57984765fc39dadaf19b.zip
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/askpass/tdesvn-askpass.cpp4
-rw-r--r--src/ksvnwidgets/authdialogimpl.cpp4
-rw-r--r--src/svnfrontend/ccontextlistener.cpp2
-rw-r--r--src/tdesvnd/tdesvnd_dcop.cpp4
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 {