diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ciscocertificateenrollment.cpp | 4 | ||||
| -rw-r--r-- | src/importcertificatedialog.cpp | 14 | ||||
| -rw-r--r-- | src/manageciscocert.cpp | 4 | ||||
| -rw-r--r-- | src/openvpnmanagementhandler.cpp | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp index 5b308da..75495e7 100644 --- a/src/ciscocertificateenrollment.cpp +++ b/src/ciscocertificateenrollment.cpp @@ -177,7 +177,7 @@ void CiscoCertificateEnrollment::next () else if ( GlobalConfig->KvpncDebugLevel > 4 ) GlobalConfig->appendLogEntry ( i18n ( "Password (cleartext): %1" ).arg ( selectionpage->NewPasswordPasswordEdit->password() ), KVpncConfig::debug ); - ChallengePassword =TQString(selectionpage->NewPasswordPasswordEdit->password()); + ChallengePassword = selectionpage->NewPasswordPasswordEdit->password(); } if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -224,7 +224,7 @@ void CiscoCertificateEnrollment::next () else if ( GlobalConfig->KvpncDebugLevel > 4 ) GlobalConfig->appendLogEntry ( i18n ( "Challenge password (cleartext): %1" ).arg ( selectionpage->ChallengePasswordPasswordEdit->password() ), KVpncConfig::debug ); - ChallengePassword =TQString(selectionpage->ChallengePasswordPasswordEdit->password()); + ChallengePassword = selectionpage->ChallengePasswordPasswordEdit->password(); } } 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 ) diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp index dc336f1..3c78ce4 100644 --- a/src/manageciscocert.cpp +++ b/src/manageciscocert.cpp @@ -103,7 +103,7 @@ void ManageCiscoCert::deleteCertClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Process (%1) started." ).arg ("cisco_cert_mgr" ),GlobalConfig->debug ); - TQCString password; + TQString password; int result = KPasswordDialog::getPassword(password, i18n("Certificate password")); if (result == KPasswordDialog::Accepted) @@ -112,7 +112,7 @@ void ManageCiscoCert::deleteCertClicked() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Certicate password got from user, send it..." ),GlobalConfig->debug ); - DeleteProcess->writeToStdin( TQString(password)+"\n"); + DeleteProcess->writeToStdin( password+"\n"); while (DeleteProcess->isRunning()) { sleep(1); diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp index 1559816..85f0822 100644 --- a/src/openvpnmanagementhandler.cpp +++ b/src/openvpnmanagementhandler.cpp @@ -243,7 +243,7 @@ void OpenvpnManagementHandler::socketReadyRead() // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug ); // // TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1; - // TQCString password; + // TQString password; // TQString pass = ""; // int result = KPasswordDialog::getPassword( password, TQString( req + i18n( " password:" ) ) ); // TQTextStream os( socket ); @@ -251,7 +251,7 @@ void OpenvpnManagementHandler::socketReadyRead() // if ( result == KPasswordDialog::Accepted ) { // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); - // pass = TQString( password ); + // pass = password; // // pass = pass.remove( '\r' ); // pass = pass.remove( '\n' ); @@ -331,7 +331,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->TmpPassword.isEmpty() ) { - TQCString password; + TQString password; TQString pass = ""; int result = KPasswordDialog::getPassword( password, TQString( i18n( " password:" ) ) ); TQTextStream os( socket ); @@ -340,7 +340,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); - GlobalConfig->TmpPassword = TQString( password ); + GlobalConfig->TmpPassword = password; // if ( GlobalConfig->KvpncDebugLevel > 5 ) |