diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-03 22:42:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-03 22:42:47 +0900 |
| commit | ec259d1e7d621683a6bcbb3e284c3cf7a50157c9 (patch) | |
| tree | efe02fd8f984ddd5ffd279e1c4b754ed277b7eb9 /src/importcertificatedialog.cpp | |
| parent | bb9422313746429bf575490cb1dfcbf253236a1b (diff) | |
| download | kvpnc-ec259d1e7d621683a6bcbb3e284c3cf7a50157c9.tar.gz kvpnc-ec259d1e7d621683a6bcbb3e284c3cf7a50157c9.zip | |
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.git
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/importcertificatedialog.cpp')
| -rw-r--r-- | src/importcertificatedialog.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 5cc77ab..f75ffb4 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -259,7 +259,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) ) + if ( main->PrivateKeyPasswordEdit->password() != main->PrivateKeyAgainPasswordEdit->password() ) { importOk = false; KMessageBox::sorry ( 0, i18n ( "Private key passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); @@ -268,7 +268,7 @@ void ImportCertificateDialog::accept() } else { - privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword = main->PrivateKeyAgainPasswordEdit->password(); } } } @@ -291,7 +291,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) )) + if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (main->PrivateKeyPasswordEdit->password() != main->PrivateKeyAgainPasswordEdit->password() )) { importOk = false; KMessageBox::sorry ( 0, i18n ( "Certificate passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); @@ -301,7 +301,7 @@ void ImportCertificateDialog::accept() else { if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) - privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword = main->PrivateKeyAgainPasswordEdit->password(); } } } @@ -509,8 +509,8 @@ void ImportCertificateDialog::accept() ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() +"\n"); if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) { - ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); - ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" ); + ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" ); } } } @@ -1054,7 +1054,7 @@ void ImportCertificateDialog::readFromStdout_import() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( "certificate password" ) ),GlobalConfig->debug ); - ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" ); } if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 ) |