Adapted to new KPasswordEdit::password() signature.

This relates to bug 2961.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

3 files changed, 5 insertions, 6 deletions

diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 7f08aa29..947a5258 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -301,5 +301,5 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
   }
   canceled = false;
   // gpgme++ free()s it, and we need to copy as long as dlg isn't deleted :o
-  return strdup( dlg.passphrase() );
+  return strdup( dlg.passphrase().utf8() );
 }
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index a2d0e7c3..e9f1e3e9 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -100,13 +100,12 @@ Kleo::PassphraseDialog::~PassphraseDialog() {
   delete d; d = 0;
 }
 
-const char * Kleo::PassphraseDialog::passphrase() const {
+const TQString Kleo::PassphraseDialog::passphrase() const {
   return d->lineedit->password();
 }
 
 void Kleo::PassphraseDialog::slotOk() {
-  const char * pass = passphrase();
-  emit finished( pass ? pass : "" );
+  emit finished( passphrase() );
   KDialogBase::slotOk();
 }
 
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index e83eca42..2416f811 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -63,13 +63,13 @@ namespace Kleo {
                       bool modal=true );
     ~PassphraseDialog();
 
-    const char * passphrase() const;
+    const TQString passphrase() const;
 
   signals:
     /** emitted when the user clicks Ok. \a pass is never NULL.
 	\c pass only valid inside slots connected to this signal.
      */
-    void finished( const char * pass );
+    void finished( const TQString pass );
     /** emitted when the user clicks Cancel. */
     void canceled();