summaryrefslogtreecommitdiffstats
path: root/krdc/vnc/kvncview.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-12-01 23:39:45 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-12-01 23:39:45 +0900
commit53fe3bf43aeb43f51f6b6ebb7453938e85c0223b (patch)
treed63838d4442041515669c84a02700bbca9f1aa77 /krdc/vnc/kvncview.cpp
parentca937b0c3ebc76d1a079e5d4b22022c4ccb29889 (diff)
downloadtdenetwork-53fe3bf43aeb43f51f6b6ebb7453938e85c0223b.tar.gz
tdenetwork-53fe3bf43aeb43f51f6b6ebb7453938e85c0223b.zip
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'krdc/vnc/kvncview.cpp')
-rw-r--r--krdc/vnc/kvncview.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index b7ca3685..d4f71cee 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -59,7 +59,7 @@ static KVncView *kvncview;
//Passwords and TDEWallet data
extern TDEWallet::Wallet *wallet;
bool useTDEWallet = false;
-static TQCString password;
+static TQString password;
static TQMutex passwordLock;
static TQWaitCondition passwordWaiter;
@@ -88,7 +88,7 @@ KVncView::KVncView(TQWidget *parent,
m_cursorState(dotCursorState)
{
kvncview = this;
- password = _password.latin1();
+ password = _password;
dpy = tqt_xdisplay();
setFixedSize(16,16);
setFocusPolicy(TQ_StrongFocus);
@@ -417,7 +417,7 @@ void KVncView::customEvent(TQCustomEvent *e)
emit showingPasswordDialog(true);
if (KPasswordDialog::getPassword(password, i18n("Access to the system requires a password.")) != KPasswordDialog::Accepted)
- password = TQCString();
+ password = TQString();
emit showingPasswordDialog(false);
@@ -450,7 +450,7 @@ void KVncView::customEvent(TQCustomEvent *e)
wallet->setFolder(krdc_folder);
TQString newPass;
if ( wallet->hasEntry(kvncview->host()) && !wallet->readPassword(kvncview->host(), newPass) ) {
- password=newPass.latin1();
+ password=newPass;
}
}
}
@@ -792,7 +792,7 @@ int getPassword(char * &passwd) {
//Process the password if we got it, clear it if we didn't
if (retV) {
- passwd = strdup((const char*)password);
+ passwd = strdup(password.utf8());
}
//Pack up and go home