From 98f86ddadeb4f41b12e5735175951a7c5fec800b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 1 Jan 2024 18:12:44 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/addnetworkroutedialog.cpp | 4 +- src/advancedsettingsdialog.cpp | 10 +- src/ciscocertificateenrollment.cpp | 38 +- src/configconnectoptions.cpp | 10 +- src/debugoutputtextedit.cpp | 6 +- src/generateopenvpnkeydialog.cpp | 8 +- src/importcertificatedialog.cpp | 42 +- src/kfeedback.cpp | 20 +- src/kvpnc.cpp | 1016 ++++++++++----------- src/kvpncimportprofileselectiondialog.cpp | 2 +- src/kvpnckicker.cpp | 2 +- src/logviewerdialog.cpp | 4 +- src/manageciscocert.cpp | 32 +- src/networkinterface.cpp | 26 +- src/newprofiledialog.cpp | 16 +- src/newprofilewizard.cpp | 96 +- src/openvpnmanagementhandler.cpp | 44 +- src/preferencesdialog.cpp | 126 +-- src/profilenetworkrouteoptions.cpp | 2 +- src/toolinfo.cpp | 28 +- src/utils.cpp | 160 ++-- src/widgetnotifyhelper.cpp | 16 +- 22 files changed, 854 insertions(+), 854 deletions(-) diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp index d10fd31..981fa49 100644 --- a/src/addnetworkroutedialog.cpp +++ b/src/addnetworkroutedialog.cpp @@ -32,8 +32,8 @@ AddNetworkRouteDialog::AddNetworkRouteDialog(TQWidget *parent, const TQString& c main = new AddNetworkRouteDialogBase (this); setMainWidget(main); main->setMinimumSize(main->sizeHint()); - connect(main->UseGatewayCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useGatewayToggled(bool))); - connect(main->UseInterfaceCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useInterfaceToggled(bool))); + connect(main->UseGatewayCheckBox,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useGatewayToggled(bool))); + connect(main->UseInterfaceCheckBox,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useInterfaceToggled(bool))); WidgetNotifyHelper h; h.setupChangedAction(this); diff --git a/src/advancedsettingsdialog.cpp b/src/advancedsettingsdialog.cpp index 58b11b2..d859d7f 100644 --- a/src/advancedsettingsdialog.cpp +++ b/src/advancedsettingsdialog.cpp @@ -40,11 +40,11 @@ AdvancedSettingsDialog::AdvancedSettingsDialog(TQWidget *parent, const TQString& this->currentProfile = currentProfile; this->connectionType = connectionType; - connect (main->AdvancedSettingsCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(advancedSettingsToggled(bool))); - connect (main->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); - connect (main->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); - connect (main->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); - connect (main->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); + connect (main->AdvancedSettingsCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(advancedSettingsToggled(bool))); + connect (main->ApplicationVersionCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(applicationVersionToggled(bool))); + connect (main->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool))); + connect (main->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool))); + connect (main->SingleDesCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(singleDesToggled(bool))); main->IkeGroupCheckbox->setEnabled( false ); main->PerfectForwardSecrecyCombobox->setEnabled( false ); diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp index c6ad5b3..7487ebd 100644 --- a/src/ciscocertificateenrollment.cpp +++ b/src/ciscocertificateenrollment.cpp @@ -90,7 +90,7 @@ void CiscoCertificateEnrollment::reject() if ( EnrollmentProcess != 0 && EnrollmentProcess->isRunning() ) { EnrollmentProcess->tryTerminate(); - TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, EnrollmentProcess, TQ_SLOT ( kill() ) ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); @@ -106,8 +106,8 @@ void CiscoCertificateEnrollment::setupPages() selectionpage->sizeHint(); addPage ( selectionpage, "" + i18n ( "Select enrollment type..." ) + "" ); - connect ( selectionpage->FileEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); - connect ( selectionpage->OnlineEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); + connect ( selectionpage->FileEnrollementRadioButton, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( enrollmentToggled ( bool ) ) ); + connect ( selectionpage->OnlineEnrollementRadioButton, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( enrollmentToggled ( bool ) ) ); GlobalConfig->slotStatusMsg(i18n("Collecting cisco CA certs from Cisco certificate store..."), ID_STATUS_MSG); if (GlobalConfig->KvpncDebugLevel > 2) @@ -373,9 +373,9 @@ void CiscoCertificateEnrollment::next () } - connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); - connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); - connect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); + connect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) ); + connect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) ); + connect ( EnrollmentProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(enrollmentProcessFinished())); // if ( GlobalConfig->KvpncDebugLevel > 3 ) { @@ -410,7 +410,7 @@ void CiscoCertificateEnrollment::next () ProgressDlg->show(); ProgressDlg->resize ( ProgressDlg->width() +100,ProgressDlg->height() ); - connect ( &CheckEnrollmentTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkProgress() ) ); + connect ( &CheckEnrollmentTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkProgress() ) ); CheckEnrollmentTimer.start ( 500, FALSE ); // we stupid have to send the password :( @@ -483,9 +483,9 @@ void CiscoCertificateEnrollment::showPage ( TQWidget* page ) void CiscoCertificateEnrollment::enrollmentProcessFinished() { - disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); - disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); - disconnect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); + disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) ); + disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) ); + disconnect ( EnrollmentProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(enrollmentProcessFinished())); if ( ProgressDlg!= 0 ) ProgressDlg->progressBar()->setValue ( 100 ); GlobalConfig->appPointer->restoreOverrideCursor(); @@ -633,12 +633,12 @@ void CiscoCertificateEnrollment::checkProgress() CheckEnrollmentTimer.stop(); // kill process - disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); - disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); + disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) ); + disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) ); if ( EnrollmentProcess->isRunning() ) { EnrollmentProcess->tryTerminate(); - TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, EnrollmentProcess, TQ_SLOT ( kill() ) ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); @@ -662,9 +662,9 @@ void CiscoCertificateEnrollment::checkProgress() DeleteProcess->addArgument ( "delete" ); DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( 0 ); - connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); - connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); - connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); + connect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(cancelProcessFinished())); + connect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_cancel() ) ); + connect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_cancel() ) ); if ( !DeleteProcess->start ( env ) ) { @@ -685,9 +685,9 @@ void CiscoCertificateEnrollment::checkProgress() sleep(1); } } - disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); - disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); - disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); + disconnect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(cancelProcessFinished())); + disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_cancel() ) ); + disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_cancel() ) ); delete DeleteProcess; DeleteProcess=0L; diff --git a/src/configconnectoptions.cpp b/src/configconnectoptions.cpp index 555e2d9..425b3a7 100644 --- a/src/configconnectoptions.cpp +++ b/src/configconnectoptions.cpp @@ -28,13 +28,13 @@ ConfigConnectOptions::ConfigConnectOptions(TQWidget *parent) : ConfigConnectOpti dialogModified=false; // connect changed signals to own signal - connect(AutoConnectProfileComboBox,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SIGNAL(changed())); - connect(checkMinimizeAfterConnectCheck,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); - connect(SilentQuitcheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); - connect(DoAutoConnectCheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); + connect(AutoConnectProfileComboBox,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SIGNAL(changed())); + connect(checkMinimizeAfterConnectCheck,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed())); + connect(SilentQuitcheckBox,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed())); + connect(DoAutoConnectCheckBox,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed())); // connect changed to slot - connect(this,TQT_SIGNAL(changed ()),this,TQT_SLOT(dialogChanged())); + connect(this,TQ_SIGNAL(changed ()),this,TQ_SLOT(dialogChanged())); } diff --git a/src/debugoutputtextedit.cpp b/src/debugoutputtextedit.cpp index 2cd881b..ee2f442 100644 --- a/src/debugoutputtextedit.cpp +++ b/src/debugoutputtextedit.cpp @@ -40,10 +40,10 @@ DebugOutputTextEdit::~DebugOutputTextEdit() TQPopupMenu* DebugOutputTextEdit::createPopupMenu(const TQPoint &) { popup = new TQPopupMenu(this); - popup->insertItem(i18n("Cut Content"), this, TQT_SLOT(cut() ) ); - popup->insertItem(i18n("Copy Content"), this, TQT_SLOT(copy() ) ); + popup->insertItem(i18n("Cut Content"), this, TQ_SLOT(cut() ) ); + popup->insertItem(i18n("Copy Content"), this, TQ_SLOT(copy() ) ); popup->insertSeparator(); - popup->insertItem(i18n("Clear Log Window"), this, TQT_SLOT(clear() ) ); + popup->insertItem(i18n("Clear Log Window"), this, TQ_SLOT(clear() ) ); popup->insertSeparator(); return popup; diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp index 31b5cfb..e305e2b 100644 --- a/src/generateopenvpnkeydialog.cpp +++ b/src/generateopenvpnkeydialog.cpp @@ -88,8 +88,8 @@ void GenerateOpenvpnKeyDialog::canAccept() generateOpenvpnKeyProcess->addArgument("--secret"); generateOpenvpnKeyProcess->addArgument(filename); - connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); - connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); + connect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErr() ) ); + connect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdErr() ) ); if ( !generateOpenvpnKeyProcess->start(env) ) { KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) ); @@ -105,8 +105,8 @@ void GenerateOpenvpnKeyDialog::canAccept() { sleep(1); } - disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); - disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); + disconnect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErr() ) ); + disconnect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdErr() ) ); delete generateOpenvpnKeyProcess; generateOpenvpnKeyProcess = 0L; if (genOk) diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 63e1e44..a6a6cb7 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -70,10 +70,10 @@ ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char* env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; - connect ( main->ImporttypeComboBox, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( typeToggeled ( int ) ) ); + connect ( main->ImporttypeComboBox, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( typeToggeled ( int ) ) ); typeToggeled ( main->ImporttypeComboBox->currentItem() ); - connect (main->UsePrivateKeyPasswordCheckBox, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(usePrivateKeyPassToggled(bool))); + connect (main->UsePrivateKeyPasswordCheckBox, TQ_SIGNAL( toggled(bool)), this, TQ_SLOT(usePrivateKeyPassToggled(bool))); usePrivateKeyPassToggled(main->UsePrivateKeyPasswordCheckBox->isChecked()); // TMP @@ -451,23 +451,23 @@ void ImportCertificateDialog::accept() } - connect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); - connect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); + connect ( ImportProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_import() ) ); + connect ( ImportProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_import() ) ); if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) { - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCacert() ) ); } if ( main->ImporttypeComboBox->currentItem() == ca_der ) { - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) ); } if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca) { - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ciscoCertMgrExited() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( ciscoCertMgrExited() ) ); } if ( !ImportProcess->start ( env ) ) @@ -640,7 +640,7 @@ void ImportCertificateDialog::reject() void ImportCertificateDialog::doCacert() { - disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); + disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCacert() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug ); @@ -681,7 +681,7 @@ void ImportCertificateDialog::doCacert() ImportProcess->addArgument ( "-nodes" ); - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) ); if ( ! ImportProcess->start ( env ) ) { @@ -719,7 +719,7 @@ void ImportCertificateDialog::doPrivateKey() if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[dbg]: doPrivateKey()",GlobalConfig->debug ); - disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); + disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doPrivateKey() ) ); if ( ImportProcess->normalExit () ) { @@ -748,9 +748,9 @@ void ImportCertificateDialog::doPrivateKey() CertFullPath=certpath+"/" + certName + ".pem"; if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) ); else - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( removePrivateKey() ) ); //LogOutput->append( "priv key: we starting..." ); if ( !ImportProcess->start( ) ) @@ -823,7 +823,7 @@ void ImportCertificateDialog::doPrivateKey() void ImportCertificateDialog::doCreateHash() { - disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); + disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug ); @@ -850,7 +850,7 @@ void ImportCertificateDialog::doCreateHash() else ImportProcess->addArgument ( certpath + "/ca_" + certName + ".pem" ); - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doLink() ) ); // LogOutput->append( "hash: we starting..." ); @@ -892,7 +892,7 @@ void ImportCertificateDialog::doCreateHash() void ImportCertificateDialog::doLink() { - disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); + disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doLink() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug ); @@ -919,9 +919,9 @@ void ImportCertificateDialog::doLink() if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doPrivateKey() ) ); else - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) @@ -1120,8 +1120,8 @@ void ImportCertificateDialog::readFromStderr_import() error_found=true; // if ( ImportProcess != 0L && ImportProcess->isRunning() ) // { -// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); -// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); +// disconnect ( ImportProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_import() ) ); +// disconnect ( ImportProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_import() ) ); // ImportProcess->kill(); // ImportProcess = 0L; // } @@ -1311,7 +1311,7 @@ void ImportCertificateDialog::usePrivateKeyPassToggled(bool) void ImportCertificateDialog::removePrivateKey() { - disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); + disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( removePrivateKey() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug ); @@ -1334,7 +1334,7 @@ void ImportCertificateDialog::removePrivateKey() else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) ImportProcess->addArgument ( certpath+"/" + certName + ".pem" ); // warning: static - connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); + connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) ); if ( !ImportProcess->start( ) ) diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp index c24d922..f399ec0 100644 --- a/src/kfeedback.cpp +++ b/src/kfeedback.cpp @@ -47,17 +47,17 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, layout->addWidget( _form ); checkSendButton(); - connect( this, TQT_SIGNAL( applyClicked() ), - _form, TQT_SLOT ( sendMail() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), + _form, TQ_SLOT ( sendMail() ) ); - connect( _form, TQT_SIGNAL( mailSent() ), - this, TQT_SLOT ( hide() ) ); + connect( _form, TQ_SIGNAL( mailSent() ), + this, TQ_SLOT ( hide() ) ); - connect( _form, TQT_SIGNAL( mailSent() ), - this, TQT_SIGNAL( mailSent() ) ); + connect( _form, TQ_SIGNAL( mailSent() ), + this, TQ_SIGNAL( mailSent() ) ); - connect( _form, TQT_SIGNAL( checkComplete() ), - this, TQT_SLOT ( checkSendButton() ) ); + connect( _form, TQ_SIGNAL( checkComplete() ), + this, TQ_SLOT ( checkSendButton() ) ); } @@ -98,8 +98,8 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress, _questionList = new KFeedbackQuestionList( this ); TQ_CHECK_PTR( _questionList ); - connect( _questionList, TQT_SIGNAL( checkComplete() ), - this, TQT_SLOT ( slotCheckComplete() ) ); + connect( _questionList, TQ_SIGNAL( checkComplete() ), + this, TQ_SLOT ( slotCheckComplete() ) ); // diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index c33d1b1..3afc255 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -232,11 +232,11 @@ KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : TDEMainWi move ( GlobalConfig->WindowPos ); QuickConnectMenu = new TQPopupMenu ( KVpncDock->menu() ); - connect ( QuickConnectMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doQuickConnect ( int ) ) ); + connect ( QuickConnectMenu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( doQuickConnect ( int ) ) ); - connect ( parent, TQT_SIGNAL ( shutDown() ), this, TQT_SLOT ( shutdownCalled() ) ); + connect ( parent, TQ_SIGNAL ( shutDown() ), this, TQ_SLOT ( shutdownCalled() ) ); - connect ( KVpncDock, TQT_SIGNAL ( closeEventKicker ( TQCloseEvent * ) ),this,TQT_SLOT ( closeEvent ( TQCloseEvent * ) ) ); + connect ( KVpncDock, TQ_SIGNAL ( closeEventKicker ( TQCloseEvent * ) ),this,TQ_SLOT ( closeEvent ( TQCloseEvent * ) ) ); for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) { @@ -362,56 +362,56 @@ void KVpnc::initAction() connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", TDEIcon::NoGroup, 22 ); setIcon ( disconnectedIcon ); - ( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() ); - - SaveSessionAction = new TDEAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQT_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" ); - DeleteSessionAction = new TDEAction ( i18n ( "&Delete Profile..." ), "edit-delete", Key_D, this, TQT_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" ); - RenameSessionAction = new TDEAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQT_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" ); - // NewSessionAction = new TDEAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQT_SLOT( newSessionClicked() ), actionCollection(), "newSession" ); - //AdvancedSessionAction = new TDEAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQT_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" ); - ImportSessionAction = new TDEAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQT_SLOT ( importProfileClicked() ), actionCollection(), "importSession" ); - ImportOpenvpnProfileAction = new TDEAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQT_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" ); - ImportFreeswanProfileAction = new TDEAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQT_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" ); - ImportFritzboxProfileAction = new TDEAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQT_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" ); - ImportCertAction = new TDEAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQT_SLOT ( importCertClicked() ), actionCollection(), "importCert" ); - ManageCiscoCertAction = new TDEAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQT_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" ); - CiscoCertEnrollmentAction = new TDEAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQT_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" ); - ExportOpenvpnProfileAction = new TDEAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQT_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" ); - - ImportKvpncSettingsAction = new TDEAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQT_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" ); - ExportKvpncSettingsAction = new TDEAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQT_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" ); - - ConnectAction = new TDEAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQT_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" ); - DisconnectAction = new TDEAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQT_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" ); - ProfileManagerAction = new TDEAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQT_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" ); - NewProfileWizardAction = new TDEAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQT_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" ); -// DonateAction = new TDEAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQT_SLOT ( donateClicked() ), actionCollection(), "donate" ); - ReportBugAction = new TDEAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQT_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" ); - DebugconsoleAction = new TDEToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQT_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" ); - ToolsInfoAction = new TDEToggleAction ( i18n ( "Show &Tools Info" ), "application-vnd.tde.info", CTRL + Key_I, this, TQT_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" ); - VpnTypesInfoAction = new TDEToggleAction ( i18n ( "Show &VPN types Info" ), "application-vnd.tde.info", CTRL + Key_T, this, TQT_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" ); + ( void* ) KStdAction::quit ( this, TQ_SLOT ( quitCalled() ), actionCollection() ); + + SaveSessionAction = new TDEAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQ_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" ); + DeleteSessionAction = new TDEAction ( i18n ( "&Delete Profile..." ), "edit-delete", Key_D, this, TQ_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" ); + RenameSessionAction = new TDEAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQ_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" ); + // NewSessionAction = new TDEAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQ_SLOT( newSessionClicked() ), actionCollection(), "newSession" ); + //AdvancedSessionAction = new TDEAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQ_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" ); + ImportSessionAction = new TDEAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQ_SLOT ( importProfileClicked() ), actionCollection(), "importSession" ); + ImportOpenvpnProfileAction = new TDEAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQ_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" ); + ImportFreeswanProfileAction = new TDEAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQ_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" ); + ImportFritzboxProfileAction = new TDEAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQ_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" ); + ImportCertAction = new TDEAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQ_SLOT ( importCertClicked() ), actionCollection(), "importCert" ); + ManageCiscoCertAction = new TDEAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQ_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" ); + CiscoCertEnrollmentAction = new TDEAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQ_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" ); + ExportOpenvpnProfileAction = new TDEAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQ_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" ); + + ImportKvpncSettingsAction = new TDEAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQ_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" ); + ExportKvpncSettingsAction = new TDEAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQ_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" ); + + ConnectAction = new TDEAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQ_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" ); + DisconnectAction = new TDEAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQ_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" ); + ProfileManagerAction = new TDEAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQ_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" ); + NewProfileWizardAction = new TDEAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQ_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" ); +// DonateAction = new TDEAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQ_SLOT ( donateClicked() ), actionCollection(), "donate" ); + ReportBugAction = new TDEAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQ_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" ); + DebugconsoleAction = new TDEToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQ_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" ); + ToolsInfoAction = new TDEToggleAction ( i18n ( "Show &Tools Info" ), "application-vnd.tde.info", CTRL + Key_I, this, TQ_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" ); + VpnTypesInfoAction = new TDEToggleAction ( i18n ( "Show &VPN types Info" ), "application-vnd.tde.info", CTRL + Key_T, this, TQ_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" ); // // tmp -// ToolsInfoAction = new TDEToggleAction ( i18n("Show &Tools Info"), "application-vnd.tde.info", CTRL + Key_T, this, TQT_SLOT(helpClicked() ), actionCollection(), "toolsinfo" ); +// ToolsInfoAction = new TDEToggleAction ( i18n("Show &Tools Info"), "application-vnd.tde.info", CTRL + Key_T, this, TQ_SLOT(helpClicked() ), actionCollection(), "toolsinfo" ); - LogViewerAction = new TDEToggleAction ( i18n ( "Show &Log" ), "text-x-log", CTRL + Key_L, this, TQT_SLOT ( showLogViewer() ), actionCollection(), "logviewer" ); - GenerateOpenvpnKeyAction = new TDEToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQT_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" ); - SendFeedbackMailAction = new TDEAction ( i18n ( "Send &Feedback Mail..." ), 0, this, TQT_SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" ); - PrefAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection(), "preferences" ); - KStdAction::helpContents ( this, TQT_SLOT ( helpClicked () ), actionCollection(), "help" ); - KStdAction::configureNotifications ( this, TQT_SLOT ( slotConfigNotifications() ), actionCollection() ); - KStdAction::keyBindings ( this, TQT_SLOT ( slotKeyBindings() ), actionCollection() ); + LogViewerAction = new TDEToggleAction ( i18n ( "Show &Log" ), "text-x-log", CTRL + Key_L, this, TQ_SLOT ( showLogViewer() ), actionCollection(), "logviewer" ); + GenerateOpenvpnKeyAction = new TDEToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQ_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" ); + SendFeedbackMailAction = new TDEAction ( i18n ( "Send &Feedback Mail..." ), 0, this, TQ_SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" ); + PrefAction = KStdAction::preferences ( this, TQ_SLOT ( slotSettings() ), actionCollection(), "preferences" ); + KStdAction::helpContents ( this, TQ_SLOT ( helpClicked () ), actionCollection(), "help" ); + KStdAction::configureNotifications ( this, TQ_SLOT ( slotConfigNotifications() ), actionCollection() ); + KStdAction::keyBindings ( this, TQ_SLOT ( slotKeyBindings() ), actionCollection() ); this->ConnectAction->setEnabled ( false ); this->DisconnectAction->setEnabled ( false ); - // ShowToolbarAction = KStdAction::showToolbar( this, TQT_SLOT( slotShowToolbar() ), actionCollection() ); + // ShowToolbarAction = KStdAction::showToolbar( this, TQ_SLOT( slotShowToolbar() ), actionCollection() ); createStandardStatusBarAction(); - ShowStatusbarAction = KStdAction::showStatusbar ( this, TQT_SLOT ( slotShowStatusbar() ), actionCollection() ); - PreferencesAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection() ); + ShowStatusbarAction = KStdAction::showStatusbar ( this, TQ_SLOT ( slotShowStatusbar() ), actionCollection() ); + PreferencesAction = KStdAction::preferences ( this, TQ_SLOT ( slotSettings() ), actionCollection() ); - ( void* ) KStdAction::keyBindings ( this, TQT_SLOT ( slotKeyBindings() ), actionCollection() ); - ( void* ) KStdAction::configureToolbars ( this, TQT_SLOT ( slotConfigToolbars() ), actionCollection() ); - ( void* ) KStdAction::configureNotifications ( this, TQT_SLOT ( slotConfigNotifications() ), actionCollection() ); + ( void* ) KStdAction::keyBindings ( this, TQ_SLOT ( slotKeyBindings() ), actionCollection() ); + ( void* ) KStdAction::configureToolbars ( this, TQ_SLOT ( slotConfigToolbars() ), actionCollection() ); + ( void* ) KStdAction::configureNotifications ( this, TQ_SLOT ( slotConfigNotifications() ), actionCollection() ); createGUI(); @@ -423,10 +423,10 @@ void KVpnc::initView() mw = new MainView ( this, "mainView" ); setCentralWidget ( mw ); - connect ( mw->buttonConnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotConnecting() ) ); - connect ( mw->buttonDisconnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( disconnectClicked() ) ); + connect ( mw->buttonConnect, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( slotConnecting() ) ); + connect ( mw->buttonDisconnect, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( disconnectClicked() ) ); - connect ( mw->SessionCombo, TQT_SIGNAL ( activated ( const TQString & ) ), this, TQT_SLOT ( sessionToggled ( const TQString& ) ) ); + connect ( mw->SessionCombo, TQ_SIGNAL ( activated ( const TQString & ) ), this, TQ_SLOT ( sessionToggled ( const TQString& ) ) ); mw->SessionCombo->setEnabled ( FALSE ); @@ -461,7 +461,7 @@ void KVpnc::initDockWindow() DisconnectAction->plug ( KVpncDock->menu(), 2 ); KVpncDock->menu() ->insertSeparator ( 5 ); PreferencesAction->plug ( KVpncDock->menu(), 6 ); - connect (KVpncDock, TQT_SIGNAL(tooltipRequested()), this, TQT_SLOT(showDockTooltip())); + connect (KVpncDock, TQ_SIGNAL(tooltipRequested()), this, TQ_SLOT(showDockTooltip())); } void KVpnc::slotSettings() @@ -473,8 +473,8 @@ void KVpnc::slotSettings() // prefDlg->setMinimumSize ( 800, 600 ); VpnAccountData *oldProfile = GlobalConfig->currentProfile; - connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) ); - connect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString ))); + connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( showNewProfileWizardClicked() ) ); + connect ( this, TQ_SIGNAL(newProfileCreated(TQString )), prefDlg, TQ_SLOT(slotProfileCreated(TQString ))); prefDlg->exec(); GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) ); @@ -566,8 +566,8 @@ void KVpnc::slotSettings() //saveGuiOptions(); saveSessionClicked(); showProfilesOnly=false; - disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) ); - disconnect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString ))); + disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( showNewProfileWizardClicked() ) ); + disconnect ( this, TQ_SIGNAL(newProfileCreated(TQString )), prefDlg, TQ_SLOT(slotProfileCreated(TQString ))); delete prefDlg; } @@ -2068,7 +2068,7 @@ void KVpnc::connectClicked() VpncProcess = new TQProcess ( this ); VpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); - connect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + connect ( VpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); VpncProcess->addArgument ( GlobalConfig->pathToVpnc ); @@ -2338,8 +2338,8 @@ void KVpnc::connectClicked() mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); - connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); - connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) ); + connect ( VpncProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( vpncStarted() ) ); + connect ( VpncProcess, TQ_SIGNAL ( wroteToStdin() ), this, TQ_SLOT ( wroteToStdin_vpncConfig() ) ); if ( vpnc_version_major >= 0 && vpnc_version_minor > 2 ) { @@ -2358,8 +2358,8 @@ void KVpnc::connectClicked() } } - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); } } @@ -2705,7 +2705,7 @@ void KVpnc::connectClicked() CiscoVpncProcess = new TQProcess ( this ); CiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); - connect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) ); + connect ( CiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_ciscovpnc() ) ); // write vpnc connect script TQString CiscoVpncConfig = TQString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +TQString ( "kvpnc_" ) +TQString ( GlobalConfig->currentProfile->getName() +".pcf" ); // vpnc-script. @@ -2850,12 +2850,12 @@ void KVpnc::connectClicked() mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); -// connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); -// connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) ); +// connect ( VpncProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( vpncStarted() ) ); +// connect ( VpncProcess, TQ_SIGNAL ( wroteToStdin() ), this, TQ_SLOT ( wroteToStdin_vpncConfig() ) ); } - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); } else @@ -4055,15 +4055,15 @@ void KVpnc::connectClicked() RacoonHelperProcess->addArgument ( GlobalConfig->InterpreterShell ); RacoonHelperProcess->addArgument ( tmpPath + "/setkey." + GlobalConfig->currentProfile->getName() + ".sh" ); - connect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); - connect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); - connect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); + connect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon_helper() ) ); + connect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon_helper() ) ); + connect ( RacoonHelperProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doRacoon() ) ); if ( !RacoonHelperProcess->start ( env ) ) { - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doRacoon() ) ); delete RacoonHelperProcess; RacoonHelperProcess =0L; if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -5213,17 +5213,17 @@ void KVpnc::connectClicked() IpsecGotError = false; - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - connect ( IpsecStartProcess, TQT_SIGNAL ( normalExit () ), this, TQT_SLOT ( ipsecStarted() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( normalExit () ), this, TQ_SLOT ( ipsecStarted() ) ); if ( !IpsecStartProcess->start ( env ) ) { KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "ipsec (" + IpsecType + "): setup" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ipsec (" + IpsecType + "): setup" ) , GlobalConfig->error ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - //disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + //disconnect ( IpsecStartProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( ipsecStarted() ) ); delete IpsecStartProcess; IpsecStartProcess = 0L; disconnectClicked(); @@ -5263,9 +5263,9 @@ void KVpnc::connectClicked() GlobalConfig->appPointer->processEvents(); usleep ( 500 ); } - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( ipsecStarted() ) ); delete IpsecStartProcess; IpsecStartProcess = 0L; @@ -6136,8 +6136,8 @@ void KVpnc::connectClicked() // PptpProcess->addArgument( GlobalConfig->InterpreterShell ); // PptpProcess->addArgument( "/home/crissi/pppd.sh" ); - connect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - connect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + connect ( PptpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + connect ( PptpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); @@ -6152,8 +6152,8 @@ void KVpnc::connectClicked() { KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "pppd" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "pppd" ), GlobalConfig->error ); - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); disconnectClicked(); setGuiStatus ( disconnected ); } @@ -6167,12 +6167,12 @@ void KVpnc::connectClicked() this->DisconnectAction->setEnabled ( true ); mw->buttonConnect->setEnabled ( false ); this->ConnectAction->setEnabled ( false ); - //connect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) ); + //connect ( PptpProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( pppdStarted() ) ); - // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) ); + // connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) ); // timer.start( tryConnectTimeout * 1000, FALSE ); - //connect ( PptpProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pptpProcessExited() ) ); + //connect ( PptpProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( pptpProcessExited() ) ); } @@ -7292,9 +7292,9 @@ void KVpnc::connectClicked() OpenvpnProcess->addArgument ( "--config" ); OpenvpnProcess->addArgument ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" ); // default - connect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); -// connect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); - connect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); + connect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); +// connect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); + connect ( OpenvpnProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( openvpn_exited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); @@ -7338,7 +7338,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Starting Openvpn management handler..." ), GlobalConfig->debug ); managementhandler = new OpenvpnManagementHandler ( this, GlobalConfig ); - connect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); + connect ( managementhandler, TQ_SIGNAL ( terminate_openvpn() ), this, TQ_SLOT ( disconnectClicked() ) ); if ( managementhandler->doConnect()) { @@ -7687,9 +7687,9 @@ void KVpnc::connectClicked() VtundProcess->addArgument ( GlobalConfig->currentProfile->getGateway() ); - connect ( VtundProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_vtun() ) ); - connect ( VtundProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_vtun() ) ); - connect ( VtundProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( vtun_exited() ) ); + connect ( VtundProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_vtun() ) ); + connect ( VtundProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_vtun() ) ); + connect ( VtundProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( vtun_exited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); @@ -7977,8 +7977,8 @@ void KVpnc::connectClicked() *SshProcess << GlobalConfig->pathToSsh ; // SshProcess->setExecutable(GlobalConfig->pathToSsh); /* - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)));*/ + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)));*/ // TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh"; // @@ -8144,9 +8144,9 @@ void KVpnc::connectClicked() } - connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( TDEProcess *, char *, int ) ) ); - connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( TDEProcess *, char *, int ) ) ); -// connect( SshProcess, TQT_SIGNAL( processExited() ), this, TQT_SLOT( sshExited() ) ); + connect ( SshProcess, TQ_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ), this, TQ_SLOT ( readFromStdout_ssh ( TDEProcess *, char *, int ) ) ); + connect ( SshProcess, TQ_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ), this, TQ_SLOT ( readFromStderr_ssh ( TDEProcess *, char *, int ) ) ); +// connect( SshProcess, TQ_SIGNAL( processExited() ), this, TQ_SLOT( sshExited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); slotStatusMsg ( i18n ( "Connecting..." ), ID_CONNECTION_MSG ); @@ -8233,8 +8233,8 @@ void KVpnc::disconnectClicked() { if ( ConnectionStatusCheckProcess->isRunning() ) { - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_connectionStatusCheck() ) ); ConnectionStatusCheckProcess->kill(); @@ -8271,9 +8271,9 @@ void KVpnc::disconnectClicked() { if ( VpncProcess->isRunning() ) { - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); VpncProcess->kill(); sleep ( 1 ); @@ -8366,8 +8366,8 @@ void KVpnc::disconnectClicked() DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( VpncDisconnectScript ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -8380,15 +8380,15 @@ void KVpnc::disconnectClicked() sleep ( 1 ); } } - disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); - disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_disconnect() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_disconnect() ) ); delete DisconnectProcess; DisconnectProcess=0L; } setGuiStatus ( disconnected ); durationTimer.stop(); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connectionEnded(); } // vpnclient @@ -8443,8 +8443,8 @@ void KVpnc::disconnectClicked() DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( CiscoVpncDisconnectScript ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -8457,12 +8457,12 @@ void KVpnc::disconnectClicked() sleep ( 1 ); } } - disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); - disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_disconnect() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_disconnect() ) ); delete DisconnectProcess; DisconnectProcess=0L; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); if ( CiscoVpncProcess != 0 && CiscoVpncProcess->isRunning() ) @@ -8475,7 +8475,7 @@ void KVpnc::disconnectClicked() CiscoVpncProcess=0L; setGuiStatus ( disconnected ); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connectionEnded(); } // racoon @@ -8544,8 +8544,8 @@ void KVpnc::disconnectClicked() if ( L2tpdProcess != 0L && L2tpdProcess->isRunning() ) { - disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStdoutRecieved() ), this, TQ_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStderrRecieved() ), this, TQ_SLOT ( processStderr_l2tpd() ) ); L2tpdProcess->kill(); if ( L2tpdProcess->isRunning() ) @@ -8560,8 +8560,8 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->tryTerminate(); sleep ( 1 ); @@ -8635,8 +8635,8 @@ void KVpnc::disconnectClicked() if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() ) { - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_tail_racoon() ) ); // terminateConnection( RacoonTailProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -8658,8 +8658,8 @@ void KVpnc::disconnectClicked() if ( RacoonProcess != 0 && RacoonProcess->isRunning() ) { - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); // terminateConnection( RacoonProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -8754,7 +8754,7 @@ void KVpnc::disconnectClicked() } setGuiStatus ( disconnected ); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.stop(); connectionEnded(); @@ -8763,9 +8763,9 @@ void KVpnc::disconnectClicked() // DisconnectProcess->addArgument( "-3" ); // DisconnectProcess->addArgument( "racoon" ); // - // connect( DisconnectProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoon() ) ); - // connect( DisconnectProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoon() ) ); - // connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeSetkey() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_racoon() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_racoon() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeSetkey() ) ); // // if ( !DisconnectProcess->start(env) ) // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") ); @@ -8822,8 +8822,8 @@ void KVpnc::disconnectClicked() { if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_openl2tp() ) ); //OpenL2tpProcess->tryTerminate(); sleep ( 1 ); //if (OpenL2tpProcess->isRunning()) @@ -8909,8 +8909,8 @@ void KVpnc::disconnectClicked() IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackDeleteProcess->addArgument ( "--delete" ); - connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); - connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackdelete() ) ); if ( !IpsecWhackDeleteProcess->start ( env ) ) { @@ -8932,8 +8932,8 @@ void KVpnc::disconnectClicked() usleep ( 500 ); } } - disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); - disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); + disconnect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + disconnect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackdelete() ) ); delete IpsecWhackDeleteProcess; IpsecWhackDeleteProcess=0L; @@ -8955,9 +8955,9 @@ void KVpnc::disconnectClicked() // IpsecStartProcess->addArgument ( "stop" ); // } // -// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); +// connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// // connect( IpsecStartProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeRouteFreeswan() ) ); // // if ( !IpsecStartProcess->start ( env ) ) // { @@ -8993,9 +8993,9 @@ void KVpnc::disconnectClicked() // } // // } -// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// //disconnect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); +// disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// //disconnect( IpsecStartProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeRouteFreeswan() ) ); // delete IpsecStartProcess; // IpsecStartProcess=0L; @@ -9004,7 +9004,7 @@ void KVpnc::disconnectClicked() delRouteIpsec(); removeIptablesFreeswan(); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); setGuiStatus ( disconnected ); durationTimer.stop(); GlobalConfig->currentConnectRetry=0; @@ -9140,8 +9140,8 @@ void KVpnc::disconnectClicked() if (PptpProcess != 0L) { - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route. ToolInfo *PptpInfo = Utils ( GlobalConfig ).getToolInfo ( "pptp" ); @@ -9492,7 +9492,7 @@ void KVpnc::disconnectClicked() setGuiStatus ( disconnected ); GlobalConfig->status = GlobalConfig->disconnected; connectCounter = 0; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); // connectionEnded(); } } @@ -9504,13 +9504,13 @@ void KVpnc::disconnectClicked() { // delete managementhandler; } - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - //disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); - //disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + //disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); + //disconnect ( OpenvpnProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( openvpn_exited() ) ); if ( managementhandler ) { - disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); + disconnect ( managementhandler, TQ_SIGNAL ( terminate_openvpn() ), this, TQ_SLOT ( disconnectClicked() ) ); managementhandler->greetingtimer.stop(); managementhandler->closeConnection(); while( ! managementhandler->socketReallyClosed ) @@ -9525,12 +9525,12 @@ void KVpnc::disconnectClicked() if ( OpenvpnProcess != 0L && OpenvpnProcess->isRunning() ) { //OpenvpnProcess->tryTerminate(); - //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) ); + //TQTimer::singleShot ( 2000, OpenvpnProcess, TQ_SLOT ( kill() ) ); OpenvpnProcess->kill(); } //sleep ( 2 ); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connectionEnded(); @@ -9542,7 +9542,7 @@ void KVpnc::disconnectClicked() if ( VtundProcess != 0 ) { VtundProcess->tryTerminate(); - TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, VtundProcess, TQ_SLOT ( kill() ) ); } // terminateConnection( VtundProcess ); @@ -9550,8 +9550,8 @@ void KVpnc::disconnectClicked() // VtundProcess->addArgument( GlobalConfig->pathToKillall ); // VtundProcess->addArgument( "vtund" ); // - // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); - // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); + // connect( VtundProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_disconnect() ) ); + // connect( VtundProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); @@ -9562,7 +9562,7 @@ void KVpnc::disconnectClicked() // delete VtundProcess; // VtundProcess=0L; // } - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); sleep ( 2 ); delete VtundProcess; @@ -9577,7 +9577,7 @@ void KVpnc::disconnectClicked() if ( SshProcess != 0 ) { // SshProcess->tryTerminate(); -// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) ); +// TQTimer::singleShot ( 5000, SshProcess, TQ_SLOT ( kill() ) ); SshProcess->kill(); } @@ -9586,8 +9586,8 @@ void KVpnc::disconnectClicked() // SshProcess->addArgument( GlobalConfig->pathToKillall ); // SshProcess->addArgument( "openvpn" ); // - // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); - // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); + // connect( SshProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_disconnect() ) ); + // connect( SshProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); @@ -9707,7 +9707,7 @@ void KVpnc::disconnectClicked() } - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connectionEnded(); } } @@ -9748,9 +9748,9 @@ void KVpnc::disconnectClicked() { if ( VpncProcess->isRunning() ) { - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); VpncProcess->kill(); sleep ( 1 ); @@ -9841,8 +9841,8 @@ void KVpnc::disconnectClicked() DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); DisconnectProcess->addArgument ( VpncDisconnectScript ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) ); - connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_disconnect() ) ); + connect ( DisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_disconnect() ) ); if ( !DisconnectProcess->start ( env ) ) { @@ -9856,12 +9856,12 @@ void KVpnc::disconnectClicked() DisconnectProcess=0L; } - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); setGuiStatus ( disconnected ); - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); timer.stop(); connectionEnded(); } @@ -9873,7 +9873,7 @@ void KVpnc::disconnectClicked() { CiscoVpncProcess->kill(); CiscoVpncProcess->tryTerminate(); - TQTimer::singleShot ( 5000, CiscoVpncProcess, TQT_SLOT ( kill() ) ); + TQTimer::singleShot ( 5000, CiscoVpncProcess, TQ_SLOT ( kill() ) ); sleep ( 5 ); delete CiscoVpncProcess; @@ -9912,8 +9912,8 @@ void KVpnc::disconnectClicked() if ( L2tpdProcess != 0L ) { L2tpWaitForPppUpTimer.stop(); - disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStdoutRecieved() ), this, TQ_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStderrRecieved() ), this, TQ_SLOT ( processStderr_l2tpd() ) ); if ( L2tpdProcess->isRunning() ) { @@ -9931,8 +9931,8 @@ void KVpnc::disconnectClicked() if ( OpenL2tpProcess != 0L ) { - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->kill(); delete OpenL2tpProcess; @@ -10014,8 +10014,8 @@ void KVpnc::disconnectClicked() IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackDeleteProcess->addArgument ( "--delete" ); - connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) ); - connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackdelete() ) ); + connect ( IpsecWhackDeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackdelete() ) ); if ( !IpsecWhackDeleteProcess->start ( env ) ) { @@ -10055,9 +10055,9 @@ void KVpnc::disconnectClicked() IpsecStartProcess->addArgument ( "stop" ); } - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeRouteFreeswan() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + // connect( IpsecStartProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeRouteFreeswan() ) ); if ( !IpsecStartProcess->start ( env ) ) { @@ -10092,8 +10092,8 @@ void KVpnc::disconnectClicked() usleep ( 500 ); } } - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); delete IpsecStartProcess; IpsecStartProcess=0L; @@ -10321,8 +10321,8 @@ void KVpnc::disconnectClicked() // if (RacoonctlProcess !=0 && RacoonctlProcess->isRunning()) // { -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_racoonctl() ) ); // // RacoonctlProcess->kill(); // } @@ -10359,8 +10359,8 @@ void KVpnc::disconnectClicked() { L2tpWaitForPppUpTimer.stop(); - disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); - disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStdoutRecieved() ), this, TQ_SLOT ( processStdout_l2tpd() ) ); + disconnect ( this, TQ_SIGNAL ( L2tpdStderrRecieved() ), this, TQ_SLOT ( processStderr_l2tpd() ) ); L2tpdProcess->kill(); if ( L2tpdProcess->isRunning() ) @@ -10374,8 +10374,8 @@ void KVpnc::disconnectClicked() { if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() ) { - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); - disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_openl2tp() ) ); + disconnect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_openl2tp() ) ); OpenL2tpProcess->tryTerminate(); sleep ( 1 ); if ( OpenL2tpProcess->isRunning() ) @@ -10444,8 +10444,8 @@ void KVpnc::disconnectClicked() if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() ) { - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_tail_racoon() ) ); // terminateConnection( RacoonTailProcess ); RacoonTailProcess->kill(); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -10477,8 +10477,8 @@ void KVpnc::disconnectClicked() if ( RacoonProcess != 0 && RacoonProcess->isRunning() ) { - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); // terminateConnection( RacoonProcess ); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -10636,8 +10636,8 @@ void KVpnc::disconnectClicked() if ( PptpProcess != 0 && PptpProcess->isRunning()) { - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + disconnect ( PptpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); // try to kill the pptp process self PptpProcess->tryTerminate(); @@ -10954,7 +10954,7 @@ void KVpnc::disconnectClicked() { if ( managementhandler ) { - disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) ); + disconnect ( managementhandler, TQ_SIGNAL ( terminate_openvpn() ), this, TQ_SLOT ( disconnectClicked() ) ); managementhandler->greetingtimer.stop(); managementhandler->closeConnection(); while( ! managementhandler->socketReallyClosed ) @@ -10966,13 +10966,13 @@ void KVpnc::disconnectClicked() delete managementhandler; } - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - //disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); - //disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + //disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); + //disconnect ( OpenvpnProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( openvpn_exited() ) ); if ( OpenvpnProcess != 0 && OpenvpnProcess->isRunning() ) { //OpenvpnProcess->tryTerminate(); - //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) ); + //TQTimer::singleShot ( 2000, OpenvpnProcess, TQ_SLOT ( kill() ) ); OpenvpnProcess->kill(); } @@ -10988,7 +10988,7 @@ void KVpnc::disconnectClicked() if ( VtundProcess != 0 ) { VtundProcess->tryTerminate(); - TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) ); + TQTimer::singleShot ( 2000, VtundProcess, TQ_SLOT ( kill() ) ); } // terminateConnection( VtundProcess ); @@ -10996,8 +10996,8 @@ void KVpnc::disconnectClicked() // VtundProcess->addArgument( GlobalConfig->pathToKillall ); // VtundProcess->addArgument( "vtund" ); // - // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); - // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); + // connect( VtundProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_disconnect() ) ); + // connect( VtundProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); @@ -11009,7 +11009,7 @@ void KVpnc::disconnectClicked() // delete VtundProcess; // VtundProcess=0L; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); sleep ( 2 ); delete VtundProcess; VtundProcess=0L; @@ -11023,7 +11023,7 @@ void KVpnc::disconnectClicked() if ( SshProcess != 0 ) { // SshProcess->tryTerminate(); -// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) ); +// TQTimer::singleShot ( 5000, SshProcess, TQ_SLOT ( kill() ) ); SshProcess->kill(); } @@ -11032,8 +11032,8 @@ void KVpnc::disconnectClicked() // SshProcess->addArgument( GlobalConfig->pathToKillall ); // SshProcess->addArgument( "openvpn" ); // - // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); - // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); + // connect( SshProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_disconnect() ) ); + // connect( SshProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); @@ -11045,7 +11045,7 @@ void KVpnc::disconnectClicked() delete SshProcess; SshProcess=0L; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connectionEnded(); } //connectionEnded(); @@ -11383,8 +11383,8 @@ void KVpnc::vpnTypesInfoClicked() // DonateProcess->addArgument ( browser ); // DonateProcess->addArgument ( donateurl ); // -// // connect( DonateProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) ); -// // connect( DonateProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) ); +// // connect( DonateProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_bugreport() ) ); +// // connect( DonateProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_bugreport() ) ); // // if ( !DonateProcess->start(env) ) // { @@ -11420,8 +11420,8 @@ void KVpnc::reportBugClicked() BugReportProcess->addArgument ( browser ); BugReportProcess->addArgument ( bugreporturl ); - // connect( BugReportProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) ); - // connect( BugReportProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) ); + // connect( BugReportProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_bugreport() ) ); + // connect( BugReportProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_bugreport() ) ); if ( !BugReportProcess->start ( env ) ) { @@ -11467,8 +11467,8 @@ void KVpnc::readOutputFrom_vpnc() // if (GlobalConfig->KvpncDebugLevel > 0) // this->GlobalConfig->appendLogEntry ( deviceaddr,GlobalConfig->debug); // deviceaddrstr2addr = false; - //disconnect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); - //disconnect( VpncProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); + //disconnect( VpncProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutputFrom_vpnc() ) ); + //disconnect( VpncProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutputFrom_vpnc() ) ); } /* TMP !!!! */ @@ -11590,9 +11590,9 @@ void KVpnc::readOutputFrom_vpnc() GlobalConfig->status = GlobalConfig->connected; timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -11629,7 +11629,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) , GlobalConfig->error ); //abort = true; @@ -11643,12 +11643,12 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Connection rejected because wrong settings sent to the VPN server. Please check your settings." ) ) ; GlobalConfig->appendLogEntry ( i18n ( "Connection rejected because wrong settings sent to the VPN server. Please check your settings." ) , GlobalConfig->error ); abort = true; AuthRetry = false; - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); timer.stop(); connectClicked(); } @@ -11657,13 +11657,13 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); //abort = true; AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_vpnc() ) ); timer.stop(); connectClicked(); } @@ -11673,7 +11673,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "You have to enter a IP address for the remote gateway!" ) ); GlobalConfig->appendLogEntry ( i18n ( "You have to enter a IP address for the remote gateway!" ) , GlobalConfig->error ); abort = true; @@ -11684,7 +11684,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "No response from VPN server" ) ); GlobalConfig->appendLogEntry ( i18n ( "No response from VPN server" ) , GlobalConfig->error ); abort = true; @@ -11695,7 +11695,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Tunnel interface can't be initalized" ) ); GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface can't be initalized" ) , GlobalConfig->error ); abort = true; @@ -11718,7 +11718,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Host unknown" ) ); GlobalConfig->appendLogEntry ( i18n ( "Host unknown" ) , GlobalConfig->error ); abort = true; @@ -11729,7 +11729,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Socket creation failed" ) ); GlobalConfig->appendLogEntry ( i18n ( "Socket creation failed" ) , GlobalConfig->error ); abort = true; @@ -11739,7 +11739,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Connection to the Cisco server was refused" ) ); GlobalConfig->appendLogEntry ( i18n ( "receiving packet: Connection refused" ) , GlobalConfig->error ); abort = true; @@ -11750,7 +11750,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug ); GlobalConfig->appendLogEntry ( TQString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug ); @@ -11871,8 +11871,8 @@ void KVpnc::readOutputFrom_vpnc() // DisconnectProcess->addArgument( GlobalConfig->InterpreterShell ); // DisconnectProcess->addArgument( VpncDisconnectScript ); // - // connect( DisconnectProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) ); - // connect( DisconnectProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_disconnect() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) // { @@ -11990,7 +11990,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "No network reachable" ) ); GlobalConfig->appendLogEntry ( i18n ( "No network reachable" ) , GlobalConfig->error ); terminateConnection ( VpncProcess ); @@ -12001,7 +12001,7 @@ void KVpnc::readOutputFrom_vpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Invalid ISAKMP exchange type received" ) ); GlobalConfig->appendLogEntry ( i18n ( "Invalid ISAKMP exchange type received" ) , GlobalConfig->error ); abort = true; @@ -12205,7 +12205,7 @@ void KVpnc::readOutputFrom_ciscovpnc() { timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "group password" ) ) , GlobalConfig->error ); //abort = true; @@ -12322,7 +12322,7 @@ void KVpnc::readOutputFrom_ciscovpnc() //abort = true; AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) ); + disconnect ( CiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutputFrom_ciscovpnc() ) ); timer.stop(); connectClicked(); } @@ -12380,9 +12380,9 @@ void KVpnc::readOutputFrom_ciscovpnc() GlobalConfig->status = GlobalConfig->connected; timer.stop(); connectCounter=0; - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -12550,8 +12550,8 @@ void KVpnc::readFromStdout_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -12620,8 +12620,8 @@ void KVpnc::readFromStdout_racoon() { //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) { @@ -12666,8 +12666,8 @@ void KVpnc::readFromStdout_racoon() //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// connect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// connect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { @@ -12765,8 +12765,8 @@ void KVpnc::readFromStderr_racoon() { //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) { @@ -12811,8 +12811,8 @@ void KVpnc::readFromStderr_racoon() //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// connect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// connect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { @@ -12990,8 +12990,8 @@ void KVpnc::readFromStderr_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -13429,8 +13429,8 @@ void KVpnc::readFromStdout_ipsecwhack() else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 ) { // strongswan after ipsec whack --listen - /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + /* disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); delete(IpsecWhackProcess);*/ putenv ( ( char* ) ( "LC_ALL=C" ) ); IpsecWhackProcess = new TQProcess ( this ); @@ -13440,15 +13440,15 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -13479,9 +13479,9 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); TQString LogPassword=""; if ( GlobalConfig->KvpncDebugLevel > 5 ) @@ -13490,9 +13490,9 @@ void KVpnc::readFromStdout_ipsecwhack() LogPassword="*****"; if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -13534,9 +13534,9 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); TQString LogPassword=""; if ( GlobalConfig->KvpncDebugLevel > 5 ) @@ -13545,9 +13545,9 @@ void KVpnc::readFromStdout_ipsecwhack() LogPassword="*****"; if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -14093,8 +14093,8 @@ void KVpnc::readFromStdout_ipsecwhacklisten() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten() else { // we have to give some time to sleep and try again... - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhacklisten() ) ); IpsecWhackListenProcess->tryTerminate(); sleep ( 2 ); if ( IpsecWhackListenProcess->isRunning() ) @@ -14460,8 +14460,8 @@ void KVpnc::readFromStdout_tail_racoon() // { // // //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// // disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// // disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// // disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// // disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); // // if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false ) // { @@ -14507,8 +14507,8 @@ void KVpnc::readFromStdout_tail_racoon() // // // //RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); -// // connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); -// // connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); +// // connect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); +// // connect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); // // if ( !RacoonProcess->start(env) ) // { @@ -14855,8 +14855,8 @@ void KVpnc::readFromStdout_tail_racoon() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -14996,9 +14996,9 @@ void KVpnc::readFromStdout_racoonctl() // sleep(2); // if (RacoonctlProcess->isRunning()) // { -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); -// disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_racoonctl() ) ); +// disconnect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); // RacoonctlProcess->kill(); // sleep(1); // racoonStarted(); @@ -15061,7 +15061,7 @@ void KVpnc::readFromStdout_racoonctl() // // GlobalConfig->status = GlobalConfig->connected; // -// connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); +// connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); // durationTimer.start ( 1000, FALSE ); // setGuiStatus ( connected ); // @@ -15189,7 +15189,7 @@ void KVpnc::readFromStdout_pptp() { timer.stop(); connectCounter=0; - // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "Authentication has been failed." ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed." ) , GlobalConfig->error ); //abort = true; @@ -15201,7 +15201,7 @@ void KVpnc::readFromStdout_pptp() { timer.stop(); connectCounter=0; - // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); KMessageBox::error ( this, i18n ( "The peer refused to authenticate." ) ); GlobalConfig->appendLogEntry ( i18n ( "The peer refused to authenticate." ) , GlobalConfig->error ); abort = true; @@ -15324,8 +15324,8 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -16006,8 +16006,8 @@ void KVpnc::readOutput_openvpn() { AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); connectClicked(); // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); @@ -16016,8 +16016,8 @@ void KVpnc::readOutput_openvpn() else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, FALSE ) > -1 ) { ; - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); connectClicked(); // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error ); @@ -16025,8 +16025,8 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, FALSE ) > -1 ) { - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); connectClicked(); // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error ); @@ -16036,8 +16036,8 @@ void KVpnc::readOutput_openvpn() { AuthRetry = true; GlobalConfig->haveUserData = false; - disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); - // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); + // disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); connectClicked(); // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error ); @@ -16402,10 +16402,10 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "Private key file could not loaded!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert SLOT", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert TQ_SLOT", 0 , FALSE ) > -1 ) { - KMessageBox::error ( this, i18n ( "Need token to be insert. Please insert token in SLOT...." ) ); - GlobalConfig->appendLogEntry ( i18n ( "Need token to be insert. Please insert token in SLOT...." ), GlobalConfig->error ); + KMessageBox::error ( this, i18n ( "Need token to be insert. Please insert token in TQ_SLOT...." ) ); + GlobalConfig->appendLogEntry ( i18n ( "Need token to be insert. Please insert token in TQ_SLOT...." ), GlobalConfig->error ); abort = true; } else if ( ProcessMsg.find ( "process exiting", 0 , FALSE ) > -1 ) @@ -16450,8 +16450,8 @@ void KVpnc::readOutput_openvpn() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -16820,8 +16820,8 @@ void KVpnc::processStdout_l2tpd() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -17036,8 +17036,8 @@ void KVpnc::processStderr_l2tpd() abort = false; } - disconnect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) ); - connect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) ); + disconnect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) ); + connect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) ); L2tpWaitForPppUpTimer.start ( 1000, FALSE ); } @@ -17084,8 +17084,8 @@ void KVpnc::processStderr_l2tpd() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -17340,8 +17340,8 @@ void KVpnc::readFromStdout_openl2tp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -17522,8 +17522,8 @@ void KVpnc::readFromStdout_vtun() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -17669,8 +17669,8 @@ void KVpnc::readFromStderr_vtun() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -17786,7 +17786,7 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) KMessageBox::error(this, i18n("Permission denied.")); connectCounter = 0; GlobalConfig->appendLogEntry(i18n("Permission denied") , GlobalConfig->error); - // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + // disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); abort = true; KMessageBox::error(this, i18n("Authentication has failed.")); GlobalConfig->appendLogEntry(i18n("Authentication has failed.") , GlobalConfig->error); //abort = true; @@ -17838,8 +17838,8 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); connectSuccess = false; @@ -18394,8 +18394,8 @@ void KVpnc::readFromStdout_connectionStatusCheck() KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) ); } } - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_connectionStatusCheck() ) ); ConnectionStatusCheckProcess->kill(); // kill connection disconnectClicked(); @@ -18569,7 +18569,7 @@ void KVpnc::terminateConnection ( TQProcess *proc ) // proc->tryTerminate(); // proc->tryTerminate(); - // TQTimer::singleShot( 5000, proc, TQT_SLOT( kill() ) ); + // TQTimer::singleShot( 5000, proc, TQ_SLOT( kill() ) ); } timer.stop(); @@ -20427,9 +20427,9 @@ void KVpnc::addRouteRacoon() // if ( RacoonHelperProcess->normalExit () ) { - // disconnect( RacoonHelperProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( addRouteRacoon() ) ); - // disconnect( RacoonHelperProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoon_helper() ) ); - // disconnect( RacoonHelperProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoon_helper() ) ); + // disconnect( RacoonHelperProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( addRouteRacoon() ) ); + // disconnect( RacoonHelperProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_racoon_helper() ) ); + // disconnect( RacoonHelperProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_racoon_helper() ) ); tmpPath = locateLocal ( "data", "kvpnc/" ); @@ -20479,8 +20479,8 @@ void KVpnc::addRouteRacoon() RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( RacoonRouteSetScript ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20513,7 +20513,7 @@ void KVpnc::delRouteRacoon() // if ( DisconnectProcess != 0 ) { - disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( delRouteRacoon() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( delRouteRacoon() ) ); tmpPath = locateLocal ( "data", "kvpnc/" ); TQString RacoonRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh"; @@ -20557,9 +20557,9 @@ void KVpnc::delRouteRacoon() RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( RacoonRouteSetScript ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); - // connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesRacoon() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); + // connect( DisconnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeIptablesRacoon() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20592,7 +20592,7 @@ void KVpnc::doIptablesRacoon() // if ( ConnectProcess->normalExit () ) { // if ( ConnectProcess ) - // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesRacoon() ) ); + // disconnect( ConnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( doIptablesRacoon() ) ); /* iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT */ @@ -20601,7 +20601,7 @@ void KVpnc::doIptablesRacoon() IptablesProcess->addArgument ( GlobalConfig->InterpreterShell ); IptablesProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_racoon.sh" ); - // connect( IptablesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRacoon() ) ); + // connect( IptablesProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( doRacoon() ) ); if ( !IptablesProcess->start ( env ) ) { @@ -20660,9 +20660,9 @@ void KVpnc::doPingKickupTunnel() void KVpnc::doRacoon() { - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon_helper() ) ); - disconnect ( RacoonHelperProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doRacoon() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon_helper() ) ); + disconnect ( RacoonHelperProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doRacoon() ) ); @@ -20700,14 +20700,14 @@ void KVpnc::doRacoon() // RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); // RacoonProcess->closeStdin(); - connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); - connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); + connect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); + connect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); if ( !RacoonProcess->start ( env ) ) { - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) ); - disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoon() ) ); + disconnect ( RacoonProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoon() ) ); delete RacoonProcess; RacoonProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "racoon" ) ); @@ -20730,7 +20730,7 @@ void KVpnc::doRacoon() // GlobalConfig->status = GlobalConfig->disconnected; // timer.stop(); - // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) ); + // connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) ); // durationTimer.start( 1000, FALSE ); } } @@ -20760,9 +20760,9 @@ void KVpnc::stopRacoon() RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP ); - connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); - connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); - connect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoonctl() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoonctl() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); if ( !RacoonctlProcess->start ( env ) ) @@ -20780,9 +20780,9 @@ void KVpnc::stopRacoon() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug ); } - disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); - disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); - disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); delete RacoonctlProcess; RacoonctlProcess=0L; } @@ -20797,13 +20797,13 @@ void KVpnc::doTailRacoonLog() RacoonTailProcess->addArgument ( "-f" ); RacoonTailProcess->addArgument ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ); - connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); - connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); + connect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_tail_racoon() ) ); + connect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_tail_racoon() ) ); if ( !RacoonTailProcess->start ( env ) ) { - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) ); - disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_tail_racoon() ) ); + disconnect ( RacoonTailProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_tail_racoon() ) ); delete RacoonTailProcess; RacoonTailProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ) ); @@ -20827,7 +20827,7 @@ void KVpnc::removeIptablesRacoon() // if ( DisconnectProcess != 0 ) { // if ( DisconnectProcess ) - // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesRacoon() ) ); + // disconnect( DisconnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeIptablesRacoon() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); DisconnectProcess = new TQProcess ( this ); @@ -20857,16 +20857,16 @@ void KVpnc::removeIptablesRacoon() void KVpnc::removeSetkey() { if ( DisconnectProcess ) - disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removeSetkey() ) ); + disconnect ( DisconnectProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( removeSetkey() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); RemoveSetkeyProcess = new TQProcess ( this ); RemoveSetkeyProcess->addArgument ( GlobalConfig->InterpreterShell ); RemoveSetkeyProcess->addArgument ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" ); - // connect( RemoveSetkeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_remove_setkey() ) ); - // connect( RemoveSetkeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_remove_setkey() ) ); - // connect( RemoveSetkeyProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( delRouteRacoon() ) ); + // connect( RemoveSetkeyProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_remove_setkey() ) ); + // connect( RemoveSetkeyProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_remove_setkey() ) ); + // connect( RemoveSetkeyProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( delRouteRacoon() ) ); if ( !RemoveSetkeyProcess->start ( env ) ) { @@ -20893,7 +20893,7 @@ void KVpnc::doIptablesFreeswan() { // if ( ConnectProcess->normalExit () ) { - // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesFreeswan() ) ); + // disconnect( ConnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( doIptablesFreeswan() ) ); /* iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT */ @@ -20968,8 +20968,8 @@ void KVpnc::addRouteIpsec() RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( IpsecRouteSetScript ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -20991,8 +20991,8 @@ void KVpnc::addRouteIpsec() } } } - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -21039,8 +21039,8 @@ void KVpnc::delRouteIpsec() RouteProcess->addArgument ( GlobalConfig->InterpreterShell ); RouteProcess->addArgument ( IpsecRouteSetScript ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -21058,8 +21058,8 @@ void KVpnc::delRouteIpsec() // parent->TQApplication::processEvents(); } } - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStdout () ), this, TQ_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -21069,7 +21069,7 @@ void KVpnc::removeIptablesFreeswan() { // if ( DisconnectProcess->normalExit () ) { - // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesFreeswan() ) ); + // disconnect( DisconnectProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( removeIptablesFreeswan() ) ); putenv ( ( char* ) ( "LC_ALL=C" ) ); DisconnectProcess = new TQProcess ( this ); @@ -21148,9 +21148,9 @@ void KVpnc::doPingTest() //PingProcess->addArgument( Interface ); PingProcess->addArgument ( PingHostIP ); - connect ( PingProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ping() ) ); - connect ( PingProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ping() ) ); - connect ( PingProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pingTestExited() ) ); + connect ( PingProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ping() ) ); + connect ( PingProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ping() ) ); + connect ( PingProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( pingTestExited() ) ); pingtest = true; @@ -21170,9 +21170,9 @@ void KVpnc::doPingTest() { sleep ( 1 ); } - disconnect ( PingProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ping() ) ); - disconnect ( PingProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ping() ) ); - disconnect ( PingProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pingTestExited() ) ); + disconnect ( PingProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ping() ) ); + disconnect ( PingProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ping() ) ); + disconnect ( PingProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( pingTestExited() ) ); } } @@ -21182,15 +21182,15 @@ void KVpnc::doPingTest() void KVpnc::pingTestExited() { - disconnect ( PingProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( pingTestExited() ) ); - // disconnect( PingProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_ping() ) ); - // disconnect( PingProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_ping() ) ); + disconnect ( PingProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( pingTestExited() ) ); + // disconnect( PingProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_ping() ) ); + // disconnect( PingProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_ping() ) ); // pingtest = false; } void KVpnc::vpncStarted() { - disconnect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) ); + disconnect ( VpncProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( vpncStarted() ) ); /* doing some after tunnel is up */ @@ -21198,14 +21198,14 @@ void KVpnc::vpncStarted() // VpncProcess->addArgument( GlobalConfig->InterpreterShell ); // VpncProcess->addArgument( VpncConnectScript ); // - // connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); + // connect( VpncProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutputFrom_vpnc() ) ); // // if ( !VpncProcess->start(env) ) { // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) ); // } else { // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info ); // - // // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) ); + // // connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) ); // // timer.start( tryConnectTimeout * 1000, FALSE ); // // // // mw->buttonConnect->setEnabled( false ); @@ -21263,9 +21263,9 @@ void KVpnc::racoonStarted() RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP ); - connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); - connect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); - connect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoonctl() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoonctl() ) ); + connect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); if ( !RacoonctlProcess->start ( env ) ) @@ -21318,9 +21318,9 @@ void KVpnc::racoonStarted() GlobalConfig->appPointer->processEvents(); usleep ( 500 ); } - disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoonctl() ) ); - disconnect ( RacoonctlProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoonctl() ) ); - disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_racoonctl() ) ); + disconnect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); delete RacoonctlProcess; RacoonctlProcess=0L; } @@ -21335,7 +21335,7 @@ void KVpnc::racoonStarted() // // GlobalConfig->status = GlobalConfig->connected; // - // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) ); + // connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) ); // durationTimer.start( 1000, FALSE ); // setGuiStatus( connected ); // @@ -21353,9 +21353,9 @@ void KVpnc::racoonStarted() void KVpnc::ipsecStarted() { - disconnect ( IpsecStartProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ipsecStarted() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( ipsecStarted() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); delete IpsecStartProcess; IpsecStartProcess=0L; @@ -21375,9 +21375,9 @@ void KVpnc::ipsecStarted() // IpsecProcess->addArgument ( GlobalConfig->currentProfile->getName() ); // // -// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// // connect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRouteFreeswan() ) ); +// connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// // connect( IpsecStartProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( doRouteFreeswan() ) ); // // if ( !IpsecStartProcess->start(env) ) // { @@ -21393,9 +21393,9 @@ void KVpnc::ipsecStarted() // { // sleep(1); // } -// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); -// // disconnect( IpsecStartProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRouteFreeswan() ) ); +// disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); +// // disconnect( IpsecStartProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( doRouteFreeswan() ) ); // delete IpsecStartProcess; // IpsecStartProcess=0L; // } @@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted() IpsecWhackListenProcess->addArgument ( "whack" ); IpsecWhackListenProcess->addArgument ( "--listen" ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhacklisten() ) ); if ( !IpsecWhackListenProcess->start ( env ) ) { - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhacklisten() ) ); delete IpsecWhackListenProcess; IpsecWhackListenProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) ); @@ -21451,20 +21451,20 @@ void KVpnc::checkIpsecWhackStatus() IpsecWhackStatusProcess->addArgument ( "whack" ); IpsecWhackStatusProcess->addArgument ( "--status" ); - disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackstatus() ) ); + connect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + connect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackstatus() ) ); - connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); + connect ( IpsecWhackStatusProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( IpsecWhackStatusProcessExited() ) ); if ( !IpsecWhackStatusProcess->start ( env ) ) { if ( IpsecStatusCheck == false && IpsecPhase2Up==false ) { - disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); - disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); + disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackstatus() ) ); + disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( IpsecWhackStatusProcessExited() ) ); delete IpsecWhackStatusProcess; IpsecWhackStatusProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --status" ) ); @@ -21480,15 +21480,15 @@ void KVpnc::checkIpsecWhackStatus() { if ( !timer.isActive() ) { - disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); - connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) ); + disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); + connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); // FIXME make connect timeout value in GUI available timer.start ( 2000 * 1000, FALSE ); } if ( !IpsecWhackStatusTimer.isActive() ) { - disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) ); - connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) ); + disconnect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) ); + connect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) ); IpsecWhackStatusTimer.start ( 5 * 1000, FALSE ); } } @@ -21561,8 +21561,8 @@ void KVpnc::startStopIpsec ( bool stop, bool silent ) if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + connect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); } IpsecStartingInProgress=true; @@ -21612,8 +21612,8 @@ void KVpnc::startStopIpsec ( bool stop, bool silent ) IpsecStartingInProgress=false; if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) ); - disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsec() ) ); + disconnect ( IpsecStartProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsec() ) ); } } } @@ -21627,8 +21627,8 @@ void KVpnc::addIpsecConnection() void KVpnc::start_ipsec_initiate() { // strongswan after ipsec whack --listen - /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + /* disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); delete(IpsecWhackProcess);*/ if ( IpsecGotError) @@ -21642,15 +21642,15 @@ void KVpnc::start_ipsec_initiate() IpsecWhackProcess->addArgument ( "--name" ); IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() ); IpsecWhackProcess->addArgument ( "--initiate" ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - connect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + connect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); if ( !IpsecWhackProcess->start ( env ) ) { - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( exited() ), this, TQT_SLOT ( ipsecwhack_exited() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( exited() ), this, TQ_SLOT ( ipsecwhack_exited() ) ); delete IpsecWhackProcess; IpsecWhackProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) ); @@ -21706,8 +21706,8 @@ void KVpnc::ipsecPhase2Established() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -21814,8 +21814,8 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction) void KVpnc::pppdStarted() { -// disconnect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) ); -// disconnect ( pppdUpProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( pppdStarted() ) ); +// disconnect ( PptpProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( pppdStarted() ) ); +// disconnect ( pppdUpProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( pppdStarted() ) ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "PppdUpScript" ), GlobalConfig->debug ); @@ -21824,7 +21824,7 @@ void KVpnc::pppdStarted() void KVpnc::openvpnStarted() { - disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openvpnStarted() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( openvpnStarted() ) ); } @@ -21859,8 +21859,8 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent ) if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 ) { - connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_startstopOpenl2tp() ) ); - connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( rreadFromStderr_startstopOpenl2tp() ) ); + connect ( StartStopOpenl2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_startstopOpenl2tp() ) ); + connect ( StartStopOpenl2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( rreadFromStderr_startstopOpenl2tp() ) ); } IpsecStartingInProgress=true; @@ -21966,15 +21966,15 @@ TQString KVpnc::getX509CertificateID ( TQString Cert, bool user ) X509CertificateExtractUser = user; - connect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); - connect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); - connect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); + connect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_getX509CertificateID() ) ); + connect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_getX509CertificateID() ) ); + connect ( X509CertificateExtractProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( openSSLEnded() ) ); if ( !X509CertificateExtractProcess->start ( env ) ) { - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( openSSLEnded() ) ); delete X509CertificateExtractProcess; X509CertificateExtractProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "openssl" ) ); @@ -21994,9 +21994,9 @@ TQString KVpnc::getX509CertificateID ( TQString Cert, bool user ) GlobalConfig->appendLogEntry ( i18n ( "Waiting for process end (getCertificate)." ), GlobalConfig->debug ); parent->TQApplication::processEvents(); } - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_getX509CertificateID() ) ); - disconnect ( X509CertificateExtractProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openSSLEnded() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_getX509CertificateID() ) ); + disconnect ( X509CertificateExtractProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( openSSLEnded() ) ); delete X509CertificateExtractProcess; X509CertificateExtractProcess=0L; if ( user ) @@ -22105,8 +22105,8 @@ void KVpnc::executeCommandBeforeConnect() CmdBeforeConnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdBeforeConnectProcess->addArgument ( CmdBeforeConnectScript ); - connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); - connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); + connect ( CmdBeforeConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); + connect ( CmdBeforeConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Executing command before connect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug ); @@ -22125,8 +22125,8 @@ void KVpnc::executeCommandBeforeConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeConnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); - disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); + disconnect ( CmdBeforeConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandBeforeConnect() ) ); + disconnect ( CmdBeforeConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandBeforeConnect() ) ); delete CmdBeforeConnectProcess; CmdBeforeConnectProcess =0L; } @@ -22160,8 +22160,8 @@ void KVpnc::executeCommandAfterConnect() CmdAfterConnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdAfterConnectProcess->addArgument ( CmdAfterConnectScript ); - connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); - connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); + connect ( CmdAfterConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); + connect ( CmdAfterConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Sleeping %1s before executing command after connect..." ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ) ), GlobalConfig->debug ); @@ -22184,8 +22184,8 @@ void KVpnc::executeCommandAfterConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterConnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); - disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); + disconnect ( CmdAfterConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandAfterConnect() ) ); + disconnect ( CmdAfterConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandAfterConnect() ) ); delete CmdAfterConnectProcess; CmdAfterConnectProcess=0L; @@ -22220,8 +22220,8 @@ void KVpnc::executeCommandBeforeDisconnect() CmdBeforeDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdBeforeDisconnectProcess->addArgument ( CmdBeforeDisconnectScript ); - connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); - connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); + connect ( CmdBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); + connect ( CmdBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); if ( !CmdBeforeDisconnectProcess->start ( env ) ) { @@ -22242,8 +22242,8 @@ void KVpnc::executeCommandBeforeDisconnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeDisconnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); - disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); + disconnect ( CmdBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) ); + disconnect ( CmdBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) ); delete CmdBeforeDisconnectProcess; CmdBeforeDisconnectProcess=0L; @@ -22280,8 +22280,8 @@ void KVpnc::executeCommandAfterDisconnect() CmdAfterDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell ); CmdAfterDisconnectProcess->addArgument ( CmdAfterDisconnectScript ); - connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); - connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); + connect ( CmdAfterDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); + connect ( CmdAfterDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Executing command after disconnect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug ); @@ -22303,8 +22303,8 @@ void KVpnc::executeCommandAfterDisconnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterDisconnectScript" ), GlobalConfig->debug ); } - disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); - disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); + disconnect ( CmdAfterDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) ); + disconnect ( CmdAfterDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) ); delete CmdAfterDisconnectProcess; CmdAfterDisconnectProcess=0L; } @@ -22345,10 +22345,10 @@ void KVpnc::setFirewallAfterConnect() // if ( GlobalConfig->KvpncDebugLevel > 2 ) // { -// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); -// connect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// connect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// connect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// connect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); // } @@ -22374,8 +22374,8 @@ void KVpnc::setFirewallAfterConnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "SetFirewallAfterConnectScript" ), GlobalConfig->debug ); } -// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); -// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallAfterConnect() ) ); +// disconnect ( SetFirewallAfterConnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallAfterConnect() ) ); delete SetFirewallAfterConnectProcess; SetFirewallAfterConnectProcess=0L; @@ -22416,10 +22416,10 @@ void KVpnc::setFirewallBeforeDisconnect() // if ( GlobalConfig->KvpncDebugLevel > 2 ) // { -// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); -// connect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// connect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// connect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// connect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); // } @@ -22443,8 +22443,8 @@ void KVpnc::setFirewallBeforeDisconnect() if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "setFirewallBeforeDisconnect" ), GlobalConfig->debug ); } -// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); -// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) ); +// disconnect ( SetFirewallBeforeDisconnectProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) ); delete SetFirewallBeforeDisconnectProcess; SetFirewallBeforeDisconnectProcess=0L; } @@ -22486,8 +22486,8 @@ void KVpnc::doRoutePptp() RouteProcess->addArgument ( dev ); tmpInterface = dev; - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); if ( !RouteProcess->start ( env ) ) { @@ -22504,8 +22504,8 @@ void KVpnc::doRoutePptp() sleep ( 1 ); } } - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) ); - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_pptp() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_pptp() ) ); delete RouteProcess; RouteProcess=0L; } @@ -22578,8 +22578,8 @@ bool KVpnc::setVirtualIP() SetVirtualIPProcess->addArgument(GlobalConfig->pathToIfconfig); SetVirtualIPProcess->addArgument(TQString(NetworkDevice+":100")); SetVirtualIPProcess->addArgument(GlobalConfig->currentProfile->getVirtualIP()); - connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_setVirtualIP() ) ); - connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_setVirtualIP() ) ); + connect( SetVirtualIPProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_setVirtualIP() ) ); + connect( SetVirtualIPProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_setVirtualIP() ) ); if ( !SetVirtualIPProcess->start(env) ) { @@ -22710,8 +22710,8 @@ void KVpnc::addAdditionalNetworkRoutes() RouteProcess->addArgument ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" ); tmpInterface = dev; - connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) ); - connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_route() ) ); + connect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); if ( !RouteProcess->start ( env ) ) { @@ -22733,8 +22733,8 @@ void KVpnc::addAdditionalNetworkRoutes() // parent->processEvents(); } } - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) ); - disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_route() ) ); + disconnect ( RouteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_route() ) ); delete RouteProcess; RouteProcess=0L; } @@ -22974,13 +22974,13 @@ void KVpnc::startConnectionStatusCheck() ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ) ); ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( 1 ) ); // verbosity - connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); - connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); + connect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_connectionStatusCheck() ) ); + connect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_connectionStatusCheck() ) ); if ( !ConnectionStatusCheckProcess->start ( env ) ) { - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) ); - disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_connectionStatusCheck() ) ); + disconnect ( ConnectionStatusCheckProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_connectionStatusCheck() ) ); delete ConnectionStatusCheckProcess; ConnectionStatusCheckProcess=0L; //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) ); @@ -23048,9 +23048,9 @@ void KVpnc::preserveNetworkEnvironment() proc->addArgument ( GetRouteScript ); - // connect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); - // connect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); - // connect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + // connect( proc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout() ) ); + // connect( proc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr() ) ); + // connect( proc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); if ( !proc->start ( env ) ) { @@ -23063,9 +23063,9 @@ void KVpnc::preserveNetworkEnvironment() { parent->processEvents(); } - // disconnect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); - // disconnect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); - // disconnect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + // disconnect( proc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout() ) ); + // disconnect( proc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr() ) ); + // disconnect( proc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); delete proc; proc=0L; } @@ -23137,9 +23137,9 @@ void KVpnc::restoreNetworkEnvironment() proc->addArgument ( RestoreDefaultrouteKvpncExitScript ); - // connect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); - // connect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); - //connect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + // connect( proc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout() ) ); + // connect( proc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr() ) ); + //connect( proc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); if ( !proc->start ( env ) ) { @@ -23153,9 +23153,9 @@ void KVpnc::restoreNetworkEnvironment() // parent->processEvents(); } } - // disconnect( proc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout() ) ); - // disconnect( proc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr() ) ); - //disconnect( proc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + // disconnect( proc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout() ) ); + // disconnect( proc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr() ) ); + //disconnect( proc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); delete proc; proc=0L; break; @@ -23819,7 +23819,7 @@ void KVpnc::vtun_exited() void KVpnc::openvpn_exited() { - disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) ); + disconnect ( OpenvpnProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( openvpn_exited() ) ); } void KVpnc::sshExited() @@ -23829,25 +23829,25 @@ void KVpnc::sshExited() void KVpnc::ipsecwhack_exited() { - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) ); - disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); + disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhack() ) ); delete ( IpsecWhackProcess ); } void KVpnc::IpsecWhackStatusProcessExited() { -// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackstatus() ) ); -// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackstatus() ) ); -// disconnect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) ); +// disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhackstatus() ) ); +// disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_ipsecwhackstatus() ) ); +// disconnect ( IpsecWhackStatusProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( IpsecWhackStatusProcessExited() ) ); // delete(IpsecWhackStatusProcess); // IpsecWhackStatusProcess=0; } void KVpnc::racoonctlExited() { -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) ); -// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) ); -// disconnect ( RacoonctlProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( racoonctlExited() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_racoonctl() ) ); +// disconnect( RacoonctlProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_racoonctl() ) ); +// disconnect ( RacoonctlProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( racoonctlExited() ) ); } void KVpnc::prepareL2tpd() @@ -24404,11 +24404,11 @@ void KVpnc::start_l2tpd() GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug ); } - connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_l2tpd() ) ); - connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_l2tpd() ) ); + connect ( L2tpdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_l2tpd() ) ); + connect ( L2tpdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_l2tpd() ) ); - connect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) ); - connect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) ); + connect ( this, TQ_SIGNAL ( L2tpdStdoutRecieved() ), this, TQ_SLOT ( processStdout_l2tpd() ) ); + connect ( this, TQ_SIGNAL ( L2tpdStderrRecieved() ), this, TQ_SLOT ( processStderr_l2tpd() ) ); if ( !L2tpdProcess->start ( env ) ) { @@ -24504,8 +24504,8 @@ void KVpnc::start_l2tpd() GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug ); } - connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) ); - connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) ); + connect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_openl2tp() ) ); + connect ( OpenL2tpProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_openl2tp() ) ); if ( !OpenL2tpProcess->start ( env ) ) { @@ -24596,8 +24596,8 @@ void KVpnc::checkL2tpPppUp() GlobalConfig->status = GlobalConfig->connected; - disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); - connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) ); + disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); + connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); durationTimer.start ( 1000, FALSE ); setGuiStatus ( connected ); @@ -24637,13 +24637,13 @@ bool KVpnc::checkCiscoVpncStatus() TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" ); TestCiscoVpncProcess->addArgument ( "status" ); - connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); - connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + connect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); + connect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); if ( !TestCiscoVpncProcess->start ( env ) ) { - disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); - disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; GlobalConfig->appendLogEntry ( i18n ( "unable to start proc (%1)!" ).arg ( i18n ( "Test Cisco vpnclient" ) ) , KVpncConfig::error ); @@ -24656,8 +24656,8 @@ bool KVpnc::checkCiscoVpncStatus() usleep ( 500 ); parent->processEvents(); } - disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); - disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); + disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; } @@ -24672,13 +24672,13 @@ void KVpnc::startCiscoVpnc() TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" ); TestCiscoVpncProcess->addArgument ( "start" ); -// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); -// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// connect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// connect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); if ( !TestCiscoVpncProcess->start ( env ) ) { -// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); -// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; GlobalConfig->appendLogEntry ( i18n ( "unable to start proc (%1)!" ).arg ( i18n ( "Start Cisco vpnclient" ) ) , KVpncConfig::error ); @@ -24693,8 +24693,8 @@ void KVpnc::startCiscoVpnc() usleep ( 500 ); parent->processEvents(); } -// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); -// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); +// disconnect ( TestCiscoVpncProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readCiscoVpncTestProcessOutput() ) ); delete TestCiscoVpncProcess; TestCiscoVpncProcess=0L; } @@ -24703,7 +24703,7 @@ void KVpnc::startCiscoVpnc() void KVpnc::sendFeedbackMail() { FeedbackDialog = new KFeedbackDialog ( "crissi99@gmx.de", "feedback_mail" ); - connect ( FeedbackDialog->form(), TQT_SIGNAL ( mailSent() ), this, TQT_SLOT ( feedbackMailSent() ) ); + connect ( FeedbackDialog->form(), TQ_SIGNAL ( mailSent() ), this, TQ_SLOT ( feedbackMailSent() ) ); KFeedbackQuestionList * list = FeedbackDialog->form() ->questionList(); diff --git a/src/kvpncimportprofileselectiondialog.cpp b/src/kvpncimportprofileselectiondialog.cpp index 46445b0..5fbfa4d 100644 --- a/src/kvpncimportprofileselectiondialog.cpp +++ b/src/kvpncimportprofileselectiondialog.cpp @@ -25,7 +25,7 @@ KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog() { allSelected = false; - connect (ToggleAllPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importAllToggled())); + connect (ToggleAllPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(importAllToggled())); } diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp index 89fd67d..2b1d0c4 100644 --- a/src/kvpnckicker.cpp +++ b/src/kvpnckicker.cpp @@ -35,7 +35,7 @@ KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,TQWidget* parent, const char TDEAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); KVpnc *myParent = static_cast( parent ); - connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( quitCalledKicker() ) ); + connect( quit, TQ_SIGNAL( activated() ), myParent, TQ_SLOT( quitCalledKicker() ) ); show(); } diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp index 7390d0f..be61757 100644 --- a/src/logviewerdialog.cpp +++ b/src/logviewerdialog.cpp @@ -56,8 +56,8 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true ) // InfoListView->setSorting(1); - connect (main->LineCountApplyPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(updateLineCountClicked())); - connect (main->FindPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(findLogEntryClicked())); + connect (main->LineCountApplyPushButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(updateLineCountClicked())); + connect (main->FindPushButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(findLogEntryClicked())); TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); parseLog(); diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp index 8d5a1ca..4161416 100644 --- a/src/manageciscocert.cpp +++ b/src/manageciscocert.cpp @@ -48,9 +48,9 @@ ManageCiscoCert::ManageCiscoCert(TQWidget *parent, const char* caption, KVpncCon sizeHint(); this->GlobalConfig = GlobalConfig; - connect (main->ImportCertFilePushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importCertClicked())); - connect (main->DeleteCertPushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteCertClicked())); - connect (main->CertListView,TQT_SIGNAL(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )),this,TQT_SLOT(contextMenuRequested ( TQListViewItem *, const TQPoint &, int ))); + connect (main->ImportCertFilePushButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importCertClicked())); + connect (main->DeleteCertPushButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteCertClicked())); + connect (main->CertListView,TQ_SIGNAL(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )),this,TQ_SLOT(contextMenuRequested ( TQListViewItem *, const TQPoint &, int ))); checkList(); } @@ -85,9 +85,9 @@ void ManageCiscoCert::deleteCertClicked() DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( item->text(0) ); - connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); - connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); - connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); + connect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_remove() ) ); + connect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_remove() ) ); + connect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(deleteProcessFinished())); TQStringList *env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; @@ -119,9 +119,9 @@ void ManageCiscoCert::deleteCertClicked() } checkList(); - disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); - disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); - disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); + disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_remove() ) ); + disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_remove() ) ); + disconnect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(deleteProcessFinished())); delete DeleteProcess; DeleteProcess=0L; } @@ -182,9 +182,9 @@ void ManageCiscoCert::showCertClicked() ShowProcess->addArgument ( "-ct" ); ShowProcess->addArgument ( item->text(0) ); - connect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); - connect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); - connect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); + connect ( ShowProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_display() ) ); + connect ( ShowProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_display() ) ); + connect ( ShowProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(showProcessFinished())); TQStringList *env = new TQStringList(); *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; @@ -206,9 +206,9 @@ void ManageCiscoCert::showCertClicked() GlobalConfig->appPointer->processEvents(); } } - disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); - disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); - disconnect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); + disconnect ( ShowProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_display() ) ); + disconnect ( ShowProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_display() ) ); + disconnect ( ShowProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(showProcessFinished())); } } @@ -365,7 +365,7 @@ void ManageCiscoCert::contextMenuRequested ( TQListViewItem * item, const TQPoin ContextMenu->insertItem(i18n("&Delete...")); } ContextMenu->insertItem(i18n("&Add...")); - connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); + connect ( ContextMenu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( doContextMenuAction ( int ) ) ); ContextMenu->show(); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); } diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp index b3fae36..dfe0db0 100644 --- a/src/networkinterface.cpp +++ b/src/networkinterface.cpp @@ -154,9 +154,9 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface ) retrieveInterfaceIP=true; readOutput=true; - connect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); - connect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); - connect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + connect( InterfaceIpProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceip() ) ); + connect( InterfaceIpProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceip() ) ); + connect( InterfaceIpProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); if ( !InterfaceIpProc->start(env) ) { @@ -174,9 +174,9 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface ) while ( readOutput) GlobalConfig->appPointer->processEvents();*/ } - disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); - disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); - disconnect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + disconnect( InterfaceIpProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceip() ) ); + disconnect( InterfaceIpProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceip() ) ); + disconnect( InterfaceIpProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); delete InterfaceIpProc; InterfaceIpProc=0L; } @@ -213,9 +213,9 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface ) retrieveInterfaceAddress=true; readOutput=true; - //connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); - // connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); - connect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + //connect( InterfaceAddressProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceaddress() ) ); + // connect( InterfaceAddressProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceaddress() ) ); + connect( InterfaceAddressProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); if ( !InterfaceAddressProc->start(env) ) @@ -237,9 +237,9 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface ) // GlobalConfig->appPointer->processEvents(); } - // disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); - // disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); - disconnect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); + // disconnect( InterfaceAddressProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceaddress() ) ); + // disconnect( InterfaceAddressProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceaddress() ) ); + disconnect( InterfaceAddressProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) ); //delete InterfaceAddressProc; } } @@ -409,7 +409,7 @@ TQString NetworkInterface::getExternalIpAddress() ExternalIpAddress=""; getExternalIpAddressRunning=true; http = new TQHttp(); - connect (http,TQT_SIGNAL(readyRead(const TQHttpResponseHeader &)), this, TQT_SLOT(externalIpDataRecieved(const TQHttpResponseHeader &))); + connect (http,TQ_SIGNAL(readyRead(const TQHttpResponseHeader &)), this, TQ_SLOT(externalIpDataRecieved(const TQHttpResponseHeader &))); // FIXME how it could be better? http->setHost( "checkip.dyndns.org" ); diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp index e2801ba..9c17bf8 100644 --- a/src/newprofiledialog.cpp +++ b/src/newprofiledialog.cpp @@ -53,14 +53,14 @@ NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const T setMainWidget(main); main->setMinimumSize(main->sizeHint()); - connect( main->ConnectionTypeComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( connectiontypeChanged( const TQString& ) ) ); - connect( main->AuthTypeComboBox , TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( authTypeChanged( const TQString& ) ) ); - // connect( main->buttonCancel , TQT_SIGNAL( clicked () ), this, TQT_SLOT( reject() ) ); - connect( main->ImportCertificatePushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( importCertificate() ) ); - connect( main->AdvancedSettingsPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( advancedSettingsClicked() ) ); - connect( main->ImportPcfProfilePushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( importPcfFileClicked() ) ); - connect( main->GroupPasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( groupPasswordContentChanged() ) ); - connect( main->PasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( passwordContentChanged() ) ); + connect( main->ConnectionTypeComboBox, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( connectiontypeChanged( const TQString& ) ) ); + connect( main->AuthTypeComboBox , TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( authTypeChanged( const TQString& ) ) ); + // connect( main->buttonCancel , TQ_SIGNAL( clicked () ), this, TQ_SLOT( reject() ) ); + connect( main->ImportCertificatePushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( importCertificate() ) ); + connect( main->AdvancedSettingsPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( advancedSettingsClicked() ) ); + connect( main->ImportPcfProfilePushButton , TQ_SIGNAL( clicked () ), this, TQ_SLOT( importPcfFileClicked() ) ); + connect( main->GroupPasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( groupPasswordContentChanged() ) ); + connect( main->PasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( passwordContentChanged() ) ); newProfileCreated = FALSE; Name = ""; diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp index a5e872d..343eb75 100644 --- a/src/newprofilewizard.cpp +++ b/src/newprofilewizard.cpp @@ -209,7 +209,7 @@ void NewProfileWizard::setupPages() newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage ); newprofilewizardciscomanuallypage->sizeHint(); - connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( pskToggled ( const TQString& ) ) ); + connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( pskToggled ( const TQString& ) ) ); // racoon newprofilewizardracoonpage = new TQHBox ( 0 ); @@ -277,11 +277,11 @@ void NewProfileWizard::setupPages() newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->setCurrentText("modp2048"); - connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeRacoonToggled ( const TQString& ) ) ); - connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeRacoonToggled ( const TQString& ) ) ); + connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeRacoonToggled ( const TQString& ) ) ); + connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( remoteIDTypeRacoonToggled ( const TQString& ) ) ); - connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( ikeGroupToggled ( bool ) ) ); - connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthRacoonToggled(bool))); + connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( ikeGroupToggled ( bool ) ) ); + connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthRacoonToggled(bool))); Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto(); @@ -397,16 +397,16 @@ void NewProfileWizard::setupPages() newprofilewizardfreeswanpagecontent->UseModeConfigCheckBox->hide(); newprofilewizardfreeswanpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); - connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); - connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useEspToogled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useIkeToggled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLeftNextHopToggled(bool) ) ); - connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useRightNextHopToggled(bool) ) ); - connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthFreeswanToggled(bool))); + connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useEspToogled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useIkeToggled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useLeftNextHopToggled(bool) ) ); + connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useRightNextHopToggled(bool) ) ); + connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthFreeswanToggled(bool))); - connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); - connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); + connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) ); newprofilewizardfreeswanpage->sizeHint(); @@ -426,8 +426,8 @@ void NewProfileWizard::setupPages() setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() ); newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage ); newprofilewizardopenvpnauthpage->sizeHint(); - connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); newprofilewizardopenvpnpage = new TQHBox ( 0 ); // newprofilewizardopenvpnpage->setSpacing(8); @@ -450,13 +450,13 @@ void NewProfileWizard::setupPages() newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox->setChecked ( false ); newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox->setChecked ( false ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsAuthToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsRemoteHostToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useUserdefiniedCipherToggled ( bool ) ) ); - connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useHttpProxyToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useTlsAuthToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useTlsRemoteHostToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useUserdefiniedCipherToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useHttpProxyToggeled ( bool ) ) ); TQStringList ciphers = Utils ( GlobalConfig ).getOpenvpnCiphers(); TQStringList digests = Utils ( GlobalConfig ).getOpenvpnDigests(); @@ -504,9 +504,9 @@ void NewProfileWizard::setupPages() newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap" ); newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap-v2" ); - connect( newprofilewizardpptppagecontent->DnsServerCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDnsServerToggled(bool) ) ); - connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useSearchDomainInResolvConfToggled(bool) ) ); - connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDomainInResolvConfToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->DnsServerCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useDnsServerToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useSearchDomainInResolvConfToggled(bool) ) ); + connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useDomainInResolvConfToggled(bool) ) ); // vtun newprofilewizardvtunpage = new TQHBox ( 0 ); @@ -516,7 +516,7 @@ void NewProfileWizard::setupPages() setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() ); newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage ); newprofilewizardvtunpage->sizeHint(); - connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePortToggled ( bool ) ) ); + connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( usePortToggled ( bool ) ) ); // ssh newprofilewizardsshpage = new TQHBox ( 0 ); @@ -579,7 +579,7 @@ void NewProfileWizard::setupPages() profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage ); newprofilewizardvirtualipaddresspage->sizeHint(); insertPage ( newprofilewizardvirtualipaddresspage, "" + i18n ( "Virtual IP address options" ) + "",-1 ); - connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useVirtualIpAddressToggled ( bool ) ) ); + connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useVirtualIpAddressToggled ( bool ) ) ); // psk newprofilewizardpskpage = new TQHBox ( 0 ); @@ -590,8 +590,8 @@ void NewProfileWizard::setupPages() newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage ); newprofilewizardpskpage->sizeHint(); - connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pskIsInFileToggled ( bool ) ) ); - connect ( newprofilewizardpskcontent->PSKLineEdit , TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( pskInputToggled ( const TQString& ) ) ); + connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( pskIsInFileToggled ( bool ) ) ); + connect ( newprofilewizardpskcontent->PSKLineEdit , TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( pskInputToggled ( const TQString& ) ) ); newprofilewizardp12certselectionpage = new TQHBox ( 0 ); // newprofilewizardp12certselectionpage->setSpacing(8); @@ -600,7 +600,7 @@ void NewProfileWizard::setupPages() setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() ); newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage ); newprofilewizardp12certselectionpage->sizeHint(); - connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); + connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); // cert newprofilewizardcertpage = new TQHBox ( 0 ); @@ -610,11 +610,11 @@ void NewProfileWizard::setupPages() setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() ); newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage ); newprofilewizardcertpage->sizeHint(); - connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); - connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Slots() ) ); - connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Ids() ) ); + connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSmartcardToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); + connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( detectPkcs11Slots() ) ); + connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( detectPkcs11Ids() ) ); newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->setEnabled ( false ); newprofilewizardcertcontent->Pkcs11SlotTypeLabel->setEnabled ( false ); newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->setURL ( TQString ( "/usr/local/lib/libetpkcs11.so" ) ); @@ -629,9 +629,9 @@ void NewProfileWizard::setupPages() newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage ); newprofilewizarduserpage->sizeHint(); - connect ( newprofilewizarduserpagecontent->PasswordEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( userpassToggled ( const TQString& ) ) ); - connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( usernameToggled ( const TQString& ) ) ); - connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( domainNameToggled ( bool ) ) ); + connect ( newprofilewizarduserpagecontent->PasswordEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( userpassToggled ( const TQString& ) ) ); + connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( usernameToggled ( const TQString& ) ) ); + connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( domainNameToggled ( bool ) ) ); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->setEnabled ( true ); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->hide(); newprofilewizarduserpagecontent ->NtDomainNameLineedit->hide(); @@ -663,10 +663,10 @@ void NewProfileWizard::setupPages() newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tun"); newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tap"); - connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); - connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); - connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, TQT_SIGNAL ( toggled ( bool ) ) , this, TQT_SLOT( useRemoteNetworkToggled (bool ))); - connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); + connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( mtuToggled ( bool ) ) ); + connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( mtuToggled ( bool ) ) ); + connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, TQ_SIGNAL ( toggled ( bool ) ) , this, TQ_SLOT( useRemoteNetworkToggled (bool ))); + connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, TQ_SIGNAL(activated ( const TQString & )),this, TQ_SLOT(tunnelDeviceTypeChanged(const TQString& ))); // network routes newprofilewizardnetworkroutepage = new TQHBox ( 0 ); @@ -677,7 +677,7 @@ void NewProfileWizard::setupPages() newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage ); newprofilewizardnetworkroutepage->sizeHint(); - connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(defaultRouteToggled(const TQString&))); + connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(defaultRouteToggled(const TQString&))); newprofilewizardnetworkroutecontent->DefaultRouteComboBox->setCurrentItem(1); @@ -692,8 +692,8 @@ void NewProfileWizard::setupPages() newprofilewizardnatpage->sizeHint(); newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true ); newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true ); - connect ( newprofilewizardnatcontent->UseNatCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useNatToggled ( bool ) ) ); - connect ( newprofilewizardnatcontent->UdpPortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( udpPortToggled ( bool ) ) ); + connect ( newprofilewizardnatcontent->UseNatCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useNatToggled ( bool ) ) ); + connect ( newprofilewizardnatcontent->UdpPortCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( udpPortToggled ( bool ) ) ); useNatToggled(true); // connectionstatuscheck @@ -705,8 +705,8 @@ void NewProfileWizard::setupPages() newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage ); newprofilewizardconnectionstatuscheckpage->sizeHint(); insertPage ( newprofilewizardconnectionstatuscheckpage, "" + i18n ( "Connection status check" ) + "", -1 ); - connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pingIpAfterConnectToggled ( bool ) ) ); - connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( connectionStatusCheckToggled ( bool ) ) ); + connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( pingIpAfterConnectToggled ( bool ) ) ); + connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( connectionStatusCheckToggled ( bool ) ) ); // connectoptions newprofilewizardconnectoptionspage = new TQHBox ( 0 ); @@ -1189,7 +1189,7 @@ void NewProfileWizard::next () insertPage ( newprofilewizardopenvpnauthpage, "" + i18n ( "OpenVPN authentication settings" ) + "", indexOf ( currentpage ) + 1 ); - connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); + connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); newprofilewizardopenvpnauthpagecontent->UserdefiniedDigestComboBox->setCurrentText ( "SHA1" ); diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp index 4bd552e..88af157 100644 --- a/src/openvpnmanagementhandler.cpp +++ b/src/openvpnmanagementhandler.cpp @@ -54,18 +54,18 @@ void OpenvpnManagementHandler::closeConnection() { if (socket) { - //disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); - disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); - disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); - disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); - disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); + //disconnect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) ); + disconnect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) ); + disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) ); + disconnect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) ); + disconnect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) ); socket->clearPendingData(); socket->close(); if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. - connect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); + connect( socket, TQ_SIGNAL( delayedCloseFinished() ), this, TQ_SLOT( socketClosed() ) ); } else { @@ -86,10 +86,10 @@ void OpenvpnManagementHandler::socketConnectionClosed() void OpenvpnManagementHandler::socketClosed() { socketReallyClosed = false; - disconnect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); + disconnect( socket, TQ_SIGNAL( delayedCloseFinished() ), this, TQ_SLOT( socketClosed() ) ); delete socket; greetingtimer.stop(); - disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) ); if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); socketReallyClosed = true; @@ -99,8 +99,8 @@ void OpenvpnManagementHandler::socketClosed() void OpenvpnManagementHandler::socketConnected() { - connect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); - connect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); + connect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) ); + connect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) ); // KMessageBox::error ( 0, TQString("bar"), TQString("foo") ); connectedToManagementPort=true; @@ -122,7 +122,7 @@ void OpenvpnManagementHandler::socketError( int e ) void OpenvpnManagementHandler::greetingTimedOut() { - disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) ); greetingtimer.stop(); GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error ); @@ -194,7 +194,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( line.find( "INFO:OpenVPN Management Interface", 0, FALSE ) > -1 ) { gotGreeting=true; - disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); + disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) ); greetingtimer.stop (); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -836,16 +836,16 @@ void OpenvpnManagementHandler::socketReadyRead() { if (socket) { - disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); - disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); - disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); - disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); - disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); + disconnect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) ); + disconnect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) ); + disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) ); + disconnect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) ); + disconnect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) ); socket->close(); if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. - connect( socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(socketClosed()) ); + connect( socket, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(socketClosed()) ); } else { @@ -879,9 +879,9 @@ bool OpenvpnManagementHandler::doConnect() socket = new TQSocket( this ); if (socket) { - connect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); - connect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); - connect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); + connect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) ); + connect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) ); + connect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) ); if ( socket->state() == TQSocket::Idle ) @@ -892,7 +892,7 @@ bool OpenvpnManagementHandler::doConnect() } socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort ); - connect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); + connect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) ); greetingtimer.start ( 3 * 1000, TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index 53fb08a..7a7a281 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -696,7 +696,7 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("force-natt"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("cisco-udp"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("none"); - connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQT_SIGNAL(textChanged ( const TQString &)), this, TQT_SLOT(natModeToggled( const TQString &))); + connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQ_SIGNAL(textChanged ( const TQString &)), this, TQ_SLOT(natModeToggled( const TQString &))); profileAddedOrDeleted = false; @@ -961,7 +961,7 @@ void PreferencesDialog::setupGui() lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() ); GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame ); lo->addWidget( GeneralOptionsWidget ); - connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useTDEwalletToggled(bool))); + connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useTDEwalletToggled(bool))); // const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "TQCheckBox" ); // TQObjectListIt it( *GeneralOptionsWidgetList ); @@ -969,7 +969,7 @@ void PreferencesDialog::setupGui() // for ( TQObject *child = it.current(); it; ++it) // { // // std::cout << "name: " << child->name() << std::endl; - // connect(child, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(checkboxStateChanged(int))); + // connect(child, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(checkboxStateChanged(int))); // } // Debug @@ -1024,16 +1024,16 @@ void PreferencesDialog::setupGui() // DaemonFrame->adjustSize(); - connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( OpenvpnPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( FreeswanPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->PppdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PppdPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->PptpPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PptpPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( RacoonPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->VpncPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VpncPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( L2tpdPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( Xl2tpdPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->VtundPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VtundPathChanged( const TQString& ) ) ); - connect(ConfigDaemonOptionsWidget->SshPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( SshPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( OpenvpnPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( FreeswanPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->PppdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( PppdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->PptpPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( PptpPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( RacoonPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->VpncPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( VpncPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( L2tpdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( Xl2tpdPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->VtundPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( VtundPathChanged( const TQString& ) ) ); + connect(ConfigDaemonOptionsWidget->SshPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( SshPathChanged( const TQString& ) ) ); path.clear(); path << i18n( "Programs" ) << i18n( "Helper Programs" ); @@ -1091,7 +1091,7 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileUserSelectorWidget ); lo->addWidget( ProfileUserOptionsWidget ); ProfileUserSelector->setEnabled( true ); - connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQT_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQT_SLOT( domainNameToggled(bool) )); + connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQ_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQ_SLOT( domainNameToggled(bool) )); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" ); @@ -1110,8 +1110,8 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileCertSelectorWidget ); lo->addWidget( ProfileCertOptionsWidget ); ProfileCertSelector->setEnabled( true ); - connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importCertificate())); - connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useCiscoCertStoreToggled(bool))); + connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(importCertificate())); + connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useCiscoCertStoreToggled(bool))); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" ); @@ -1131,8 +1131,8 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileSmartcardSelectorWidget ); lo->addWidget( ProfileSmartcardOptionsWidget ); ProfileSmartcardSelector->setEnabled( true ); - connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Slots())); - connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Ids())); + connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(detectPkcs11Slots())); + connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(detectPkcs11Ids())); path.clear(); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" ); @@ -1253,7 +1253,7 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileNetworkVirtualIpSelectorWidget ); lo->addWidget( ProfileNetworkVirtualIpOptionsWidget ); ProfileNetworkVirtualIpSelector->setEnabled( true ); - connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); + connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQ_SIGNAL(activated ( const TQString & )),this, TQ_SLOT(tunnelDeviceTypeChanged(const TQString& ))); path.clear(); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" ); @@ -1274,12 +1274,12 @@ void PreferencesDialog::setupGui() lo->addWidget( ProfileCiscoSelectorWidget ); lo->addWidget( ProfileCiscoOptionsWidget ); ProfileCiscoSelector->setEnabled( true ); - connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(localPortToggled(bool))); - connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); - connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); - connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); - connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(dpdToggled(bool))); + connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(localPortToggled(bool))); + connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(applicationVersionToggled(bool))); + connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool))); + connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(singleDesToggled(bool))); + connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(dpdToggled(bool))); //ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->clear(); @@ -1314,8 +1314,8 @@ void PreferencesDialog::setupGui() ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "aggressive", 1 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "base", 2 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->setCurrentItem( 0 ); // main - connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); + connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool))); //ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->clear(); @@ -1358,8 +1358,8 @@ void PreferencesDialog::setupGui() ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelector ); ProfileIpsecOptionsWidget = new ProfileIpsecOptions( ProfileIpsecOptionsFrame ); - connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); - connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthToggled(bool))); + connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool))); + connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthToggled(bool))); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "transport" ); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "tunnel" ); @@ -1596,43 +1596,43 @@ void PreferencesDialog::setupGui() // enableButtonApply(false); /* connect profile combobox of each profile widget */ - connect( ProfileGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileNetworkRouteSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileNetworkGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileNetworkNatSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileNetworkHttpProxySelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileNetworkVirtualIpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCertSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileSmartcardSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfilePskSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileUserSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileOpenvpnSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfilePptpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileRacoonSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileIpsecSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCiscoSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileVtunSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileSshSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCmdExecBeforeConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCmdExecBeforeDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCmdExecAfterConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - connect( ProfileCmdExecAfterDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); - - connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( userAuthToggled( bool ) ) ); + connect( ProfileGeneralSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkRouteSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkGeneralSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkNatSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkHttpProxySelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileNetworkVirtualIpSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCertSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileSmartcardSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfilePskSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileUserSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileOpenvpnSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfilePptpSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileRacoonSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileIpsecSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCiscoSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileVtunSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileSshSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecBeforeConnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecBeforeDisconnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecAfterConnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + connect( ProfileCmdExecAfterDisconnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) ); + + connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( userAuthToggled( bool ) ) ); -// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQT_SIGNAL (toggled(bool)), TQT_SLOT(useSpecialServerSmartcardificateToggled(bool) ) ); - connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); - connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); +// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQ_SIGNAL (toggled(bool)), TQ_SLOT(useSpecialServerSmartcardificateToggled(bool) ) ); + connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQ_SIGNAL( activated ( int ) ), this, TQ_SLOT( authTypeChanged( int ) ) ); + connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQ_SIGNAL( activated ( int ) ), this, TQ_SLOT( authTypeChanged( int ) ) ); -// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( newSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( saveSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( renameSessionClicked() ) ); - connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( deleteSessionClicked() ) ); - connect ( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( pageChanged( TQWidget * ) ) ); - connect ( this, TQT_SIGNAL( applyClicked () ), this, TQT_SLOT( saveSessionClicked() ) ); +// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQ_SIGNAL( clicked () ), this, TQ_SLOT( newSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( saveSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( renameSessionClicked() ) ); + connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( deleteSessionClicked() ) ); + connect ( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( pageChanged( TQWidget * ) ) ); + connect ( this, TQ_SIGNAL( applyClicked () ), this, TQ_SLOT( saveSessionClicked() ) ); } @@ -2593,9 +2593,9 @@ void PreferencesDialog::profileChanged( const TQString& itemtext ) ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( false ); if ( it->getConnectionType() == VpnAccountData::openvpn ) - connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); + connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( useUdpToggled( bool ) ) ); else - disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); + disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( useUdpToggled( bool ) ) ); ProfileNetworkGeneralOptionsWidget->MtuCheckbox->setChecked( it->getUseMtu() ); diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp index b8686bd..26c5baf 100644 --- a/src/profilenetworkrouteoptions.cpp +++ b/src/profilenetworkrouteoptions.cpp @@ -201,7 +201,7 @@ void ProfileNetworkRouteOptions::contextMenuRequested ( TQListViewItem * item, c ContextMenu->insertItem(i18n("&Delete...")); } ContextMenu->insertItem(i18n("&Add...")); - connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); + connect ( ContextMenu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( doContextMenuAction ( int ) ) ); ContextMenu->show(); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); } diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp index 5b3e157..2ed9380 100644 --- a/src/toolinfo.cpp +++ b/src/toolinfo.cpp @@ -110,9 +110,9 @@ bool ToolInfo::collectToolInfo() CollectToolInfoProcess = new TQProcess(this); CollectToolInfoProcess->clearArguments(); - connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); - connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); - //connect( CollectToolInfoProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); + connect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) ); + connect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) ); + //connect( CollectToolInfoProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT(processFinished() ) ); bool run=true; //FIXME how it could be better? @@ -217,15 +217,15 @@ bool ToolInfo::collectToolInfo() } //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); - // disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); - // disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); + // disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) ); + // disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) ); // delete CollectToolInfoProcess; success=true; } } - disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); - disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); + disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) ); + disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) ); delete CollectToolInfoProcess; CollectToolInfoProcess=0L; @@ -251,9 +251,9 @@ void ToolInfo::getOpenvpnCapabilities() CollectOpenvpnCapabilitiesProcess = new TQProcess(this); CollectOpenvpnCapabilitiesProcess->clearArguments(); - connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); - connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT(processFinished() ) ); //FIXME how it could be better? CollectOpenvpnCapabilitiesProcess->addArgument(PathToExec); @@ -278,13 +278,13 @@ void ToolInfo::getOpenvpnCapabilities() } //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); - // disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - // disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + // disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + // disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); // delete CollectOpenvpnCapabilitiesProcess; } - disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); - disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); + disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); + disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); //std::cout << "Name: " << Name << ", Path: " << PathToExec << ", Version: " << Version << std::endl; diff --git a/src/utils.cpp b/src/utils.cpp index a132f03..761748d 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -144,8 +144,8 @@ bool Utils::tunDevExists() bool Utils::createTunDev() { createProcess = new TQProcess( this ); - connect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); - connect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); + connect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) ); + connect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) ); // step one: create directory if ( !TQDir ( "/dev/net" ).exists() ) @@ -156,8 +156,8 @@ bool Utils::createTunDev() if ( !createProcess->start(env) ) { - disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess=0L; kdError() << "Unable to create tunnel device file!" << endl; @@ -181,8 +181,8 @@ bool Utils::createTunDev() if ( !createProcess->start(env) ) { - disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess = 0L; kdError() << "Unable to create tunnel device file!" << endl; @@ -194,8 +194,8 @@ bool Utils::createTunDev() { sleep ( 1 ); } - disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); - disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) ); + disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) ); delete createProcess; createProcess = 0L; return true; @@ -212,11 +212,11 @@ bool Utils::loadKernelModule( TQString Name, TQApplication *app ) ModprobeProcess->addArgument( "/sbin/modprobe" ); ModprobeProcess->addArgument( Name ); - connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + connect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + connect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); if ( !ModprobeProcess->start( env ) ) { - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -231,8 +231,8 @@ bool Utils::loadKernelModule( TQString Name, TQApplication *app ) config->appPointer->processEvents(); usleep(250); } - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -256,11 +256,11 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force) ModprobeProcess->addArgument( Name ); - connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + connect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + connect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); if ( !ModprobeProcess->start( env ) ) { - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -275,8 +275,8 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force) config->appPointer->processEvents(); usleep(250); } - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); - disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) ); + disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) ); delete ModprobeProcess; ModprobeProcess = 0L; return modprobeSuccess; @@ -514,13 +514,13 @@ TQStringList Utils::getOpenvpnCiphers() OpenvpnCiphersProcess->addArgument( pathToOpenvpn ); OpenvpnCiphersProcess->addArgument( "--show-ciphers" ); - connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + connect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + connect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); if ( !OpenvpnCiphersProcess->start( env ) ) { - disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); delete OpenvpnCiphersProcess; OpenvpnCiphersProcess=0L; kdError() << "Unable to fetch openvpn ciphers!" << endl; @@ -533,8 +533,8 @@ TQStringList Utils::getOpenvpnCiphers() config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); - disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); + disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); delete OpenvpnCiphersProcess; OpenvpnCiphersProcess=0L; } @@ -565,12 +565,12 @@ Utils::IpsecAlgos Utils::getIpsecAlgos() IpsecAlgosProcess->addArgument( "auto" ); IpsecAlgosProcess->addArgument( "--status" ); - connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); - connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); + connect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) ); + connect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) ); if ( !IpsecAlgosProcess->start( env ) ) { - disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); - disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) ); delete IpsecAlgosProcess; IpsecAlgosProcess=0L; kdError() << "Unable to fetch ipsec algos!" << endl; @@ -583,8 +583,8 @@ Utils::IpsecAlgos Utils::getIpsecAlgos() config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); - disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) ); + disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) ); delete IpsecAlgosProcess; IpsecAlgosProcess=0L; } @@ -743,8 +743,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); -// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); +// connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) { @@ -772,8 +772,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( "pppdHasRequireMppeSupport: false", config->debug ); } - disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); -// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); +// disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; TestPppdProcess=0L; @@ -790,8 +790,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); -// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); +// connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) { @@ -826,8 +826,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( "PppdMppeRequired: false", config->debug ); } - disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); -// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); +// disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; testPppdMppeRequired=false; @@ -858,8 +858,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->closeStdin (); - connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); - connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); + connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); if ( !TestPppdProcess->start ( env ) ) @@ -887,8 +887,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities() config->appendLogEntry ( i18n ( "Test support of replacedefaultroute pppd: %1" ).arg ( i18n ( "failed" ) ) , config->debug ); } } - disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); - disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); + disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) ); delete TestPppdProcess; TestPppdProcess=0L; @@ -912,12 +912,12 @@ TQStringList Utils::getOpenvpnDigests() OpenvpnDigestProcess->addArgument( pathToOpenvpn ); OpenvpnDigestProcess->addArgument( "--show-digests" ); - connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); - connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); + connect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + connect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) ); if ( !OpenvpnDigestProcess->start( env ) ) { - disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); - disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) ); delete OpenvpnDigestProcess; OpenvpnDigestProcess=0L; kdError() << "Unable to fetch openvpn digests!" << endl; @@ -938,8 +938,8 @@ TQStringList Utils::getOpenvpnDigests() *it = TQString(*it).section(' ',0,0); } - disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); - disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) ); + disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) ); delete OpenvpnDigestProcess; OpenvpnDigestProcess=0L; return OpenvpnDigests; @@ -1027,12 +1027,12 @@ TQString Utils::getNameAndPidOfProgramListen( int port ) NameAndPidOfProgramListenProcess->addArgument( config->pathToNetstat ); NameAndPidOfProgramListenProcess->addArgument( "-ntupl" ); - connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + connect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + connect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); if ( !NameAndPidOfProgramListenProcess->start( env ) ) { - disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); delete NameAndPidOfProgramListenProcess; NameAndPidOfProgramListenProcess=0L; kdError() << "netstat fails!" << endl; @@ -1047,8 +1047,8 @@ TQString Utils::getNameAndPidOfProgramListen( int port ) } - disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); - disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); + disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); delete NameAndPidOfProgramListenProcess; NameAndPidOfProgramListenProcess=0L; } @@ -1069,10 +1069,10 @@ TQString Utils::getEmailAddressOfCert(TQString cert) GetEmailAddressOfCertProcess->addArgument( cert ); GetEmailAddressOfCertProcess->addArgument( "-subject"); - connect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); + connect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) ); if ( !GetEmailAddressOfCertProcess->start( env ) ) { - disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); + disconnect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) ); delete GetEmailAddressOfCertProcess; GetEmailAddressOfCertProcess=0L; kdError() << "GetEmailAddressOfCertProcess" << endl; @@ -1085,7 +1085,7 @@ TQString Utils::getEmailAddressOfCert(TQString cert) config->appPointer->processEvents(); sleep ( 1 ); } - disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); + disconnect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) ); delete GetEmailAddressOfCertProcess; GetEmailAddressOfCertProcess=0L; } @@ -1117,11 +1117,11 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib) } *GetSmartcardSlotsProcess << "-L" ; - connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + connect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_SLOT(readOutGetSmartcardSlots())); if ( !GetSmartcardSlotsProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { - disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error); @@ -1137,7 +1137,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; if (config->KvpncDebugLevel > 5) @@ -1184,10 +1184,10 @@ TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQSt else GetSmartcardCertsFromSlotProcess->addArgument("0"); - connect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); + connect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) ); if ( !GetSmartcardCertsFromSlotProcess->start( env ) ) { - disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); + disconnect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) ); delete GetSmartcardCertsFromSlotProcess; GetSmartcardCertsFromSlotProcess=0L; kdError() << "Unable to fetch smartcard slots via pkcs11-tool!" << endl; @@ -1201,7 +1201,7 @@ TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQSt usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); + disconnect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) ); delete GetSmartcardCertsFromSlotProcess; GetSmartcardCertsFromSlotProcess=0L; } @@ -1240,11 +1240,11 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type) GetCertsFromCiscoCertStoreProcess->addArgument( "list"); - connect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + connect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); if ( !GetCertsFromCiscoCertStoreProcess->start( env ) ) { - disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + disconnect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); delete GetCertsFromCiscoCertStoreProcess; GetCertsFromCiscoCertStoreProcess=0L; kdError() << "Unable to fetch certificates via cisco_cert_mgr!" << endl; @@ -1259,7 +1259,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type) if ( config->appPointer->hasPendingEvents () ) config->appPointer->processEvents(); } - disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); + disconnect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); delete GetCertsFromCiscoCertStoreProcess; GetCertsFromCiscoCertStoreProcess=0L; } @@ -1280,10 +1280,10 @@ TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib) OpenvpnPkcs11IdsProcess->addArgument( ProviderLib ); - connect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + connect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); if ( !OpenvpnPkcs11IdsProcess->start( env ) ) { - disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + disconnect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); delete OpenvpnPkcs11IdsProcess; OpenvpnPkcs11IdsProcess=0L; kdError() << "Unable to fetch pkcs11 ids via openvpn!" << endl; @@ -1297,7 +1297,7 @@ TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); + disconnect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); delete OpenvpnPkcs11IdsProcess; OpenvpnPkcs11IdsProcess=0L; } @@ -1334,10 +1334,10 @@ bool Utils::getNeedsPassphrase(TQString key) NeedsPassphraseProcess->addArgument("pass:aaa"); - connect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); + connect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) ); if ( !NeedsPassphraseProcess->start( env ) ) { - disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); + disconnect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) ); delete NetworkDeviceTestProcess; NeedsPassphraseProcess=0L; kdError() << "Unable to start openssl!" << endl; @@ -1350,7 +1350,7 @@ bool Utils::getNeedsPassphrase(TQString key) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); + disconnect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) ); delete NetworkDeviceTestProcess; NeedsPassphraseProcess=0L; } @@ -1365,11 +1365,11 @@ TQString Utils::getHostname() GetHostnameProcess = new TQProcess( this ); GetHostnameProcess->addArgument( "hostname" ); - connect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); - connect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); + connect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) ); + connect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) ); if ( !GetHostnameProcess->start( env ) ) { - disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); - disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); + disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) ); + disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) ); delete GetHostnameProcess; GetHostnameProcess=0L; kdError() << "Unable to start getHostname process!" << endl; @@ -1381,8 +1381,8 @@ TQString Utils::getHostname() { usleep(200); } - disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); - disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); + disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) ); + disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) ); delete GetHostnameProcess; GetHostnameProcess=0L; return Hostname; diff --git a/src/widgetnotifyhelper.cpp b/src/widgetnotifyhelper.cpp index 602dddf..a159280 100644 --- a/src/widgetnotifyhelper.cpp +++ b/src/widgetnotifyhelper.cpp @@ -43,51 +43,51 @@ void WidgetNotifyHelper::setupChangedAction(TQWidget *w) for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed())); } list = w->queryList( "KLineEdit" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed())); } list = w->queryList( "TQLineEdit" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(textChanged (const TQString & )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(textChanged (const TQString & )),w,TQ_SIGNAL(changed())); } list = w->queryList( "KUrlRquester" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed())); } list = w->queryList( "TQSpinBox" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(valueChanged ( int )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(valueChanged ( int )),w,TQ_SIGNAL(changed())); } list = w->queryList( "TQCheckBox" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(stateChanged ( int )),w,TQ_SIGNAL(changed())); } list = w->queryList( "TQRadioButton" ); for ( obj = list->first(); obj; obj = list->next() ) { // std::cout << "obj found: " << obj->name() << std::endl; - connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); + connect(obj,TQ_SIGNAL(stateChanged ( int )),w,TQ_SIGNAL(changed())); } // connect changed to slot - connect(w,TQT_SIGNAL(changed ()),w,TQT_SLOT(dialogChanged())); + connect(w,TQ_SIGNAL(changed ()),w,TQ_SLOT(dialogChanged())); }