diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-06 14:15:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-06 14:15:01 -0600 |
commit | 1b89319fd93b88313cab40f1e9de24c067b04efb (patch) | |
tree | 80132996de993c3dcab4040864d7729842875b2d /src/importcertificatedialog.cpp | |
parent | d08a0ede1d2cb15bb14b0ff75eacf5c682b1fa0a (diff) | |
download | kvpnc-1b89319fd93b88313cab40f1e9de24c067b04efb.tar.gz kvpnc-1b89319fd93b88313cab40f1e9de24c067b04efb.zip |
Initial TQt conversion
Diffstat (limited to 'src/importcertificatedialog.cpp')
-rw-r--r-- | src/importcertificatedialog.cpp | 166 |
1 files changed, 83 insertions, 83 deletions
diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 2fbc281..e6b0030 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -31,24 +31,24 @@ #include <kdebug.h> #include <klineedit.h> #include <iostream> -#include <qfile.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qcursor.h> -#include <qcheckbox.h> -#include <qurl.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqcursor.h> +#include <tqcheckbox.h> +#include <tqurl.h> #include <iostream> #include "kvpncconfig.h" #include "utils.h" //END includes -ImportCertificateDialog::ImportCertificateDialog ( QWidget *parent, const char* caption, KVpncConfig *GlobalConfig ) +ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig ) : KDialogBase ( parent, i18n ( "Import Certificate" ).ascii(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new ImportCertificateDialogBase ( this ); setMainWidget ( main ); - main->setMinimumSize ( main->sizeHint() ); + main->setMinimumSize ( main->tqsizeHint() ); this->GlobalConfig = GlobalConfig; filename = ""; @@ -67,13 +67,13 @@ ImportCertificateDialog::ImportCertificateDialog ( QWidget *parent, const char* main->FilenameUrlrequester->setFilter ( "*" ); askpasscount=0; - env = new QStringList(); + env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; - connect ( main->ImporttypeComboBox, SIGNAL ( activated ( int ) ), this, SLOT ( typeToggeled ( int ) ) ); + connect ( main->ImporttypeComboBox, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( typeToggeled ( int ) ) ); typeToggeled ( main->ImporttypeComboBox->currentItem() ); - connect (main->UsePrivateKeyPasswordCheckBox, SIGNAL( toggled(bool)), this, SLOT(usePrivateKeyPassToggled(bool))); + connect (main->UsePrivateKeyPasswordCheckBox, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(usePrivateKeyPassToggled(bool))); usePrivateKeyPassToggled(main->UsePrivateKeyPasswordCheckBox->isChecked()); // TMP @@ -120,9 +120,9 @@ void ImportCertificateDialog::accept() // return; // } - GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) ); + GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) ); - QFile f ( filename ); + TQFile f ( filename ); if ( f.exists() ) { if ( f.open ( IO_ReadOnly ) ) @@ -152,9 +152,9 @@ void ImportCertificateDialog::accept() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ) { certpath="/etc/ipsec.d"; - if ( !QDir ( certpath ).exists() ) + if ( !TQDir ( certpath ).exists() ) { - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d" ),GlobalConfig->error ); @@ -163,9 +163,9 @@ void ImportCertificateDialog::accept() { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist but was successful created." ).arg ( "/etc/ipsec.d" ),GlobalConfig->debug ); - if ( !QDir ( "/etc/ipsec.d/certs" ).exists() ) + if ( !TQDir ( "/etc/ipsec.d/certs" ).exists() ) { - if ( !QDir().mkdir ( "/etc/ipsec.d/certs" ) ) + if ( !TQDir().mkdir ( "/etc/ipsec.d/certs" ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d/certs" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d/certs" ),GlobalConfig->error ); @@ -175,8 +175,8 @@ void ImportCertificateDialog::accept() else { GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist but was successful created." ).arg ( "/etc/ipsec.d/certs" ),GlobalConfig->debug ); - if ( !QDir ( "/etc/ipsec.d/cacerts" ).exists() ) - if ( !QDir().mkdir ( "/etc/ipsec.d/cacerts" ) ) + if ( !TQDir ( "/etc/ipsec.d/cacerts" ).exists() ) + if ( !TQDir().mkdir ( "/etc/ipsec.d/cacerts" ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( "/etc/ipsec.d/cacerts" ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist and could not be created." ).arg ( "/etc/ipsec.d/cacerts" ),GlobalConfig->error ); @@ -196,8 +196,8 @@ void ImportCertificateDialog::accept() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) { certpath="/etc/racoon/certs"; - if ( !QDir ( certpath ).exists() ) - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir ( certpath ).exists() ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( certpath ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist." ).arg ( certpath ),GlobalConfig->error ); @@ -213,8 +213,8 @@ void ImportCertificateDialog::accept() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { certpath = main->RacoonCertificatePathUrlrequester->url(); - if ( !QDir ( certpath ).exists() ) - if ( !QDir().mkdir ( certpath ) ) + if ( !TQDir ( certpath ).exists() ) + if ( !TQDir().mkdir ( certpath ) ) { KMessageBox::error ( this, i18n ( "\"%1\" could not be created!" ).arg ( certpath ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: directory \"%1\" does not exist." ).arg ( certpath ),GlobalConfig->error ); @@ -259,7 +259,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( QString ( main->PrivateKeyPasswordEdit->password() ) != QString ( main->PrivateKeyAgainPasswordEdit->password() ) ) + if ( TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( 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= QString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); } } } @@ -291,7 +291,7 @@ void ImportCertificateDialog::accept() } if ( importOk ) { - if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (QString ( main->PrivateKeyPasswordEdit->password() ) != QString ( main->PrivateKeyAgainPasswordEdit->password() ) )) + if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( 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= QString ( main->PrivateKeyAgainPasswordEdit->password() ); + privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); } } } @@ -313,7 +313,7 @@ void ImportCertificateDialog::accept() { // looking for openssl - QString bin="openssl"; + TQString bin="openssl"; ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "openssl" ); //std::cout << "Tool (bin): " << bin << std::endl; @@ -336,17 +336,17 @@ void ImportCertificateDialog::accept() } - QString file = Utils ( this->GlobalConfig ).removeSpecialCharsForFilename ( QUrl ( filename ).fileName() ); + TQString file = Utils ( this->GlobalConfig ).removeSpecialCharsForFilename ( TQUrl ( filename ).fileName() ); certName = file.left ( file.length() - 4 ); // peter_pan.p12 -> peter_pan if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - QString type=""; + TQString type=""; if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon ) type="racoon"; else type="OpenVPN"; - QFile certpathtest ( certpath + "/." ); + TQFile certpathtest ( certpath + "/." ); if ( !certpathtest.exists() ) { @@ -358,7 +358,7 @@ void ImportCertificateDialog::accept() } else { - QFile testfile ( QString ( certpath + "/test" ) ); + TQFile testfile ( TQString ( certpath + "/test" ) ); if ( !testfile.open ( IO_WriteOnly ) ) { KMessageBox::error ( this, i18n ( "%1 certificate path (%2) is not writeable!" ).arg ( type ).arg ( certpath ) ); @@ -389,7 +389,7 @@ void ImportCertificateDialog::accept() */ // std::cout << "[std]:" << "settings ok." << std::endl; - ImportProcess = new QProcess ( this ); + ImportProcess = new TQProcess ( this ); if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) @@ -451,23 +451,23 @@ void ImportCertificateDialog::accept() } - connect ( ImportProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_import() ) ); - connect ( ImportProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_import() ) ); + connect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); + connect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCacert() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); } if ( main->ImporttypeComboBox->currentItem() == ca_der ) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); } if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca) { - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( ciscoCertMgrExited() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ciscoCertMgrExited() ) ); } if ( !ImportProcess->start ( env ) ) @@ -483,14 +483,14 @@ void ImportCertificateDialog::accept() { doExit=true; - QString processname = ""; + TQString processname = ""; if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == ca_der ) { processname="openssl"; if ( GlobalConfig->KvpncDebugLevel >3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -509,8 +509,8 @@ void ImportCertificateDialog::accept() ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() +"\n"); if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) { - ImportProcess->writeToStdin ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); - ImportProcess->writeToStdin ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); } } } @@ -535,7 +535,7 @@ void ImportCertificateDialog::canAccept() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ) { - QString bin="ipsec"; + TQString bin="ipsec"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -558,7 +558,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == pkcs12_racoon ) { - QString bin="racoon"; + TQString bin="racoon"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -581,7 +581,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - QString bin="openvpn"; + TQString bin="openvpn"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -604,7 +604,7 @@ void ImportCertificateDialog::canAccept() } else if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca || main->ImporttypeComboBox->currentItem() == ciscouserca ) { - QString bin="cisco_cert_mgr"; + TQString bin="cisco_cert_mgr"; ToolInfo *tool; //std::cout << "Tool (bin): " << bin << std::endl; if ( !GlobalConfig->ToolList->isEmpty() ) @@ -628,21 +628,21 @@ void ImportCertificateDialog::canAccept() GlobalConfig->appPointer->restoreOverrideCursor(); if ( doExit ) - QDialog::accept(); + TQDialog::accept(); } void ImportCertificateDialog::reject() { importOk=false; importSuccess=false; - QDialog::reject(); + TQDialog::reject(); } void ImportCertificateDialog::doCacert() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCacert() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCacert()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -681,7 +681,7 @@ void ImportCertificateDialog::doCacert() ImportProcess->addArgument ( "-nodes" ); - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); if ( ! ImportProcess->start ( env ) ) { @@ -695,7 +695,7 @@ void ImportCertificateDialog::doCacert() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -719,7 +719,7 @@ void ImportCertificateDialog::doPrivateKey() if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[dbg]: doPrivateKey()",GlobalConfig->debug ); - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doPrivateKey() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); if ( ImportProcess->normalExit () ) { @@ -748,9 +748,9 @@ void ImportCertificateDialog::doPrivateKey() CertFullPath=certpath+"/" + certName + ".pem"; if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); else - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( removePrivateKey() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); //LogOutput->append( "priv key: we starting..." ); if ( !ImportProcess->start( ) ) @@ -766,7 +766,7 @@ void ImportCertificateDialog::doPrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); // if ( main->ImportPasswordEdit->text().isEmpty() ) // ImportProcess->writeToStdin ( "\n" ); @@ -777,14 +777,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -794,14 +794,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -823,10 +823,10 @@ void ImportCertificateDialog::doPrivateKey() void ImportCertificateDialog::doCreateHash() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doCreateHash() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCreateHash()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -850,7 +850,7 @@ void ImportCertificateDialog::doCreateHash() else ImportProcess->addArgument ( certpath + "/ca_" + certName + ".pem" ); - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doLink() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); // LogOutput->append( "hash: we starting..." ); @@ -866,7 +866,7 @@ void ImportCertificateDialog::doCreateHash() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -892,9 +892,9 @@ void ImportCertificateDialog::doCreateHash() void ImportCertificateDialog::doLink() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doLink() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doLink()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -919,9 +919,9 @@ void ImportCertificateDialog::doLink() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( doPrivateKey() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); else - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) @@ -957,7 +957,7 @@ void ImportCertificateDialog::doLink() void ImportCertificateDialog::exit() { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("exit()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("exit()"),GlobalConfig->debug ); if ( (ImportProcess != 0L && ImportProcess->normalExit() ) || ImportProcess == 0L ) @@ -987,10 +987,10 @@ void ImportCertificateDialog::exit() void ImportCertificateDialog::readFromStdout_import() { -// QString line = QString( ImportProcess->readStdout() ); +// TQString line = TQString( ImportProcess->readStdout() ); while ( ImportProcess->canReadLineStdout() ) { - QString line = QString ( ImportProcess->readLineStdout() ); + TQString line = TQString ( ImportProcess->readLineStdout() ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import stdout: %1" ).arg ( line ),GlobalConfig->debug ); @@ -1021,14 +1021,14 @@ void ImportCertificateDialog::readFromStdout_import() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\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 ( QString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); + ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); } if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 ) @@ -1073,10 +1073,10 @@ void ImportCertificateDialog::readFromStdout_import() void ImportCertificateDialog::readFromStderr_import() { -// QString line = QString ( ImportProcess->readStderr() ); +// TQString line = TQString ( ImportProcess->readStderr() ); while ( ImportProcess->canReadLineStderr() ) { - QString line = QString ( ImportProcess->readLineStderr() ); + TQString line = TQString ( ImportProcess->readLineStderr() ); if ( GlobalConfig->KvpncDebugLevel > 3 ) { if ( line.find ( "Enter Import Pass", 0, FALSE ) > -1 || line.find ( "Enter PEM pass phrase", 0, FALSE ) > -1 || line.find ( "MAC verified OK", 0, FALSE ) > -1 || line.find ( "Enter pass phrase for", 0, FALSE ) > -1 || line.find ( "writing RSA key", 0, FALSE ) > -1 ) @@ -1120,8 +1120,8 @@ void ImportCertificateDialog::readFromStderr_import() error_found=true; // if ( ImportProcess != 0L && ImportProcess->isRunning() ) // { -// disconnect ( ImportProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_import() ) ); -// disconnect ( ImportProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_import() ) ); +// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); +// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); // ImportProcess->kill(); // ImportProcess = 0L; // } @@ -1215,7 +1215,7 @@ void ImportCertificateDialog::readFromStderr_import() void ImportCertificateDialog::typeToggeled ( int type ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( QString ( "type: "+QString().setNum ( type ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( TQString ( "type: "+TQString().setNum ( type ) ),GlobalConfig->debug ); if ( type == pkcs12_freeswan ) { certpath = "/etc/ipsec.d/certs"; @@ -1311,9 +1311,9 @@ void ImportCertificateDialog::usePrivateKeyPassToggled(bool) void ImportCertificateDialog::removePrivateKey() { - disconnect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( removePrivateKey() ) ); + disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("removePrivateKey()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -1334,7 +1334,7 @@ void ImportCertificateDialog::removePrivateKey() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) ImportProcess->addArgument ( certpath+"/" + certName + ".pem" ); // warning: static - connect ( ImportProcess, SIGNAL ( processExited () ), this, SLOT ( exit() ) ); + connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) @@ -1349,7 +1349,7 @@ void ImportCertificateDialog::removePrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); |