diff options
Diffstat (limited to 'src/kvpnc.cpp')
| -rw-r--r-- | src/kvpnc.cpp | 1016 |
1 files changed, 508 insertions, 508 deletions
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.<name> @@ -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.<id> 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(); |