From 6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 28 Nov 2018 00:04:05 +0900 Subject: Adapted to new KPasswordEdit::password() signature. This relates to bug 2961. Signed-off-by: Michele Calgaro --- kdesktop/lock/lockprocess.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kdesktop/lock/lockprocess.cc') diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index d7a63f14d..b34c5b494 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2719,7 +2719,7 @@ void LockProcess::slotMouseActivity(XEvent *event) void LockProcess::processInputPipeCommand(TQString inputcommand) { TQCString command(inputcommand.ascii()); TQString to_display; - const char * pin_entry; + TQString pin_entry; if (command[0] == 'C') { while (mDialogControlLock == true) usleep(100000); @@ -2807,7 +2807,8 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) { pin_entry = qryDlg.getEntry(); mInfoMessageDisplayed=false; if (mPipeOpen_out == true) { - if (write(mPipe_fd_out, pin_entry, strlen(pin_entry)+1) == -1) { + TQCString pin_entry_utf8 = pin_entry.utf8(); // utf8 length may differ from TQString length + if (write(mPipe_fd_out, pin_entry_utf8.data(), pin_entry_utf8.length()+1) == -1) { // Error handler to shut up gcc warnings } if (write(mPipe_fd_out, "\n\r", 3) == -1) { @@ -2896,7 +2897,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort() { void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) { TQCString password; - const char * pin_entry; + TQString pin_entry; QueryDlg qryDlg(this); qryDlg.updateLabel(prompt); -- cgit v1.2.1