summaryrefslogtreecommitdiffstats
path: root/src/kvpnc.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-06 14:15:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-06 14:15:01 -0600
commit1b89319fd93b88313cab40f1e9de24c067b04efb (patch)
tree80132996de993c3dcab4040864d7729842875b2d /src/kvpnc.cpp
parentd08a0ede1d2cb15bb14b0ff75eacf5c682b1fa0a (diff)
downloadkvpnc-1b89319fd93b88313cab40f1e9de24c067b04efb.tar.gz
kvpnc-1b89319fd93b88313cab40f1e9de24c067b04efb.zip
Initial TQt conversion
Diffstat (limited to 'src/kvpnc.cpp')
-rw-r--r--src/kvpnc.cpp4294
1 files changed, 2147 insertions, 2147 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index a743284..a4a5e19 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -27,31 +27,31 @@
#include <time.h>
#include <iomanip>
#include <stdlib.h>
-#include <qstringlist.h>
-#include <qcstring.h>
-#include <qptrlist.h>
-#include <qcolor.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qtextedit.h>
+#include <tqstringlist.h>
+#include <tqcstring.h>
+#include <tqptrlist.h>
+#include <tqcolor.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqtextedit.h>
#include "debugoutputtextedit.h"
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qtimer.h>
-#include <qdir.h>
-#include <qspinbox.h>
-#include <qdns.h>
-#include <qstringlist.h>
-#include <qcombobox.h>
-#include <qfile.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
-#include <qsocket.h>
-#include <qstatusbar.h>
-#include <qcolor.h>
-#include <qregexp.h>
-#include <qmenudata.h>
-#include <qcursor.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
+#include <tqdir.h>
+#include <tqspinbox.h>
+#include <tqdns.h>
+#include <tqstringlist.h>
+#include <tqcombobox.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
+#include <tqsocket.h>
+#include <statusbar.h>
+#include <tqcolor.h>
+#include <tqregexp.h>
+#include <tqmenudata.h>
+#include <tqcursor.h>
#include <kaboutdata.h>
@@ -111,7 +111,7 @@
//END includes
-KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
+KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
{
this->parent = parent;
setCaption ( i18n ( "KVpnc" ) );
@@ -160,7 +160,7 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow
ReplaceDefaultRouteProcess = 0;
ConnectionStatusCheckProcess = 0;
hour = min = sec = 0;
- env = new QStringList();
+ env = new TQStringList();
*env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin";
AuthRetry = false;
@@ -170,16 +170,16 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow
showProfilesOnly=false;
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
if ( !file.exists() )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "KVpnc started normal." ), GlobalConfig->debug );
- QTextStream stream ( &file );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- stream << "created at: " << QDate().currentDate().toString ( "yyyyMMdd" ) << QTime().currentTime().toString ( "hhmm" ) << "\n";
+ stream << "created at: " << TQDate().tqcurrentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
file.close();
}
else
@@ -215,28 +215,28 @@ KVpnc::KVpnc ( KApplication *parent, QWidget*, const char *name ) : KMainWindow
{
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( minimumSizeHint() );
+ // this->resize( tqminimumSizeHint() );
}
DebugconsoleAction ->setChecked ( GlobalConfig->showDebugConsole );
- GlobalConfig->LogOutput->setPaper ( QBrush ( QColor ( GlobalConfig->DebugBackgroundcolor ) ) );
+ GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) );
if ( GlobalConfig->WindowSize.width() < 50 || GlobalConfig->WindowSize.height() < 50 )
{
- GlobalConfig->WindowSize = QSize ( minimumWidth(), minimumHeight() );
+ GlobalConfig->WindowSize = TQSize ( minimumWidth(), minimumHeight() );
}
if ( GlobalConfig->WindowPos.x() < 0 || GlobalConfig->WindowPos.y() < 0 )
- GlobalConfig->WindowPos = QPoint ( 0, 0 );
+ GlobalConfig->WindowPos = TQPoint ( 0, 0 );
resize ( GlobalConfig->WindowSize );
move ( GlobalConfig->WindowPos );
- QuickConnectMenu = new QPopupMenu ( KVpncDock->menu() );
- connect ( QuickConnectMenu, SIGNAL ( activated ( int ) ), this, SLOT ( doQuickConnect ( int ) ) );
+ QuickConnectMenu = new TQPopupMenu ( KVpncDock->menu() );
+ connect ( QuickConnectMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doQuickConnect ( int ) ) );
- connect ( parent, SIGNAL ( shutDown() ), this, SLOT ( shutdownCalled() ) );
+ connect ( parent, TQT_SIGNAL ( shutDown() ), this, TQT_SLOT ( shutdownCalled() ) );
- connect ( KVpncDock, SIGNAL ( closeEventKicker ( QCloseEvent * ) ),this,SLOT ( closeEvent ( QCloseEvent * ) ) );
+ connect ( KVpncDock, TQT_SIGNAL ( closeEventKicker ( TQCloseEvent * ) ),this,TQT_SLOT ( closeEvent ( TQCloseEvent * ) ) );
for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ )
{
@@ -362,56 +362,56 @@ void KVpnc::initAction()
connectingIcon = KGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 );
setIcon ( disconnectedIcon );
- ( void* ) KStdAction::quit ( this, SLOT ( quitCalled() ), actionCollection() );
-
- SaveSessionAction = new KAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" );
- DeleteSessionAction = new KAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" );
- RenameSessionAction = new KAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" );
- // NewSessionAction = new KAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, SLOT( newSessionClicked() ), actionCollection(), "newSession" );
- //AdvancedSessionAction = new KAction( i18n( "&Advanced..." ), "wizard", Key_A, this, SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" );
- ImportSessionAction = new KAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, SLOT ( importProfileClicked() ), actionCollection(), "importSession" );
- ImportOpenvpnProfileAction = new KAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" );
- ImportFreeswanProfileAction = new KAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" );
- ImportFritzboxProfileAction = new KAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" );
- ImportCertAction = new KAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, SLOT ( importCertClicked() ), actionCollection(), "importCert" );
- ManageCiscoCertAction = new KAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" );
- CiscoCertEnrollmentAction = new KAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" );
- ExportOpenvpnProfileAction = new KAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" );
-
- ImportKvpncSettingsAction = new KAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" );
- ExportKvpncSettingsAction = new KAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" );
-
- ConnectAction = new KAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, SLOT ( slotConnecting() ), actionCollection(), "serverConnect" );
- DisconnectAction = new KAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" );
- ProfileManagerAction = new KAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" );
- NewProfileWizardAction = new KAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" );
- DonateAction = new KAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, SLOT ( donateClicked() ), actionCollection(), "donate" );
- ReportBugAction = new KAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, SLOT ( reportBugClicked() ), actionCollection(), "reportbug" );
- DebugconsoleAction = new KToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" );
- ToolsInfoAction = new KToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" );
- VpnTypesInfoAction = new KToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" );
+ ( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() );
+
+ SaveSessionAction = new KAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQT_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" );
+ DeleteSessionAction = new KAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, TQT_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" );
+ RenameSessionAction = new KAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQT_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" );
+ // NewSessionAction = new KAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQT_SLOT( newSessionClicked() ), actionCollection(), "newSession" );
+ //AdvancedSessionAction = new KAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQT_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" );
+ ImportSessionAction = new KAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQT_SLOT ( importProfileClicked() ), actionCollection(), "importSession" );
+ ImportOpenvpnProfileAction = new KAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQT_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" );
+ ImportFreeswanProfileAction = new KAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQT_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" );
+ ImportFritzboxProfileAction = new KAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQT_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" );
+ ImportCertAction = new KAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQT_SLOT ( importCertClicked() ), actionCollection(), "importCert" );
+ ManageCiscoCertAction = new KAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQT_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" );
+ CiscoCertEnrollmentAction = new KAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQT_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" );
+ ExportOpenvpnProfileAction = new KAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQT_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" );
+
+ ImportKvpncSettingsAction = new KAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQT_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" );
+ ExportKvpncSettingsAction = new KAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQT_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" );
+
+ ConnectAction = new KAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQT_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" );
+ DisconnectAction = new KAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQT_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" );
+ ProfileManagerAction = new KAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQT_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" );
+ NewProfileWizardAction = new KAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQT_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" );
+ DonateAction = new KAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQT_SLOT ( donateClicked() ), actionCollection(), "donate" );
+ ReportBugAction = new KAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQT_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" );
+ DebugconsoleAction = new KToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQT_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" );
+ ToolsInfoAction = new KToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, TQT_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" );
+ VpnTypesInfoAction = new KToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, TQT_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" );
// // tmp
-// ToolsInfoAction = new KToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, SLOT(helpClicked() ), actionCollection(), "toolsinfo" );
+// ToolsInfoAction = new KToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, TQT_SLOT(helpClicked() ), actionCollection(), "toolsinfo" );
- LogViewerAction = new KToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, SLOT ( showLogViewer() ), actionCollection(), "logviewer" );
- GenerateOpenvpnKeyAction = new KToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" );
- SendFeedbackMailAction = new KAction ( i18n ( "Send &Feedback Mail..." ), 0, this, SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" );
- PrefAction = KStdAction::preferences ( this, SLOT ( slotSettings() ), actionCollection(), "preferences" );
- KStdAction::helpContents ( this, SLOT ( helpClicked () ), actionCollection(), "help" );
- KStdAction::configureNotifications ( this, SLOT ( slotConfigNotifications() ), actionCollection() );
- KStdAction::keyBindings ( this, SLOT ( slotKeyBindings() ), actionCollection() );
+ LogViewerAction = new KToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, TQT_SLOT ( showLogViewer() ), actionCollection(), "logviewer" );
+ GenerateOpenvpnKeyAction = new KToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQT_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" );
+ SendFeedbackMailAction = new KAction ( 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() );
this->ConnectAction->setEnabled ( false );
this->DisconnectAction->setEnabled ( false );
- // ShowToolbarAction = KStdAction::showToolbar( this, SLOT( slotShowToolbar() ), actionCollection() );
+ // ShowToolbarAction = KStdAction::showToolbar( this, TQT_SLOT( slotShowToolbar() ), actionCollection() );
createStandardStatusBarAction();
- ShowStatusbarAction = KStdAction::showStatusbar ( this, SLOT ( slotShowStatusbar() ), actionCollection() );
- PreferencesAction = KStdAction::preferences ( this, SLOT ( slotSettings() ), actionCollection() );
+ ShowStatusbarAction = KStdAction::showStatusbar ( this, TQT_SLOT ( slotShowStatusbar() ), actionCollection() );
+ PreferencesAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection() );
- ( void* ) KStdAction::keyBindings ( this, SLOT ( slotKeyBindings() ), actionCollection() );
- ( void* ) KStdAction::configureToolbars ( this, SLOT ( slotConfigToolbars() ), actionCollection() );
- ( void* ) KStdAction::configureNotifications ( this, SLOT ( slotConfigNotifications() ), 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() );
createGUI();
@@ -423,20 +423,20 @@ void KVpnc::initView()
mw = new MainView ( this, "mainView" );
setCentralWidget ( mw );
- connect ( mw->buttonConnect, SIGNAL ( clicked() ), this, SLOT ( slotConnecting() ) );
- connect ( mw->buttonDisconnect, SIGNAL ( clicked() ), this, SLOT ( disconnectClicked() ) );
+ connect ( mw->buttonConnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotConnecting() ) );
+ connect ( mw->buttonDisconnect, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( disconnectClicked() ) );
- connect ( mw->SessionCombo, SIGNAL ( activated ( const QString & ) ), this, SLOT ( sessionToggled ( const QString& ) ) );
+ connect ( mw->SessionCombo, TQT_SIGNAL ( activated ( const TQString & ) ), this, TQT_SLOT ( sessionToggled ( const TQString& ) ) );
mw->SessionCombo->setEnabled ( FALSE );
- statusColorLabel = new QLabel ( this );
- disconnectedStatusPixmap = new QPixmap ( 15, 15 );
- disconnectedStatusPixmap->fill ( QColor ( Qt::red ) );
- connectedStatusPixmap = new QPixmap ( 15, 15 );
- connectedStatusPixmap->fill ( QColor ( Qt::green ) );
- connectingStatusPixmap = new QPixmap ( 15, 15 );
- connectingStatusPixmap->fill ( QColor ( Qt::yellow ) );
+ statusColorLabel = new TQLabel ( this );
+ disconnectedStatusPixmap = new TQPixmap ( 15, 15 );
+ disconnectedStatusPixmap->fill ( TQColor ( TQt::red ) );
+ connectedStatusPixmap = new TQPixmap ( 15, 15 );
+ connectedStatusPixmap->fill ( TQColor ( TQt::green ) );
+ connectingStatusPixmap = new TQPixmap ( 15, 15 );
+ connectingStatusPixmap->fill ( TQColor ( TQt::yellow ) );
statusColorLabel->setPixmap ( *disconnectedStatusPixmap );
@@ -461,7 +461,7 @@ void KVpnc::initDockWindow()
DisconnectAction->plug ( KVpncDock->menu(), 2 );
KVpncDock->menu() ->insertSeparator ( 5 );
PreferencesAction->plug ( KVpncDock->menu(), 6 );
- connect (KVpncDock, SIGNAL(tooltipRequested()), this, SLOT(showDockTooltip()));
+ connect (KVpncDock, TQT_SIGNAL(tooltipRequested()), this, TQT_SLOT(showDockTooltip()));
}
void KVpnc::slotSettings()
@@ -473,11 +473,11 @@ void KVpnc::slotSettings()
// prefDlg->setMinimumSize ( 800, 600 );
VpnAccountData *oldProfile = GlobalConfig->currentProfile;
- connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL ( clicked () ), this, SLOT ( showNewProfileWizardClicked() ) );
- connect ( this, SIGNAL(newProfileCreated(QString )), prefDlg, SLOT(slotProfileCreated(QString )));
+ connect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) );
+ connect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString )));
prefDlg->exec();
- GlobalConfig->LogOutput->setPaper ( QBrush ( QColor ( GlobalConfig->DebugBackgroundcolor ) ) );
+ GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) );
if ( prefDlg->profileAddedOrDeleted )
{
@@ -495,7 +495,7 @@ void KVpnc::slotSettings()
}
else
{
- QString Name = "";
+ TQString Name = "";
if ( GlobalConfig->currentProfile != 0 )
Name = GlobalConfig->currentProfile->getName();
if ( Name != mw->SessionCombo->currentText() )
@@ -524,13 +524,13 @@ void KVpnc::slotSettings()
if ( GlobalConfig->showDebugConsole )
{
mw->DebugOutput->show();
- //resize( minimumSizeHint() );
+ //resize( tqminimumSizeHint() );
}
else
{
mw->DebugOutput->hide();
setMinimumSize ( 0, 0 );
- this->resize ( minimumSizeHint() );
+ this->resize ( tqminimumSizeHint() );
}
if ( GlobalConfig->writeLogFile )
@@ -538,8 +538,8 @@ void KVpnc::slotSettings()
if ( !GlobalConfig->logfile.isOpen() )
{
KStandardDirs * dirs = KGlobal::dirs();
- QString logfileName = QString ( dirs->saveLocation ( "data" ) );
- QString logfilePath = QString ( logfileName + "/kvpnc/kvpnc.log" );
+ TQString logfileName = TQString ( dirs->saveLocation ( "data" ) );
+ TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" );
//KMessageBox::information( this, "info", logfileName );
GlobalConfig->logfile.setName ( logfileName );
if ( !GlobalConfig->logfile.open ( IO_WriteOnly | IO_Append ) )
@@ -549,7 +549,7 @@ void KVpnc::slotSettings()
}
else
{
- GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
}
}
}
@@ -557,8 +557,8 @@ void KVpnc::slotSettings()
{
if ( GlobalConfig->logfile.isOpen() )
{
- //QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ //TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
}
}
@@ -566,8 +566,8 @@ void KVpnc::slotSettings()
//saveGuiOptions();
saveSessionClicked();
showProfilesOnly=false;
- disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL ( clicked () ), this, SLOT ( showNewProfileWizardClicked() ) );
- disconnect ( this, SIGNAL(newProfileCreated(QString )), prefDlg, SLOT(slotProfileCreated(QString )));
+ disconnect ( prefDlg->ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( showNewProfileWizardClicked() ) );
+ disconnect ( this, TQT_SIGNAL(newProfileCreated(TQString )), prefDlg, TQT_SLOT(slotProfileCreated(TQString )));
delete prefDlg;
}
@@ -618,7 +618,7 @@ void KVpnc::slotConfigNotifications()
KNotifyDialog::configure ( this );
}
-void KVpnc::slotStatusMsg ( const QString &text, int id )
+void KVpnc::slotStatusMsg ( const TQString &text, int id )
{
if ( id != ID_FLASH_MSG )
{
@@ -637,7 +637,7 @@ void KVpnc:: quitCalled()
bool reallyQuit = false;
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "quitCalled()" ), GlobalConfig->debug );
- QString TypeString = "";
+ TQString TypeString = "";
if ( GlobalConfig->currentProfile != 0 )
{
@@ -665,8 +665,8 @@ void KVpnc:: quitCalled()
TypeString = i18n ( "other" );
}
- GlobalConfig->WindowSize = QSize ( QWidget::width(), QWidget::height() );
- GlobalConfig->WindowPos = QPoint ( this->x(), this->y() );
+ GlobalConfig->WindowSize = TQSize ( TQWidget::width(), TQWidget::height() );
+ GlobalConfig->WindowPos = TQPoint ( this->x(), this->y() );
if ( GlobalConfig->status == GlobalConfig->connected )
{
@@ -685,8 +685,8 @@ void KVpnc:: quitCalled()
{
if ( GlobalConfig->logfile.isOpen() )
{
- // QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ // TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -696,7 +696,7 @@ void KVpnc:: quitCalled()
GlobalConfig->saveOptions();
restoreNetworkEnvironment();
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
kapp->quit();
}
@@ -712,8 +712,8 @@ void KVpnc:: quitCalled()
{
if ( GlobalConfig->logfile.isOpen() )
{
- // QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ // TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -723,7 +723,7 @@ void KVpnc:: quitCalled()
GlobalConfig->saveOptions();
restoreNetworkEnvironment();
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
kapp->quit();
}
@@ -739,8 +739,8 @@ void KVpnc:: quitCalled()
{
if ( GlobalConfig->logfile.isOpen() )
{
- // QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ // TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -750,7 +750,7 @@ void KVpnc:: quitCalled()
GlobalConfig->saveOptions();
restoreNetworkEnvironment();
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
kapp->quit();
@@ -768,8 +768,8 @@ void KVpnc:: quitCalled()
{
if ( GlobalConfig->logfile.isOpen() )
{
- // QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ // TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -779,7 +779,7 @@ void KVpnc:: quitCalled()
GlobalConfig->saveOptions();
restoreNetworkEnvironment();
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
kapp->quit();
}
@@ -800,12 +800,12 @@ void KVpnc::shutdownCalled()
GlobalConfig->appendLogEntry ( i18n ( "shutdown called!" ), GlobalConfig->debug );
}
-void KVpnc::closeEvent ( QCloseEvent *e )
+void KVpnc::closeEvent ( TQCloseEvent *e )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).arg ( "kvpnc" ), GlobalConfig->debug );
- QString TypeString = "";
+ TQString TypeString = "";
if ( GlobalConfig->currentProfile != 0 )
{
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
@@ -851,7 +851,7 @@ void KVpnc::closeEvent ( QCloseEvent *e )
if ( !GlobalConfig->useSilentQuit )
{
res = KMessageBox::questionYesNo ( this, i18n ( "You are still connected to \"%1\" (%2) Do you really want to quit?" ).arg ( GlobalConfig->currentProfile->getName() ).arg ( TypeString ), i18n ( "Quit?" ), KStdGuiItem::quit(), KStdGuiItem::cancel() );
- //KMessageBox::error( this,QString().setNum(res) );
+ //KMessageBox::error( this,TQString().setNum(res) );
if ( res != 4 )
{
reallyQuit = true;
@@ -867,14 +867,14 @@ void KVpnc::closeEvent ( QCloseEvent *e )
{
if ( GlobalConfig->logfile.isOpen() )
{
- // QTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ // TQTextStream s( &logfile );
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
}
}
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
KMainWindow::closeEvent ( e );
@@ -912,13 +912,13 @@ void KVpnc::closeEvent ( QCloseEvent *e )
//KMainWindow::closeEvent( e );
disconnectClicked();
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "kvpnc_running" );
+ TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
if ( GlobalConfig->writeLogFile )
{
if ( GlobalConfig->logfile.isOpen() )
{
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << QDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -1000,7 +1000,7 @@ void KVpnc::restore()
void KVpnc::saveProperties ( KConfig* c )
{
- QString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + qApp->sessionId() + "/", true );
+ TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
c = new KSimpleConfig ( saveDir + "list", false );
c->setGroup ( "Saved Session" );
@@ -1010,7 +1010,7 @@ void KVpnc::saveProperties ( KConfig* c )
void KVpnc::readProperties ( KConfig* c )
{
- QString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + qApp->sessionId() + "/", true );
+ TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
c = new KSimpleConfig ( saveDir + "list", true );
c->setGroup ( "Saved Session" );
delete c;
@@ -1027,7 +1027,7 @@ void KVpnc::connectClicked()
stopContinue = false;
ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ;
- QString TypeString = i18n ( "unknown" );
+ TQString TypeString = i18n ( "unknown" );
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
TypeString = i18n ( "Cisco" );
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
@@ -1075,7 +1075,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ) );
GlobalConfig->appendLogEntry ( i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -1095,7 +1095,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
{
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
// looking for vpnc
if ( Utils ( GlobalConfig ).getToolInfo ( "vpnc" )->found == false )
@@ -1103,7 +1103,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -1354,7 +1354,7 @@ void KVpnc::connectClicked()
AuthRetry = false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
}
@@ -1375,8 +1375,8 @@ void KVpnc::connectClicked()
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig , parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" )
{
@@ -1418,19 +1418,19 @@ void KVpnc::connectClicked()
LocalIP = "127.0.0.1"; // no IP for default interface found :(
}
- // QString tunneldevice = "tun0";
+ // TQString tunneldevice = "tun0";
OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
-// QFile DefaultRouteBackupFile(OldDefaultroute + ".sh");
-// QTextStream DefaultRouteBackupFileStream(&DefaultRouteBackupFile);
-// if (DefaultRouteBackupFile.open(QIODevice::WriteOnly)) {
+// TQFile DefaultRouteBackupFile(OldDefaultroute + ".sh");
+// TQTextStream DefaultRouteBackupFileStream(&DefaultRouteBackupFile);
+// if (DefaultRouteBackupFile.open(TQIODevice::WriteOnly)) {
// DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n";
// DefaultRouteBackupFileStream << "\n";
// DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n";
// DefaultRouteBackupFile.close();
-// QProcess backupDefaultRouteProcess(this);
-// QString proc = GlobalConfig->InterpreterShell;
-// QStringList args;
+// TQProcess backupDefaultRouteProcess(this);
+// TQString proc = GlobalConfig->InterpreterShell;
+// TQStringList args;
// backupDefaultRouteProcess.setEnvironment(*env);
// args.append(OldDefaultroute + ".sh");
// backupDefaultRouteProcess.setEnvironment(*env);
@@ -1460,8 +1460,8 @@ void KVpnc::connectClicked()
VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script.<name>
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "VpncScript: " + VpncScript + "\n", GlobalConfig->debug );
- QFile file ( VpncScript );
- QTextStream stream ( &file );
+ TQFile file ( VpncScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -1560,7 +1560,7 @@ void KVpnc::connectClicked()
stream << "\n";
stream << "do_ifconfig() {\n";
if ( GlobalConfig->currentProfile->getUseMtu() )
- stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu " + QString().setNum ( GlobalConfig->currentProfile->getMtu() ) + " up\n";
+ stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu " + TQString().setNum ( GlobalConfig->currentProfile->getMtu() ) + " up\n";
else
stream << GlobalConfig->pathToIfconfig + " \"$TUNDEV\" inet \"$INTERNAL_IP4_ADDRESS\" $ifconfig_syntax_ptp \"$INTERNAL_IP4_ADDRESS\" netmask 255.255.255.255 mtu 1390 up\n";
stream << "}\n";
@@ -1904,8 +1904,8 @@ void KVpnc::connectClicked()
}
else
{
- GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( QString ( "VpncScript" ) ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( TQString ( "VpncScript" ) ), GlobalConfig->error );
+ setGuitqStatus ( disconnected );
timer.stop();
return ;
}
@@ -1919,7 +1919,7 @@ void KVpnc::connectClicked()
//if ( !NetworkInterface ( GlobalConfig, parent, this ).interfaceExist ( "tun0" ) ) //FIXME make it dynamiclly (tun+)
{
- QFile tundevfile ( "/dev/net/tun" );
+ TQFile tundevfile ( "/dev/net/tun" );
if ( !tundevfile.exists() )
{
if ( !Utils ( GlobalConfig, parent ).createTunDev() )
@@ -1927,7 +1927,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -1943,15 +1943,15 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Checking tun support" ), GlobalConfig->debug );
bool tunsupportfound = false;
- QString procmisc = "";
- QFile f ( "/proc/misc" );
+ TQString procmisc = "";
+ TQFile f ( "/proc/misc" );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream procmiscstream ( &f );
- QString procmiscontent = QString(procmiscstream.read());
- QStringList procmisc_content_list = QStringList::split("\n", procmiscontent);
- QString line = "";
- for ( QStringList::Iterator it = procmisc_content_list.begin(); it != procmisc_content_list.end(); ++it )
+ TQTextStream procmiscstream ( &f );
+ TQString procmiscontent = TQString(procmiscstream.read());
+ TQStringList procmisc_content_list = TQStringList::split("\n", procmiscontent);
+ TQString line = "";
+ for ( TQStringList::Iterator it = procmisc_content_list.begin(); it != procmisc_content_list.end(); ++it )
{
line = *it; // line of text excluding '\n'
if ( line.contains ( "tun", false ) )
@@ -1974,7 +1974,7 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -1988,10 +1988,10 @@ void KVpnc::connectClicked()
- QString vpncConfig = "";
+ TQString vpncConfig = "";
vpncConfig += "IPSec gateway " + GlobalConfig->TmpGatewayIP + "\n";
vpncConfig += "IPSec ID " + GlobalConfig->currentProfile->getID() + "\n";
- QString GrpPassStr = "";
+ TQString GrpPassStr = "";
if ( !GlobalConfig->currentProfile->getSavePsk() || AuthRetry )
GrpPassStr = GlobalConfig->TmpGroupPassword;
else
@@ -2012,25 +2012,25 @@ void KVpnc::connectClicked()
}
else if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::hybrid )
{
- vpncConfig += QString("IKE Authmode")+ " " + "hybrid" + "\n";
+ vpncConfig += TQString("IKE Authmode")+ " " + "hybrid" + "\n";
if ( !GlobalConfig->currentProfile->getCaCertificate().isEmpty() )
{
- vpncConfig += QString( "CA-File " + GlobalConfig->currentProfile->getCaCertificate() + "\n");
+ vpncConfig += TQString( "CA-File " + GlobalConfig->currentProfile->getCaCertificate() + "\n");
}
if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() )
{
- vpncConfig += QString("CA-Dir " + GlobalConfig->currentProfile->getCertPath() + "\n");
+ vpncConfig += TQString("CA-Dir " + GlobalConfig->currentProfile->getCertPath() + "\n");
}
}
if ( GlobalConfig->KvpncDebugLevel > 3 )
{
- QStringList vpncConfigLineList = QStringList::split ( '\n', vpncConfig );
+ TQStringList vpncConfigLineList = TQStringList::split ( '\n', vpncConfig );
//GlobalConfig->appendLogEntry ( i18n ( "start\n" ), GlobalConfig->debug );
- for ( QStringList::Iterator it = vpncConfigLineList.begin(); it != vpncConfigLineList.end(); ++it )
+ for ( TQStringList::Iterator it = vpncConfigLineList.begin(); it != vpncConfigLineList.end(); ++it )
{
- QString configstring = *it;
+ TQString configstring = *it;
if ( configstring.find ( "Xauth password",0 ) > -1 )
configstring = "Xauth password ******";
if ( configstring.find ( "IPSec secret",0 ) > -1 )
@@ -2041,14 +2041,14 @@ void KVpnc::connectClicked()
}
}
- QString VpncConfigFile = tmpPath + "vpnc-config." + GlobalConfig->currentProfile->getName(); // vpnc-config.<name>
+ TQString VpncConfigFile = tmpPath + "vpnc-config." + GlobalConfig->currentProfile->getName(); // vpnc-config.<name>
if ( vpnc_version_major <= 0 && vpnc_version_minor <= 3 && vpnc_version_subminor <= 2 )
{
// write vpnc connect script
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "VpncConfig: " + VpncConfigFile + "\n", GlobalConfig->debug );
- QFile configfile ( VpncConfigFile );
- QTextStream configstream ( &configfile );
+ TQFile configfile ( VpncConfigFile );
+ TQTextStream configstream ( &configfile );
if ( configfile.open ( IO_WriteOnly ) )
{
configstream << vpncConfig << "\n";
@@ -2059,16 +2059,16 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ) );
GlobalConfig->appendLogEntry ( i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
}
- VpncProcess = new QProcess ( this );
- VpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
- connect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) );
+ VpncProcess = new TQProcess ( this );
+ VpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
+ connect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) );
VpncProcess->addArgument ( GlobalConfig->pathToVpnc );
@@ -2088,7 +2088,7 @@ void KVpnc::connectClicked()
{
VpncProcess->addArgument ( "--debug" );
- VpncProcess->addArgument ( QString().setNum ( GlobalConfig->VpncDebugLevel ) );
+ VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->VpncDebugLevel ) );
}
VpncProcess->addArgument ( "--pid-file" );
VpncProcess->addArgument ( GlobalConfig->Vpnc_pid_file );
@@ -2157,16 +2157,16 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseLocalPort() == true )
{
VpncProcess->addArgument ( "--local-port" );
- VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) );
+ VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) );
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Using userdefined local port \"%1\"." ).arg ( QString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Using userdefined local port \"%1\"." ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getLocalPort() ) ), GlobalConfig->debug );
}
if ( GlobalConfig->currentProfile->getUseUdpPort() )
{
VpncProcess->addArgument ( "--udp-port" );
- VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getUdpPort() ) );
+ VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getUdpPort() ) );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Using userdefined UDP port \"%1\"." ).arg ( GlobalConfig->currentProfile->getUdpPort() ), GlobalConfig->debug );
}
@@ -2247,7 +2247,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseDpdIdleTimeout() )
{
VpncProcess->addArgument ( "--dpd-idle" );
- VpncProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getDpdIdleTimeout() ) );
+ VpncProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getDpdIdleTimeout() ) );
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Using DPD idle timeout: %1." ).arg ( GlobalConfig->currentProfile->getDpdIdleTimeout() ), GlobalConfig->debug );
}
@@ -2309,12 +2309,12 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
{
- QString args = "";
- QStringList list = VpncProcess->arguments();
- QStringList::Iterator it = list.begin();
+ TQString args = "";
+ TQStringList list = VpncProcess->arguments();
+ TQStringList::Iterator it = list.begin();
while ( it != list.end() )
{
- args += QString ( " " + *it ) ;
+ args += TQString ( " " + *it ) ;
++it;
}
GlobalConfig->appendLogEntry ( i18n ( "vpnc arguments: %1" ).arg ( args ), GlobalConfig->debug );
@@ -2324,7 +2324,7 @@ void KVpnc::connectClicked()
KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -2338,8 +2338,8 @@ void KVpnc::connectClicked()
mw->buttonConnect->setEnabled ( false );
this->ConnectAction->setEnabled ( false );
- connect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) );
- connect ( VpncProcess, SIGNAL ( wroteToStdin() ), this, SLOT ( wroteToStdin_vpncConfig() ) );
+ connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) );
+ connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) );
if ( vpnc_version_major >= 0 && vpnc_version_minor > 2 )
{
@@ -2358,8 +2358,8 @@ void KVpnc::connectClicked()
}
}
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
- connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
+ connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE );
}
}
@@ -2368,7 +2368,7 @@ void KVpnc::connectClicked()
{
VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script.<name>
GlobalConfig->appendLogEntry ( i18n ( "Making %1 (%2) excutable failed!" ).arg ( "VpncScript" ).arg ( VpncScript ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
timer.stop();
return ;
}
@@ -2383,7 +2383,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -2391,10 +2391,10 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "vpnclient: %1" ) .arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->debug );
- if ( checkCiscoVpncStatus() == false )
+ if ( checkCiscoVpnctqStatus() == false )
{
startCiscoVpnc();
- if ( checkCiscoVpncStatus() == false )
+ if ( checkCiscoVpnctqStatus() == false )
{
KMessageBox::error ( this, i18n ( "The Cisco ipsec interface could not setup!" ) );
GlobalConfig->appendLogEntry ( i18n ( "The Cisco ipsec interface could not setup!" ), GlobalConfig->error );
@@ -2602,7 +2602,7 @@ void KVpnc::connectClicked()
AuthRetry = false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
GlobalConfig->TmpPassword= GlobalConfig->currentProfile->getUserPassword();
@@ -2616,8 +2616,8 @@ void KVpnc::connectClicked()
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig , parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" )
{
@@ -2659,18 +2659,18 @@ void KVpnc::connectClicked()
LocalIP = "127.0.0.1"; // no IP for default interface found :(
}
- // QString tunneldevice = "tun0";
+ // TQString tunneldevice = "tun0";
OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
- QFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" );
- QTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile );
+ TQFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" );
+ TQTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile );
if ( DefaultRouteBackupFile.open ( IO_WriteOnly ) )
{
DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n";
DefaultRouteBackupFileStream << "\n";
DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n";
DefaultRouteBackupFile.close();
- QProcess backupDefaultRouteProcess ( this );
+ TQProcess backupDefaultRouteProcess ( this );
backupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell );
backupDefaultRouteProcess.addArgument ( OldDefaultroute + ".sh" );
if ( !backupDefaultRouteProcess.start() )
@@ -2692,27 +2692,27 @@ void KVpnc::connectClicked()
return ;
}
- QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
+ TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Backup file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug );
- QString UserPassStr = "";
+ TQString UserPassStr = "";
if ( !GlobalConfig->currentProfile->getUserPassword() || GlobalConfig->currentProfile->getUserPassword() == "" || AuthRetry )
UserPassStr = GlobalConfig->TmpPassword;
else
UserPassStr = GlobalConfig->currentProfile->getUserPassword();
- CiscoVpncProcess = new QProcess ( this );
- CiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
- connect ( CiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_ciscovpnc() ) );
+ CiscoVpncProcess = new TQProcess ( this );
+ CiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
+ connect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) );
// write vpnc connect script
- QString CiscoVpncConfig = QString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +QString ( "kvpnc_" ) +QString ( GlobalConfig->currentProfile->getName() +".pcf" ); // vpnc-script.<name>
+ TQString CiscoVpncConfig = TQString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +TQString ( "kvpnc_" ) +TQString ( GlobalConfig->currentProfile->getName() +".pcf" ); // vpnc-script.<name>
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "CiscoVpncConfig: " + CiscoVpncConfig + "\n", GlobalConfig->debug );
- QFile file ( CiscoVpncConfig );
- QTextStream stream ( &file );
+ TQFile file ( CiscoVpncConfig );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
// stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -2836,7 +2836,7 @@ void KVpnc::connectClicked()
KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -2850,26 +2850,26 @@ void KVpnc::connectClicked()
mw->buttonConnect->setEnabled ( false );
this->ConnectAction->setEnabled ( false );
-// connect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) );
-// connect ( VpncProcess, SIGNAL ( wroteToStdin() ), this, SLOT ( wroteToStdin_vpncConfig() ) );
+// connect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) );
+// connect ( VpncProcess, TQT_SIGNAL ( wroteToStdin() ), this, TQT_SLOT ( wroteToStdin_vpncConfig() ) );
}
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
- connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
+ connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE );
}
else
{
// file could not written
GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because profile file could not be written." ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
else
{
// ok is false
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -2881,7 +2881,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "racoon" ), GlobalConfig->debug );
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
// looking for racoon
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon )
{
@@ -2890,7 +2890,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -2902,7 +2902,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -2910,24 +2910,24 @@ void KVpnc::connectClicked()
// looking for setkey
if ( GlobalConfig->useDefaultPaths )
{
- GlobalConfig->pathToSetkey = KStandardDirs::findExe ( "setkey", QString::null );
+ GlobalConfig->pathToSetkey = KStandardDirs::findExe ( "setkey", TQString() );
}
else if ( GlobalConfig->pathToSetkey.isEmpty() || KStandardDirs::findExe ( GlobalConfig->pathToSetkey.section ( '/', -1, -1 ), GlobalConfig->pathToSetkey.section ( '/', 0, -2 ) ).isEmpty() )
{
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
- QString resolvedIp = Utils ( GlobalConfig, parent ).resolveName ( GlobalConfig->currentProfile->getGateway() );
+ TQString resolvedIp = Utils ( GlobalConfig, parent ).resolveName ( GlobalConfig->currentProfile->getGateway() );
if ( resolvedIp == "0.0.0.0" || resolvedIp.isEmpty() )
{
KMessageBox::error ( this, i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ) );
GlobalConfig->appendLogEntry ( i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->error ) ;
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
else
@@ -2938,7 +2938,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->authtype == VpnAccountData::cert )
{
- QFile CertTmpFile;
+ TQFile CertTmpFile;
CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() );
if ( !CertTmpFile.exists() )
{
@@ -2996,10 +2996,10 @@ void KVpnc::connectClicked()
GlobalConfig->TmpGroupPassword = GlobalConfig->currentProfile->getPreSharedKey();
else
{
- QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( PskFile.open ( IO_ReadOnly ) )
{
- QString PskFileContent = QString ( PskFile.readAll() );
+ TQString PskFileContent = TQString ( PskFile.readAll() );
PskFile.close();
GlobalConfig->TmpGroupPassword = PskFileContent;
}
@@ -3140,11 +3140,11 @@ void KVpnc::connectClicked()
}
if ( GlobalConfig->currentProfile->getPskIsInFile() )
{
- QFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &f );
- QString line = "";
+ TQTextStream stream ( &f );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -3173,8 +3173,8 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() )
executeCommandBeforeConnect();
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig, parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" || GlobalConfig->currentProfile->getNetworkDevice() == "" )
{
@@ -3217,9 +3217,9 @@ void KVpnc::connectClicked()
// FIXME
// if not virtual ip, its same as LocalIP
- QString VirtualLocalIP=LocalIP;
+ TQString VirtualLocalIP=LocalIP;
// if not virtual ip, its 32 (only one host)
- QString VirtualLocalNetmask="32";
+ TQString VirtualLocalNetmask="32";
if ( GlobalConfig->currentProfile->getUseLeftSourceIp() )
{
@@ -3234,33 +3234,33 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "Local netmask (virtual): %1" ).arg ( VirtualLocalNetmask ), GlobalConfig->debug );
}
- QString Gateway = GlobalConfig->currentProfile->getGateway();
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString Gateway = GlobalConfig->currentProfile->getGateway();
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
tmpPath = locateLocal ( "data", "kvpnc/" ); // should be
// KTempDir tmpdir;
// tmpPath = tmpdir.name();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "tmppath: " + tmpPath, GlobalConfig->debug );
- QString ProfileName = GlobalConfig->currentProfile->getName();
- QString CertPath = GlobalConfig->currentProfile->getCertPath();
+ TQString ProfileName = GlobalConfig->currentProfile->getName();
+ TQString CertPath = GlobalConfig->currentProfile->getCertPath();
// write setkey.conf
- QFile file ( tmpPath + "setkey." + ProfileName + ".conf" );
- QTextStream stream ( &file );
+ TQFile file ( tmpPath + "setkey." + ProfileName + ".conf" );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- QString PolicyRemote = "";
- QString PolicyLocal = "";
+ TQString PolicyRemote = "";
+ TQString PolicyLocal = "";
- QString Remote = GlobalConfig->currentProfile->getGateway();
+ TQString Remote = GlobalConfig->currentProfile->getGateway();
//FIXME make it dynamiclly
- QString LocalPort = "4500";
- QString RemotePort = "4500";
+ TQString LocalPort = "4500";
+ TQString RemotePort = "4500";
if ( !GlobalConfig->currentProfile->getUseNat() )
{
@@ -3312,11 +3312,11 @@ void KVpnc::connectClicked()
// additional network routes
if ( !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() )
{
- QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
+ TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
- for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
+ for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
{
- QString net = ( *it ).section ( '#', 0, 0 );
+ TQString net = ( *it ).section ( '#', 0, 0 );
// stream << "spdadd " + LocalIP + " " + net + " any -P out ipsec esp/tunnel/" + PolicyLocal + "-" + PolicyRemote + "/require;" << "\n";
// stream << "spdadd " + net + " " + LocalIP + " any -P in ipsec esp/tunnel/" + PolicyRemote + "-" + PolicyLocal + "/require;" << "\n";
stream << "spdadd " + LocalIP + " " + net + " any -P out ipsec esp/tunnel/" + LocalIP + "-" + GlobalConfig->TmpGatewayIP + "/require;" << "\n";
@@ -3396,7 +3396,7 @@ void KVpnc::connectClicked()
// {
// if ( GlobalConfig->currentProfile->getUseMailAddressAsIdentifier() )
// {
-// QString MailAddressOfUserCert = Utils ( GlobalConfig ).getEmailAddressOfCert ( GlobalConfig->currentProfile->getX509Certificate() );
+// TQString MailAddressOfUserCert = Utils ( GlobalConfig ).getEmailAddressOfCert ( GlobalConfig->currentProfile->getX509Certificate() );
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry ( i18n ( "Using mail address as VPN id: %1." ).arg ( MailAddressOfUserCert ), GlobalConfig->debug );
@@ -3459,14 +3459,14 @@ void KVpnc::connectClicked()
/*
none: No ID
address: The type is the IP address. This is the default type if you do not specify an identifier to use
- user_fqdn: The type is a USER_FQDN (user fully-qualified domain name)
- fqdn: The type is a FQDN (fully-qualified domain name)
+ user_fqdn: The type is a USER_FTQDN (user fully-qualified domain name)
+ fqdn: The type is a FTQDN (fully-qualified domain name)
keyid (file): The type is a KEY_ID, read from the file
keyid: The type is a KEY_ID, specified in the quoted string
asn1dn: The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used
*/
- QString RemoteIDType = GlobalConfig->currentProfile->getRemoteIDType();
+ TQString RemoteIDType = GlobalConfig->currentProfile->getRemoteIDType();
if ( RemoteIDType == "none" )
{
@@ -3500,7 +3500,7 @@ void KVpnc::connectClicked()
stream << " peers_identifier asn1dn;" << "\n";
}
- QString LocalIDType = GlobalConfig->currentProfile->getLocalIDType();
+ TQString LocalIDType = GlobalConfig->currentProfile->getLocalIDType();
if ( LocalIDType == "none" )
{
// no ID
@@ -3573,7 +3573,7 @@ void KVpnc::connectClicked()
modp6144 17
modp8192 18
*/
- QString DhGroupNumber = "2";
+ TQString DhGroupNumber = "2";
if (GlobalConfig->currentProfile->getIkeGroup() == "modp768")
DhGroupNumber = "1";
else if (GlobalConfig->currentProfile->getIkeGroup() == "modp1024")
@@ -3598,9 +3598,9 @@ void KVpnc::connectClicked()
stream << "}" << "\n";
stream << "" << "\n";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon && GlobalConfig->currentProfile->getAuthType() == VpnAccountData::hybrid ) )
@@ -3619,7 +3619,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUsePerfectForwardSecrety() )
{
- QString pfs_group = "";
+ TQString pfs_group = "";
// if ( GlobalConfig->currentProfile->getPerfectForwardSecrety() == "server" )
// pfs_group = "";
// else if ( GlobalConfig->currentProfile->getPerfectForwardSecrety() == "nopfs" )
@@ -3633,7 +3633,7 @@ void KVpnc::connectClicked()
pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety();
- QString PFSGroupNumber = "2";
+ TQString PFSGroupNumber = "2";
if (pfs_group== "modp768")
PFSGroupNumber = "1";
else if (pfs_group== "modp1024")
@@ -3668,22 +3668,22 @@ void KVpnc::connectClicked()
// Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto();
// // phase 2 encr algos from kernel
-// QString EncrAlgos="";
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
+// TQString EncrAlgos="";
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
// {
// if (EncrAlgos.length() > 0)
// EncrAlgos+=",";
-// EncrAlgos+= QString(*it );
+// EncrAlgos+= TQString(*it );
// }
//
//
// // phase 2 auth algos from kernel
-// QString AuthAlgos="";
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
+// TQString AuthAlgos="";
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
// {
// if (AuthAlgos.length() > 0)
// AuthAlgos+=",";
-// AuthAlgos+= QString(*it );
+// AuthAlgos+= TQString(*it );
// }
//
//
@@ -3732,7 +3732,7 @@ void KVpnc::connectClicked()
// iptables need the right interface (eth0:1 => eth0)
- QString tmpInterface2 = "";
+ TQString tmpInterface2 = "";
int pointPos = tmpInterface.find ( ':', 0, FALSE );
if ( pointPos > 1 )
{
@@ -3786,14 +3786,14 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file.name() ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
stream.unsetDevice();
- QFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" );
- QTextStream stream1 ( &file1 );
+ TQFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" );
+ TQTextStream stream1 ( &file1 );
if ( file1.open ( IO_WriteOnly ) )
{
stream1 << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -3835,13 +3835,13 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file1.name() ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
- QFile upfile ( tmpPath+"racoon-"+ProfileName+".phase1-up.sh" );
- QTextStream upstream ( &upfile );
+ TQFile upfile ( tmpPath+"racoon-"+ProfileName+".phase1-up.sh" );
+ TQTextStream upstream ( &upfile );
if ( upfile.open ( IO_WriteOnly ) )
{
upstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -3942,13 +3942,13 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( upfile.name() ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
- QFile downfile ( tmpPath+"racoon-"+ProfileName+".phase1-down.sh" );
- QTextStream downstream ( &downfile );
+ TQFile downfile ( tmpPath+"racoon-"+ProfileName+".phase1-down.sh" );
+ TQTextStream downstream ( &downfile );
if ( downfile.open ( IO_WriteOnly ) )
{
downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -3995,7 +3995,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( downfile.name() ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
@@ -4031,7 +4031,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// return;
// }
//
@@ -4050,26 +4050,26 @@ void KVpnc::connectClicked()
OpenL2tpProcess=0L;
L2tpdProcess=0L;
- RacoonHelperProcess = new QProcess ( this );
+ RacoonHelperProcess = new TQProcess ( this );
//
RacoonHelperProcess->addArgument ( GlobalConfig->InterpreterShell );
RacoonHelperProcess->addArgument ( tmpPath + "/setkey." + GlobalConfig->currentProfile->getName() + ".sh" );
- connect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) );
- connect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) );
- connect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( doRacoon() ) );
+ 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() ) );
if ( !RacoonHelperProcess->start ( env ) )
{
- disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) );
- disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) );
- disconnect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
delete RacoonHelperProcess;
RacoonHelperProcess =0L;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey" ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "setkey." + GlobalConfig->currentProfile->getName() + ".sh" ) );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -4102,11 +4102,11 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentConnectRetry > GlobalConfig->maxConnectRetry )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry ( i18n ( "Max connect retries (%1) reached, stopping." ).arg ( QString().setNum ( GlobalConfig->maxConnectRetry ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Max connect retries (%1) reached, stopping." ).arg ( TQString().setNum ( GlobalConfig->maxConnectRetry ) ), GlobalConfig->debug );
return;
}
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
// looking for ipsec
@@ -4115,7 +4115,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
@@ -4125,7 +4125,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -4147,7 +4147,7 @@ void KVpnc::connectClicked()
{
if ( !GlobalConfig->currentProfile->getUseSmartcard() )
{
- QFile CertTmpFile;
+ TQFile CertTmpFile;
CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() );
if ( !CertTmpFile.exists() )
{
@@ -4157,7 +4157,7 @@ void KVpnc::connectClicked()
}
}
- QFile CertTmpFile;
+ TQFile CertTmpFile;
CertTmpFile.setName ( GlobalConfig->currentProfile->getCaCertificate() );
if ( !CertTmpFile.exists() )
{
@@ -4169,15 +4169,15 @@ void KVpnc::connectClicked()
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "esp4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "esp4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "esp4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "esp4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "esp4" ), GlobalConfig->error );
// ok = false;
// }
//
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "ah4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "ah4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "ah4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "ah4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "ah4" ), GlobalConfig->error );
// ok = false;
// }
@@ -4209,10 +4209,10 @@ void KVpnc::connectClicked()
GlobalConfig->TmpGroupPassword = GlobalConfig->currentProfile->getPreSharedKey();
else
{
- QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( PskFile.open ( IO_ReadOnly ) )
{
- QString PskFileContent = QString ( PskFile.readAll() );
+ TQString PskFileContent = TQString ( PskFile.readAll() );
PskFile.close();
GlobalConfig->TmpGroupPassword = PskFileContent;
}
@@ -4356,10 +4356,10 @@ void KVpnc::connectClicked()
}
else
{
- QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( PskFile.open ( IO_WriteOnly ) )
{
- QTextStream stream;
+ TQTextStream stream;
stream.setDevice ( &PskFile );
stream << GlobalConfig->TmpGroupPassword;
PskFile.close();
@@ -4403,11 +4403,11 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getPskIsInFile() )
{
- QFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile f ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &f );
- QString line = "";
+ TQTextStream stream ( &f );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -4431,14 +4431,14 @@ void KVpnc::connectClicked()
}
}
- QString leftid = "";
- QString rightid = "";
+ TQString leftid = "";
+ TQString rightid = "";
if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert && GlobalConfig->currentProfile->getUseSmartcard() )
{
GlobalConfig->TmpPassword = "";
- QCString password;
- QString pass = "";
+ TQCString password;
+ TQString pass = "";
Pkcs11PIN = "";
GlobalConfig->TmpPrivateKeyPass = "";
@@ -4462,7 +4462,7 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( "[ipsec]: " + i18n ( "PIN got from user" ), GlobalConfig->debug );
- GlobalConfig->TmpPrivateKeyPass = QString ( pass );
+ GlobalConfig->TmpPrivateKeyPass = TQString ( pass );
Pkcs11PIN = GlobalConfig->TmpPrivateKeyPass;
}
else
@@ -4487,8 +4487,8 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() )
executeCommandBeforeConnect();
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig, parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" || GlobalConfig->currentProfile->getNetworkDevice() == "" )
{
@@ -4516,15 +4516,15 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( "LocalIP: " + LocalIP, GlobalConfig->debug );
}
- QString Gateway = GlobalConfig->currentProfile->getGateway();
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet="";
+ TQString Gateway = GlobalConfig->currentProfile->getGateway();
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet="";
if ( !RemoteNetAddr.isEmpty() )
RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
- QString LocalNetAddr = LocalIP;
- QString LocalNetMask = "/32";
- QString LocalNet="";
+ TQString LocalNetAddr = LocalIP;
+ TQString LocalNetMask = "/32";
+ TQString LocalNet="";
tmpPath = locateLocal ( "data", "kvpnc/" ); // should be
// KTempDir tmpdir;
@@ -4532,19 +4532,19 @@ void KVpnc::connectClicked()
// if (GlobalConfig->KvpncDebugLevel > 0)
// GlobalConfig->appendLogEntry( "tmppath: " + tmpPath, GlobalConfig->debug );
- QString ProfileName = GlobalConfig->currentProfile->getName();
- QString CertPath = GlobalConfig->currentProfile->getCertPath();
- QString PrivateKeyPass = GlobalConfig->currentProfile->getPrivateKeyPass();
- QString PrivateKey = GlobalConfig->currentProfile->getPrivateKey();
+ TQString ProfileName = GlobalConfig->currentProfile->getName();
+ TQString CertPath = GlobalConfig->currentProfile->getCertPath();
+ TQString PrivateKeyPass = GlobalConfig->currentProfile->getPrivateKeyPass();
+ TQString PrivateKey = GlobalConfig->currentProfile->getPrivateKey();
startStopIpsec ( true );
backupIpsecSystemConfig();
- QString IpsecPrefix = "/etc";
+ TQString IpsecPrefix = "/etc";
// write /etc/ipsec.secrets
- QFile IpsecSecretsFile ( IpsecPrefix + "/ipsec.secrets" ); // warning: static
- QTextStream stream ( &IpsecSecretsFile );
+ TQFile IpsecSecretsFile ( IpsecPrefix + "/ipsec.secrets" ); // warning: static
+ TQTextStream stream ( &IpsecSecretsFile );
if ( IpsecSecretsFile.open ( IO_WriteOnly ) )
{
// cert
@@ -4572,7 +4572,7 @@ void KVpnc::connectClicked()
if ( !GlobalConfig->currentProfile->getPskIsInFile() )
{
- GlobalConfig->appendLogEntry ( QString("ipsec: "+ IpsecToolInfo->Version ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString("ipsec: "+ IpsecToolInfo->Version ),GlobalConfig->debug );
if ( !GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
{
// if ( !GlobalConfig->currentProfile->getUseSpecialLocalID())
@@ -4594,10 +4594,10 @@ void KVpnc::connectClicked()
}
else
{
- QFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
+ TQFile PskFile ( GlobalConfig->currentProfile->getPreSharedKeyFile() );
if ( PskFile.open ( IO_ReadOnly ) )
{
- QString PskFileContent = QString ( PskFile.readAll() );
+ TQString PskFileContent = TQString ( PskFile.readAll() );
PskFile.close();
if ( !GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
{
@@ -4626,8 +4626,8 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "---- %1 ---" ).arg ( IpsecSecretsFile.name() ),GlobalConfig->debug );
if ( IpsecSecretsFile.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &IpsecSecretsFile );
- QString line;
+ TQTextStream stream ( &IpsecSecretsFile );
+ TQString line;
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -4641,15 +4641,15 @@ void KVpnc::connectClicked()
}
ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" );
- QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
+ TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
int IpsecMajor= realversion.section ( '.',0,0 ).toInt();
int IpsecMinor= realversion.section ( '.',1,1 ).toInt();
int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt();
- QString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
+ TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
// write /etc/ipsec.conf
//file.setName( tmpPath + "freeswan." + ProfileName + ".conf" )
- QFile IpsecConfigFile ( IpsecPrefix + "/ipsec.conf" ); // warning: static
+ TQFile IpsecConfigFile ( IpsecPrefix + "/ipsec.conf" ); // warning: static
if ( IpsecConfigFile.open ( IO_WriteOnly ) )
{
@@ -4661,7 +4661,7 @@ void KVpnc::connectClicked()
stream << "" << "\n";
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "IPSec version: %1.%2.%3" ).arg ( QString::number ( IpsecMajor ) ).arg ( QString::number ( IpsecMinor ) ).arg ( QString::number ( IpsecSubMinor ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "IPSec version: %1.%2.%3" ).arg ( TQString::number ( IpsecMajor ) ).arg ( TQString::number ( IpsecMinor ) ).arg ( TQString::number ( IpsecSubMinor ) ),GlobalConfig->debug );
// if ( realversion.find ( "2.", 0, -1 ) > -1 )
if ( !IpsecType.contains ( "free", false ) ) // only version 2
@@ -4685,7 +4685,7 @@ void KVpnc::connectClicked()
}
stream << " klipsdebug=\"";
- for ( QStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it )
+ for ( TQStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it )
{
stream << *it << " ";
@@ -4695,7 +4695,7 @@ void KVpnc::connectClicked()
stream << "\"" << "\n";
stream << " plutodebug=\"";
- for ( QStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it )
+ for ( TQStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it )
{
stream << *it << " ";
@@ -4802,9 +4802,9 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUsePerfectForwardSecrety() )
{
stream << " pfs=yes" << "\n";
- QString pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety();
+ TQString pfs_group = GlobalConfig->currentProfile->getPerfectForwardSecrety();
-// QString PFSGroupNumber = "2";
+// TQString PFSGroupNumber = "2";
// if (pfs_group== "modp768")
// PFSGroupNumber = "1";
// else if (pfs_group== "modp1024")
@@ -4846,7 +4846,7 @@ void KVpnc::connectClicked()
else
{
// we have to split slot id and name ("0 : foobar") => 0
- QString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace();
+ TQString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace();
stream << " leftcert=%smartcard" << Pkcs11Slot << ":" << GlobalConfig->currentProfile->getPkcs11Id() << "\n";
}
@@ -4891,16 +4891,16 @@ void KVpnc::connectClicked()
{
if (GlobalConfig->currentProfile->getRemoteIDType() == "address" && !Utils(GlobalConfig).isValidIPv4Address( GlobalConfig->currentProfile->getSpecialRemoteID() ) )
{
- QString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialRemoteID());
+ TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialRemoteID());
if (resolvedIp.isEmpty())
{
- GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").arg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialRemoteID()).arg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()).tqarg(resolvedIp), GlobalConfig->debug );
stream << " rightid=" + resolvedIp << "\n";
}
}
@@ -4920,16 +4920,16 @@ void KVpnc::connectClicked()
{
if (GlobalConfig->currentProfile->getLocalIDType() == "address" && !Utils(GlobalConfig).isValidIPv4Address( GlobalConfig->currentProfile->getSpecialLocalID() ) )
{
- QString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialLocalID());
+ TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialLocalID());
if (resolvedIp.isEmpty())
{
- GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").arg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialLocalID()).arg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()).tqarg(resolvedIp), GlobalConfig->debug );
stream << " leftid=" + resolvedIp << "\n";
}
}
@@ -4983,7 +4983,7 @@ void KVpnc::connectClicked()
// XAUTH
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
{
- QString LocalID = GlobalConfig->currentProfile->getSpecialLocalID();
+ TQString LocalID = GlobalConfig->currentProfile->getSpecialLocalID();
// if (!LocalID.find( "@", 0 , FALSE ) > -1)
// LocalID="@"+LocalID;
if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) )
@@ -5031,12 +5031,12 @@ void KVpnc::connectClicked()
{
GlobalConfig->appendLogEntry ( i18n ( "---- %1 ---" ).arg ( IpsecPrefix + "/ipsec.conf" ),GlobalConfig->debug );
GlobalConfig->appendLogEntry ( "---------------------",GlobalConfig->debug );
- QString IpsecContent="";
- QFile file ( IpsecPrefix + "/ipsec.conf" );
+ TQString IpsecContent="";
+ TQFile file ( IpsecPrefix + "/ipsec.conf" );
if ( file.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &file );
- QString line;
+ TQTextStream stream ( &file );
+ TQString line;
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -5050,7 +5050,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecConfigFile.name() ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
@@ -5059,7 +5059,7 @@ void KVpnc::connectClicked()
// iptables need the right interface (eth0:1 => eth0)
- QString tmpInterface2 = "";
+ TQString tmpInterface2 = "";
int pointPos = tmpInterface.find ( ':', 0, FALSE );
if ( pointPos > 1 )
{
@@ -5069,7 +5069,7 @@ void KVpnc::connectClicked()
tmpInterface2 = tmpInterface;
// write iptables.<profile>_add_ipsec_freeswan.sh
- QFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" );
+ TQFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" );
stream.setDevice ( &file );
if ( file.open ( IO_WriteOnly ) )
{
@@ -5101,13 +5101,13 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
stream.unsetDevice();
- QFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
- QTextStream stream1 ( &file1 );
+ TQFile file1 ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
+ TQTextStream stream1 ( &file1 );
if ( file1.open ( IO_WriteOnly ) )
{
stream1 << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -5138,14 +5138,14 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk )
{
// write psk.<profile>.key
- QFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" );
+ TQFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" );
stream.setDevice ( &Pskfile );
if ( Pskfile.open ( IO_WriteOnly ) )
{
@@ -5167,7 +5167,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// return;
// }
// }
@@ -5183,7 +5183,7 @@ void KVpnc::connectClicked()
// startStopIpsec(false);
- IpsecStartProcess = new QProcess ( this );
+ IpsecStartProcess = new TQProcess ( this );
//
IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec );
@@ -5205,29 +5205,29 @@ void KVpnc::connectClicked()
// IpsecStartProcess->addArgument ( "starter" );
// IpsecStartProcess->addArgument ( "--nofork");
-// QFile("/var/run/pluto.pid").remove();
-// QFile("/var/run/starter.pid").remove();
+// TQFile("/var/run/pluto.pid").remove();
+// TQFile("/var/run/starter.pid").remove();
// IpsecStartProcess->addArgument ( "setup" );
IpsecStartProcess->addArgument ( "start" );
}
IpsecGotError = false;
- connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
- connect ( IpsecStartProcess, SIGNAL ( normalExit () ), this, SLOT ( ipsecStarted() ) );
+ 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() ) );
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, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
- //disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) );
+ 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() ) );
delete IpsecStartProcess;
IpsecStartProcess = 0L;
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -5263,9 +5263,9 @@ void KVpnc::connectClicked()
GlobalConfig->appPointer->processEvents();
usleep ( 500 );
}
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) );
+ 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() ) );
delete IpsecStartProcess;
IpsecStartProcess = 0L;
@@ -5285,20 +5285,20 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecSecretsFile.name() ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
}
else
{
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
} // freeswan
/* ============ pptp ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp )
{
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
// looking for pppd
if ( Utils ( GlobalConfig ).getToolInfo ( "pppd" )->found == false )
@@ -5306,7 +5306,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -5315,15 +5315,15 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Checking gre support" ), GlobalConfig->debug );
bool gresupportfound = false;
- QString procnetdev = "";
- QFile f ( "/proc/net/dev" );
+ TQString procnetdev = "";
+ TQFile f ( "/proc/net/dev" );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream procnetdevstream ( &f );
- QString procnetdevcontent = QString(procnetdevstream.read());
- QStringList procnetdev_content_list = QStringList::split("\n", procnetdevcontent);
- QString line = "";
- for ( QStringList::Iterator it = procnetdev_content_list.begin(); it != procnetdev_content_list.end(); ++it )
+ TQTextStream procnetdevstream ( &f );
+ TQString procnetdevcontent = TQString(procnetdevstream.read());
+ TQStringList procnetdev_content_list = TQStringList::split("\n", procnetdevcontent);
+ TQString line = "";
+ for ( TQStringList::Iterator it = procnetdev_content_list.begin(); it != procnetdev_content_list.end(); ++it )
{
line = *it; // line of text excluding '\n'
if ( line.contains ( "gre0", false ) )
@@ -5336,15 +5336,15 @@ void KVpnc::connectClicked()
}
if ( !gresupportfound )
{
- QString procmodules = "";
- QFile f2 ( "/proc/modules" );
+ TQString procmodules = "";
+ TQFile f2 ( "/proc/modules" );
if ( f2.open ( IO_ReadOnly ) )
{
- QTextStream procmodulesstream ( &f2 );
- QString procmodulescontent = QString(procmodulesstream.read());
- QStringList procmodules_content_list = QStringList::split("\n", procmodulescontent);
- QString line = "";
- for ( QStringList::Iterator it2 = procmodules_content_list.begin(); it2 != procmodules_content_list.end(); ++it2 )
+ TQTextStream procmodulesstream ( &f2 );
+ TQString procmodulescontent = TQString(procmodulesstream.read());
+ TQStringList procmodules_content_list = TQStringList::split("\n", procmodulescontent);
+ TQString line = "";
+ for ( TQStringList::Iterator it2 = procmodules_content_list.begin(); it2 != procmodules_content_list.end(); ++it2 )
{
line = *it2; // line of text excluding '\n'
if ( line.contains ( "ip_gre", false ) )
@@ -5359,7 +5359,7 @@ void KVpnc::connectClicked()
if ( gresupportfound )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).arg("GRE"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).tqarg("GRE"), GlobalConfig->debug );
}
else
{
@@ -5368,7 +5368,7 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "ip_gre" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "ip_gre" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -5384,7 +5384,7 @@ void KVpnc::connectClicked()
// {
// GlobalConfig->appendLogEntry( i18n( "Remote network is missing, please fill in in profile dialog." ), GlobalConfig->error );
// ok = false;
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// return;
// }
@@ -5535,8 +5535,8 @@ void KVpnc::connectClicked()
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig, parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" )
{
@@ -5549,8 +5549,8 @@ void KVpnc::connectClicked()
}
else
{
- // QString device = GlobalConfig->currentProfile->getNetworkDevice()
- // QString device = PppdDevice;
+ // TQString device = GlobalConfig->currentProfile->getNetworkDevice()
+ // TQString device = PppdDevice;
// tmpInterface = GlobalConfig->currentProfile->getNetworkDevice();
// LocalIP = iface.getInterfaceIP( device );
}
@@ -5591,12 +5591,12 @@ void KVpnc::connectClicked()
GlobalConfig->Pppd_pid_file = "/var/run/ppp-" + GlobalConfig->currentProfile->getName() + ".pid"; // /var/run/ppp-<id>.pid
// write pppd peer script
- QString PppdPeerScript = "/etc/ppp/peers/kvpnc." + GlobalConfig->currentProfile->getName(); // /etc/ppp/peers/<id>
+ TQString PppdPeerScript = "/etc/ppp/peers/kvpnc." + GlobalConfig->currentProfile->getName(); // /etc/ppp/peers/<id>
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "pppd peer script: " + PppdPeerScript + "\n", GlobalConfig->debug );
- QFile file ( PppdPeerScript );
- QTextStream stream ( &file );
+ TQFile file ( PppdPeerScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -5613,14 +5613,14 @@ void KVpnc::connectClicked()
stream << "ipparam kvpnc." + GlobalConfig->currentProfile->getName() + "\n";
stream << "\n";
stream << "# data stream for pppd to use\n";
- QString pptpdebug="";
+ TQString pptpdebug="";
if ( GlobalConfig->enableDebugPptpd == true )
{
pptpdebug=" --debug ";
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Enabling debug for pptpd." ), GlobalConfig->debug );
}
- stream << "pty \"" << GlobalConfig->pathToPptp << " " << pptpdebug << "--loglevel " << QString().setNum ( GlobalConfig->PptpLogLevel ) << " " << GlobalConfig->currentProfile->getGateway() << " --nolaunchpppd\"\n";
+ stream << "pty \"" << GlobalConfig->pathToPptp << " " << pptpdebug << "--loglevel " << TQString().setNum ( GlobalConfig->PptpLogLevel ) << " " << GlobalConfig->currentProfile->getGateway() << " --nolaunchpppd\"\n";
stream << "\n";
stream << "# domain and username, used to select lines in secrets files\n";
@@ -5773,7 +5773,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseMtu() )
{
stream << "# userdefined MTU\n";
- stream << "mtu " + QString().setNum ( GlobalConfig->currentProfile->getMtu() ) + "\n";
+ stream << "mtu " + TQString().setNum ( GlobalConfig->currentProfile->getMtu() ) + "\n";
stream << "\n";
}
else
@@ -5786,7 +5786,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseMru() )
{
stream << "# userdefined MRU\n";
- stream << "mru " + QString().setNum ( GlobalConfig->currentProfile->getMru() ) + "\n";
+ stream << "mru " + TQString().setNum ( GlobalConfig->currentProfile->getMru() ) + "\n";
stream << "\n";
}
else
@@ -5908,7 +5908,7 @@ void KVpnc::connectClicked()
Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/pap-secrets", "go-rwx" );
// write pppd /etc/ppp/chap-secrets
- QString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets
+ TQString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
@@ -5922,7 +5922,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getSaveUserPassword() )
GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -5962,7 +5962,7 @@ void KVpnc::connectClicked()
// write pppd /etc/ppp/pap-secrets
- QString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets
+ TQString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->debug );
@@ -5976,7 +5976,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getSaveUserPassword() )
GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -6009,8 +6009,8 @@ void KVpnc::connectClicked()
pppdHasReplacedefaultrouteSupport = pppdcap.pppdHasReplacedefaultrouteSupport;
- QFile pppdbackupdefaultroutefile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" );
- QTextStream pppdbackupdefaultroutestream ( &pppdbackupdefaultroutefile );
+ TQFile pppdbackupdefaultroutefile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" );
+ TQTextStream pppdbackupdefaultroutestream ( &pppdbackupdefaultroutefile );
if ( pppdbackupdefaultroutefile.open ( IO_WriteOnly ) )
{
pppdbackupdefaultroutestream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -6022,7 +6022,7 @@ void KVpnc::connectClicked()
- QProcess *backupDefaultRouteProcess = new QProcess ( this );
+ TQProcess *backupDefaultRouteProcess = new TQProcess ( this );
backupDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell );
backupDefaultRouteProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" );
@@ -6035,7 +6035,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdBackupDefaultRouteScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".backup_default_route.sh" ) , GlobalConfig->debug );
while ( backupDefaultRouteProcess->isRunning() )
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "PppdBackupDefaultRouteScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug );
@@ -6046,15 +6046,15 @@ void KVpnc::connectClicked()
// load the module 'ppp_mppe'
- QFile modprobe_confFile ( "/etc/modprobe.conf" );
+ TQFile modprobe_confFile ( "/etc/modprobe.conf" );
if ( modprobe_confFile.exists() )
{
- QString modprobe_confFileContent = "";
+ TQString modprobe_confFileContent = "";
bool ppp_compress_18_found = false;
if ( modprobe_confFile.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &modprobe_confFile );
- QString line = "";
+ TQTextStream stream ( &modprobe_confFile );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -6100,7 +6100,7 @@ void KVpnc::connectClicked()
bool load_module_ok=true;
if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp-compress-18", parent ) )
{
- //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg("\"ppp-compress-18\" (ppp_mppe)"));
+ //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg("\"ppp-compress-18\" (ppp_mppe)"));
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" has been failed, trying \"%2\"..." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->debug );
@@ -6108,7 +6108,7 @@ void KVpnc::connectClicked()
if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp_mppe", parent ) )
{
GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" and \"%2\" has been failed: stop." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
disconnectClicked();
load_module_ok=false;
}
@@ -6127,17 +6127,17 @@ void KVpnc::connectClicked()
//sleep(2);
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "pppd: " + GlobalConfig->pathToPppd + "\n", GlobalConfig->debug );
- PptpProcess = new QProcess ( this );
+ PptpProcess = new TQProcess ( this );
PptpProcess->addArgument ( GlobalConfig->pathToPppd );
PptpProcess->addArgument ( "call" );
- PptpProcess->addArgument ( QString ( "kvpnc." + GlobalConfig->currentProfile->getName() ) );
+ PptpProcess->addArgument ( TQString ( "kvpnc." + GlobalConfig->currentProfile->getName() ) );
// PptpProcess->addArgument( GlobalConfig->InterpreterShell );
// PptpProcess->addArgument( "/home/crissi/pppd.sh" );
- connect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- connect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ connect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ connect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
@@ -6152,10 +6152,10 @@ void KVpnc::connectClicked()
{
KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "pppd" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "pppd" ), GlobalConfig->error );
- disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -6167,12 +6167,12 @@ void KVpnc::connectClicked()
this->DisconnectAction->setEnabled ( true );
mw->buttonConnect->setEnabled ( false );
this->ConnectAction->setEnabled ( false );
- //connect ( PptpProcess, SIGNAL( processExited () ), this, SLOT( pppdStarted() ) );
+ //connect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) );
- // connect( &timer, SIGNAL( timeout() ), this, SLOT( slotConnectTimedOut() ) );
+ // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) );
// timer.start( tryConnectTimeout * 1000, FALSE );
- //connect ( PptpProcess, SIGNAL ( processExited() ), this, SLOT ( pptpProcessExited() ) );
+ //connect ( PptpProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( pptpProcessExited() ) );
}
@@ -6183,7 +6183,7 @@ void KVpnc::connectClicked()
{
if (AuthRetry)
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
} // pptp
@@ -6191,9 +6191,9 @@ void KVpnc::connectClicked()
/* ============ openvpn ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
{
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret";
+ TQString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret";
// looking for openvpn
if ( Utils ( GlobalConfig ).getToolInfo ( "openvpn" )->found == false )
@@ -6201,7 +6201,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -6219,10 +6219,10 @@ void KVpnc::connectClicked()
// Utils(GlobalConfig).getSmartcardInfo();
// if ( GlobalConfig->pathToPkcs11Tool.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToPkcs11Tool.section( '/', -1, -1 ), GlobalConfig->pathTopathToPkcs11Tool.section( '/', 0, -2 ) ).isEmpty() )
// {
- // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool) );
- // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
+ // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) );
+ // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
// ok = false;
- // setGuiStatus( disconnected );
+ // setGuitqStatus( disconnected );
// return ;
// }
@@ -6231,7 +6231,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Pkcs11 slot cant be empty!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 slot cant be empty!" ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
if ( GlobalConfig->currentProfile->getPkcs11Id().isEmpty() )
@@ -6239,7 +6239,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Pkcs11 id cant be empty!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 id cant be empty!" ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
if ( GlobalConfig->currentProfile->getUsePkcs11Providers() && GlobalConfig->currentProfile->getPkcs11Providers().isEmpty() )
@@ -6247,23 +6247,23 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Pkcs11 providers cant be empty!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 providers cant be empty!" ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
else
{
/* use cert on filesystem */
- QFile CertTmpFile;
+ TQFile CertTmpFile;
if ( ! GlobalConfig->currentProfile->getUseOnlyCaCertAndUserAuth() )
{
CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() );
if ( !CertTmpFile.exists() )
{
- // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) );
- // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error );
+ // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error );
// ok = false;
- // setGuiStatus( disconnected );
+ // setGuitqStatus( disconnected );
// return ;
}
else
@@ -6274,7 +6274,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( 0, i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ), i18n ( "File Not Found" ) );
GlobalConfig->appendLogEntry ( i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ) , GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -6286,19 +6286,19 @@ void KVpnc::connectClicked()
KMessageBox::error ( 0, i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ), i18n ( "File Not Found" ) );
GlobalConfig->appendLogEntry ( i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ) , GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
}
bool tunsupportfound = false;
- QString procmisc = "";
- QFile f ( "/proc/misc" );
+ TQString procmisc = "";
+ TQFile f ( "/proc/misc" );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &f );
- QString line = "";
+ TQTextStream stream ( &f );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -6315,7 +6315,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug );
- QFile tundevfile ( "/dev/net/tun" );
+ TQFile tundevfile ( "/dev/net/tun" );
if ( !tundevfile.exists() )
{
if ( !Utils ( GlobalConfig, parent ).createTunDev() )
@@ -6323,7 +6323,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -6342,7 +6342,7 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -6356,13 +6356,13 @@ void KVpnc::connectClicked()
// GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway());
// if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty())
// {
- // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
+ // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
// ok =false;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -6561,8 +6561,8 @@ void KVpnc::connectClicked()
AuthRetry = false;
GlobalConfig->haveUserData=true;
- // QFile OpenvpnSecrectFile (OpenvpnSecrectPath);
- // QTextStream openvpn_secret_stream( &OpenvpnSecrectFile);
+ // TQFile OpenvpnSecrectFile (OpenvpnSecrectPath);
+ // TQTextStream openvpn_secret_stream( &OpenvpnSecrectFile);
// if ( OpenvpnSecrectFile.open( IO_WriteOnly ) )
// {
// if (GlobalConfig->TmpUsername.isEmpty())
@@ -6591,8 +6591,8 @@ void KVpnc::connectClicked()
mw->buttonConnect->setEnabled ( false );
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString tmpInterface;
- QString LocalIP;
+ TQString tmpInterface;
+ TQString LocalIP;
NetworkInterface iface ( GlobalConfig, parent );
if ( GlobalConfig->currentProfile->getNetworkDevice() == "default" )
{
@@ -6628,8 +6628,8 @@ void KVpnc::connectClicked()
// GlobalConfig->appendLogEntry( "debug: remote virtual ip: "+GlobalConfig->currentProfile->getRemoteVirtualIP(),GlobalConfig->debug );
// }
// write openvpn.<profile>.conf
- QFile openvpn_file ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" );
- QTextStream openvpn_stream ( &openvpn_file );
+ TQFile openvpn_file ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" );
+ TQTextStream openvpn_stream ( &openvpn_file );
if ( openvpn_file.open ( IO_WriteOnly ) )
{
openvpn_stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -6637,7 +6637,7 @@ void KVpnc::connectClicked()
openvpn_stream << "# verbosity" << "\n";
openvpn_stream << "verb " << GlobalConfig->OpenvpnDebugLevel << "\n\n";
- QString certPath = "/etc/openvpn";
+ TQString certPath = "/etc/openvpn";
if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() )
certPath = GlobalConfig->currentProfile->getCertPath();
@@ -6665,7 +6665,7 @@ void KVpnc::connectClicked()
ToolInfo *OpenvpnToolInfo = Utils ( GlobalConfig ).getToolInfo ( "openvpn" ) ;
int OpenvpnMajor = OpenvpnToolInfo->Version.section ( ".",0,0 ).toInt();
int OpenvpnMinor = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",0,0 ).toInt();
- QString OpenvpnExtra="";
+ TQString OpenvpnExtra="";
int OpenvpnExtraVer=0;
if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, FALSE ) > -1 )
{
@@ -6682,7 +6682,7 @@ void KVpnc::connectClicked()
}
if ( GlobalConfig->KvpncDebugLevel > 4 )
{
- GlobalConfig->appendLogEntry ( i18n ( "OpenVPN major: %1, minor: %2, extra: %3, extra ver: %4" ).arg ( QString().setNum ( OpenvpnMajor ) ).arg ( QString().setNum ( OpenvpnMinor ) ).arg ( OpenvpnExtra ).arg ( QString().setNum ( OpenvpnExtraVer ) ),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "OpenVPN major: %1, minor: %2, extra: %3, extra ver: %4" ).arg ( TQString().setNum ( OpenvpnMajor ) ).arg ( TQString().setNum ( OpenvpnMinor ) ).arg ( OpenvpnExtra ).arg ( TQString().setNum ( OpenvpnExtraVer ) ),GlobalConfig->debug );
}
@@ -6727,7 +6727,7 @@ void KVpnc::connectClicked()
openvpn_stream << "pkcs11-slot-type \"" << GlobalConfig->currentProfile->getPkcs11SlotType() << "\"\n";
// we have to split slot id and name ("0 : foobar") => 0
- QString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace();
+ TQString Pkcs11Slot = GlobalConfig->currentProfile->getPkcs11Slot().section ( ':', 0, 0 ).stripWhiteSpace();
openvpn_stream << "pkcs11-slot \"" << Pkcs11Slot << "\"\n";
openvpn_stream << "pkcs11-id-type \"" << GlobalConfig->currentProfile->getPkcs11IdType() << "\"\n";
openvpn_stream << "pkcs11-sign-mode \"" << GlobalConfig->currentProfile->getPkcs11SignMode() << "\"\n";
@@ -6737,7 +6737,7 @@ void KVpnc::connectClicked()
else
{
/* use cert on filesystem */
- QFile CertTmpFile;
+ TQFile CertTmpFile;
if ( !GlobalConfig->currentProfile->getUseOnlyCaCertAndUserAuth() )
{
CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() );
@@ -6747,7 +6747,7 @@ void KVpnc::connectClicked()
openvpn_stream << "cert " << GlobalConfig->currentProfile->getX509Certificate() << "\n\n";
openvpn_stream << "" << "\n";
- QFile PrivateKeyTmpFile ( GlobalConfig->currentProfile->getPrivateKey() );
+ TQFile PrivateKeyTmpFile ( GlobalConfig->currentProfile->getPrivateKey() );
// if ( PrivateKeyTmpFile.exists() )
{
openvpn_stream << "# client private key" << "\n";
@@ -6771,7 +6771,7 @@ void KVpnc::connectClicked()
openvpn_stream << "# client psk" << "\n";
if ( GlobalConfig->currentProfile->getPskIsInFile() )
{
- QString direction="";
+ TQString direction="";
if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" )
direction= GlobalConfig->currentProfile->getAuthenticationDirection();
openvpn_stream << "secret " << GlobalConfig->currentProfile->getPreSharedKeyFile() << " " << direction << "\n\n";
@@ -6779,8 +6779,8 @@ void KVpnc::connectClicked()
else
{
// write openvpn.<profile>.secret
- QFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" );
- QTextStream openvpn_secretstream ( &openvpn_secretfile );
+ TQFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" );
+ TQTextStream openvpn_secretstream ( &openvpn_secretfile );
if ( openvpn_secretfile.open ( IO_WriteOnly ) )
{
openvpn_secretstream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -6788,7 +6788,7 @@ void KVpnc::connectClicked()
openvpn_secretstream << GlobalConfig->currentProfile->getPreSharedKey() << "\n\n";
}
openvpn_secretfile.close();
- QString direction="";
+ TQString direction="";
if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" )
direction= GlobalConfig->currentProfile->getAuthenticationDirection();
openvpn_stream << "secret " << tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret " << direction << "\n\n";
@@ -6832,9 +6832,9 @@ void KVpnc::connectClicked()
openvpn_stream << "ifconfig " << GlobalConfig->currentProfile->getLocalVirtualIP() << " " << GlobalConfig->currentProfile->getRemoteVirtualIP() << "\n\n";
-// QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+// TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
// int RemoteNetMaskNum = GlobalConfig->currentProfile->getRemoteNetMask().toInt();
-// QString RemoteNetMask = "255.255.255.0";
+// TQString RemoteNetMask = "255.255.255.0";
// if ( RemoteNetMaskNum == 24 )
// RemoteNetMask = "255.255.255.0";
// else if ( RemoteNetMaskNum == 25 )
@@ -6954,7 +6954,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseTlsAuth() && !GlobalConfig->currentProfile->getTlsAuthFile().isEmpty() )
{
openvpn_stream << "# Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks\n";
- QString direction="";
+ TQString direction="";
if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" )
direction= GlobalConfig->currentProfile->getAuthenticationDirection();
openvpn_stream << "tls-auth " << GlobalConfig->currentProfile->getTlsAuthFile() << " " << direction << "\n\n";
@@ -6975,7 +6975,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseHttpProxy() )
{
openvpn_stream << "# Use a HTTP proxy\n";
- QString HttpProxyAuthType = "";
+ TQString HttpProxyAuthType = "";
if ( GlobalConfig->currentProfile->getUseHttpProxyAuth() )
HttpProxyAuthType = GlobalConfig->currentProfile->getHttpProxyAuthType();
@@ -7030,8 +7030,8 @@ void KVpnc::connectClicked()
tmpPath = locateLocal ( "data", "kvpnc/" );
// write openvpn.<profile>.up
- QFile upfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up" );
- QTextStream upstream ( &upfile );
+ TQFile upfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up" );
+ TQTextStream upstream ( &upfile );
if ( upfile.open ( IO_WriteOnly ) )
{
upstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -7188,8 +7188,8 @@ void KVpnc::connectClicked()
Utils ( GlobalConfig, this ).doChmod ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".up", "a+x" );
// write openvpn.<profile>.down
- QFile downfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".down" );
- QTextStream downstream ( &downfile );
+ TQFile downfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".down" );
+ TQTextStream downstream ( &downfile );
if ( downfile.open ( IO_WriteOnly ) )
{
downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -7218,7 +7218,7 @@ void KVpnc::connectClicked()
/* dont update dns */
}
- QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
+ TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
if ( ! pppdHasReplacedefaultrouteSupport && GlobalConfig->currentProfile->getReplaceDefaultRoute() )
{
downstream << GlobalConfig->pathToIp << " route add $(cat " << OldDefaultroute << ")" << "\n";
@@ -7237,15 +7237,15 @@ void KVpnc::connectClicked()
OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
- QFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" );
- QTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile );
+ TQFile DefaultRouteBackupFile ( OldDefaultroute + ".sh" );
+ TQTextStream DefaultRouteBackupFileStream ( &DefaultRouteBackupFile );
if ( DefaultRouteBackupFile.open ( IO_WriteOnly ) )
{
DefaultRouteBackupFileStream << "# generated by kvpnc. Do not edit it." << "\n";
DefaultRouteBackupFileStream << "\n";
DefaultRouteBackupFileStream << GlobalConfig->pathToIp + " route show | grep default > " + OldDefaultroute + "\n";
DefaultRouteBackupFile.close();
- QProcess backupDefaultRouteProcess ( this );
+ TQProcess backupDefaultRouteProcess ( this );
backupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell );
backupDefaultRouteProcess.addArgument ( OldDefaultroute + ".sh" );
if ( !backupDefaultRouteProcess.start() )
@@ -7283,8 +7283,8 @@ void KVpnc::connectClicked()
delete OpenvpnProcess;
OpenvpnProcess = 0L;
}
- OpenvpnProcess = new QProcess ( this );
- OpenvpnProcess->setCommunication ( QProcess::Stdin|QProcess::Stdout|QProcess::Stderr|QProcess::DupStderr );
+ OpenvpnProcess = new TQProcess ( this );
+ OpenvpnProcess->setCommunication ( TQProcess::Stdin|TQProcess::Stdout|TQProcess::Stderr|TQProcess::DupStderr );
OpenvpnProcess->addArgument ( GlobalConfig->pathToOpenvpn );
OpenvpnProcess->addArgument ( "--writepid" );
@@ -7292,9 +7292,9 @@ void KVpnc::connectClicked()
OpenvpnProcess->addArgument ( "--config" );
OpenvpnProcess->addArgument ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".conf" ); // default
- connect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
-// connect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
- connect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) );
+ 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() ) );
GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info );
@@ -7330,7 +7330,7 @@ void KVpnc::connectClicked()
OpenvpnVersionOk = true;
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry ( i18n ( "Openvpn Version: %1.%2.%3" ).arg ( QString().setNum ( major ) ).arg ( QString().setNum ( minor ) ).arg ( QString().setNum ( subminor ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Openvpn Version: %1.%2.%3" ).arg ( TQString().setNum ( major ) ).arg ( TQString().setNum ( minor ) ).arg ( TQString().setNum ( subminor ) ), GlobalConfig->debug );
// if (OpenvpnVersionOk && ( GlobalConfig->currentProfile->getUseSmartcard() || GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) )
@@ -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, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) );
+ connect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) );
if ( managementhandler->doConnect())
{
@@ -7352,21 +7352,21 @@ void KVpnc::connectClicked()
// if (managementhandler->isConnectedToManagementPort())
// {
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).arg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).tqarg( "openvpn" ) , GlobalConfig->debug );
// break;
// }
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).arg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).tqarg( "openvpn" ) , GlobalConfig->debug );
// }
// // managementhandler->sendToServer("help");
// // }
// if (failManagementHandlerConnectCheckCount >= maxfailManagementHandlerConnectCheckCount)
// {
- // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) );
- // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) , GlobalConfig->error );
+ // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) , GlobalConfig->error );
// if (OpenvpnProcess != 0)
// OpenvpnProcess->kill();
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// return;
// }
@@ -7385,7 +7385,7 @@ void KVpnc::connectClicked()
} // openvpn
else
{
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -7394,7 +7394,7 @@ void KVpnc::connectClicked()
/* ============ vtun ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun )
{
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
tmpPath = locateLocal ( "data", "kvpnc/" );
// looking for vtund
@@ -7403,7 +7403,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -7411,12 +7411,12 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "vtund: %1" ) .arg ( GlobalConfig->pathToVtund ) , GlobalConfig->debug );
bool tunsupportfound = false;
- QString procmisc = "";
- QFile f ( "/proc/misc" );
+ TQString procmisc = "";
+ TQFile f ( "/proc/misc" );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &f );
- QString line = "";
+ TQTextStream stream ( &f );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -7433,7 +7433,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug );
- QFile tundevfile ( "/dev/net/tun" );
+ TQFile tundevfile ( "/dev/net/tun" );
if ( !tundevfile.exists() )
{
if ( !Utils ( GlobalConfig, parent ).createTunDev() )
@@ -7441,7 +7441,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7459,7 +7459,7 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7474,13 +7474,13 @@ void KVpnc::connectClicked()
// GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway());
// if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty())
// {
- // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
+ // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
// ok =false;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -7622,8 +7622,8 @@ void KVpnc::connectClicked()
executeCommandBeforeConnect();
// write vtun.<profile>.conf
- QFile vtun_file ( tmpPath + "vtun." + GlobalConfig->currentProfile->getName() + ".conf" );
- QTextStream vtun_stream ( &vtun_file );
+ TQFile vtun_file ( tmpPath + "vtun." + GlobalConfig->currentProfile->getName() + ".conf" );
+ TQTextStream vtun_stream ( &vtun_file );
if ( vtun_file.open ( IO_WriteOnly ) )
{
vtun_stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -7677,8 +7677,8 @@ void KVpnc::connectClicked()
}
vtun_file.close();
- VtundProcess = new QProcess ( this );
-// VtundProcess->setCommunication ( QProcess::Stdin|QProcess::Stdout|QProcess::Stderr|QProcess::DupStderr );
+ VtundProcess = new TQProcess ( this );
+// VtundProcess->setCommunication ( TQProcess::Stdin|TQProcess::Stdout|TQProcess::Stderr|TQProcess::DupStderr );
VtundProcess->addArgument ( GlobalConfig->pathToVtund );
VtundProcess->addArgument ( "-n" );
VtundProcess->addArgument ( "-f" );
@@ -7687,9 +7687,9 @@ void KVpnc::connectClicked()
VtundProcess->addArgument ( GlobalConfig->currentProfile->getGateway() );
- connect ( VtundProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_vtun() ) );
- connect ( VtundProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_vtun() ) );
- connect ( VtundProcess, SIGNAL ( processExited() ), this, SLOT ( vtun_exited() ) );
+ 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() ) );
GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info );
@@ -7718,14 +7718,14 @@ void KVpnc::connectClicked()
}
else
{
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
/* ============ ssh ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh )
{
- //setGuiStatus(connecting);
+ //setGuitqStatus(connecting);
tmpPath = locateLocal ( "data", "kvpnc/" );
// looking for ssh
@@ -7734,7 +7734,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ) );
GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ), GlobalConfig->error );
ok = false;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -7742,12 +7742,12 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "ssh: %1" ) .arg ( GlobalConfig->pathToSsh ) , GlobalConfig->debug );
bool tunsupportfound = false;
- QString procmisc = "";
- QFile f ( "/proc/misc" );
+ TQString procmisc = "";
+ TQFile f ( "/proc/misc" );
if ( f.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &f );
- QString line = "";
+ TQTextStream stream ( &f );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
@@ -7764,7 +7764,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Support for TUN/TAP found (compiled into kernel or kernel module already loaded)." ), GlobalConfig->debug );
- QFile tundevfile ( "/dev/net/tun" );
+ TQFile tundevfile ( "/dev/net/tun" );
if ( !tundevfile.exists() )
{
if ( !Utils ( GlobalConfig, parent ).createTunDev() )
@@ -7772,7 +7772,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7790,7 +7790,7 @@ void KVpnc::connectClicked()
KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
disconnectClicked();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7977,13 +7977,13 @@ void KVpnc::connectClicked()
*SshProcess << GlobalConfig->pathToSsh ;
// SshProcess->setExecutable(GlobalConfig->pathToSsh);
/*
- connect(m_process, SIGNAL(processExited(KProcess*)),
- this, SLOT(slotProcessExited(KProcess*)));*/
+ connect(m_process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(slotProcessExited(KProcess*)));*/
-// QString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh";
+// TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh";
//
-// QFile askpassfile (AskPassScript );
-// QTextStream stream ( &askpassfile );
+// TQFile askpassfile (AskPassScript );
+// TQTextStream stream ( &askpassfile );
// if ( askpassfile.open ( IO_WriteOnly ) )
// {
// stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -7998,7 +7998,7 @@ void KVpnc::connectClicked()
// else
// {
// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( askpassfile.name() ), GlobalConfig->error );
-// setGuiStatus ( disconnected );
+// setGuitqStatus ( disconnected );
// return;
// }
//
@@ -8023,7 +8023,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->SshDebugLevel > 0 )
{
- QString SshDebug="-";
+ TQString SshDebug="-";
for ( int i=0;i<GlobalConfig->SshDebugLevel;i++ )
SshDebug+="v";
*SshProcess << SshDebug;
@@ -8074,7 +8074,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getUseRemotePort() )
{
*SshProcess << "-p" ;
- *SshProcess << QString().setNum ( GlobalConfig->currentProfile->getRemotePort() );
+ *SshProcess << TQString().setNum ( GlobalConfig->currentProfile->getRemotePort() );
}
*SshProcess << GlobalConfig->TmpGatewayIP ;
@@ -8132,21 +8132,21 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 3 )
{
- QString args = "";
- QValueList<QCString> list = SshProcess->args();
- QValueList<QCString>::Iterator it = list.begin();
+ TQString args = "";
+ TQValueList<TQCString> list = SshProcess->args();
+ TQValueList<TQCString>::Iterator it = list.begin();
while ( it != list.end() )
{
- args += QString ( " " + *it ) ;
+ args += TQString ( " " + *it ) ;
++it;
}
GlobalConfig->appendLogEntry ( i18n ( "%1 arguments: %1" ).arg ( "ssh" ).arg ( args ), GlobalConfig->debug );
}
- connect ( SshProcess, SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) );
- connect ( SshProcess, SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) );
-// connect( SshProcess, SIGNAL( processExited() ), this, SLOT( sshExited() ) );
+ connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) );
+ connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) );
+// connect( SshProcess, TQT_SIGNAL( processExited() ), this, TQT_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 );
@@ -8200,13 +8200,13 @@ void KVpnc::connectClicked()
GlobalConfig->currentConnectRetry++;
- SshProcess->writeStdin ( QString ( GlobalConfig->TmpPassword+'\n' ).ascii(),GlobalConfig->TmpPassword.length() +1 );
+ SshProcess->writeStdin ( TQString ( GlobalConfig->TmpPassword+'\n' ).ascii(),GlobalConfig->TmpPassword.length() +1 );
}
}
else
{
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -8226,15 +8226,15 @@ void KVpnc::disconnectClicked()
prevConnectionState = connected;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Disconnect requested, status connected" ), GlobalConfig->debug );
- QString type_string = "";
+ TQString type_string = "";
bool ok = true; // if ok we will run process
if ( ConnectionStatusCheckProcess != 0 )
{
if ( ConnectionStatusCheckProcess->isRunning() )
{
- disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) );
- disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
ConnectionStatusCheckProcess->kill();
@@ -8259,11 +8259,11 @@ void KVpnc::disconnectClicked()
//Vpnc_pid_file = tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getID() + ".pid"; // vpnc-pid.<id>.pid
VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh";
// write vpnc connect script
- QFile pidFile ( GlobalConfig->Vpnc_pid_file );
- QString Vpnc_pid = "";
+ TQFile pidFile ( GlobalConfig->Vpnc_pid_file );
+ TQString Vpnc_pid = "";
if ( pidFile.open ( IO_ReadOnly ) )
{
- Vpnc_pid = QString ( pidFile.readAll() ).stripWhiteSpace();
+ Vpnc_pid = TQString ( pidFile.readAll() ).stripWhiteSpace();
}
@@ -8271,9 +8271,9 @@ void KVpnc::disconnectClicked()
{
if ( VpncProcess->isRunning() )
{
- disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) );
- disconnect ( VpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readOutputFrom_vpnc() ) );
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ 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() ) );
VpncProcess->kill();
sleep ( 1 );
@@ -8290,8 +8290,8 @@ void KVpnc::disconnectClicked()
VpncProcess = 0L;
}
- QFile file ( VpncDisconnectScript );
- QTextStream stream ( &file );
+ TQFile file ( VpncDisconnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -8312,7 +8312,7 @@ void KVpnc::disconnectClicked()
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
- QFile ( GlobalConfig->Vpnc_pid_file ).remove();
+ TQFile ( GlobalConfig->Vpnc_pid_file ).remove();
}
// else
// {
@@ -8348,7 +8348,7 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug );
- QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
+ TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n";
stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n";
// stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n";
@@ -8362,12 +8362,12 @@ void KVpnc::disconnectClicked()
file.close();
- DisconnectProcess = new QProcess ();
+ DisconnectProcess = new TQProcess ();
DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
DisconnectProcess->addArgument ( VpncDisconnectScript );
- connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) );
- connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) );
if ( !DisconnectProcess->start ( env ) )
{
@@ -8380,26 +8380,26 @@ void KVpnc::disconnectClicked()
sleep ( 1 );
}
}
- disconnect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) );
- disconnect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) );
delete DisconnectProcess;
DisconnectProcess=0L;
}
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
durationTimer.stop();
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
// vpnclient
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
{
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString CiscoVpncDisconnectScript = tmpPath + "vpnclient-disconnect." + GlobalConfig->currentProfile->getID() + ".sh";
+ TQString CiscoVpncDisconnectScript = tmpPath + "vpnclient-disconnect." + GlobalConfig->currentProfile->getID() + ".sh";
// write vpnc connect script
- QFile file ( CiscoVpncDisconnectScript );
- QTextStream stream ( &file );
+ TQFile file ( CiscoVpncDisconnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -8412,7 +8412,7 @@ void KVpnc::disconnectClicked()
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug );
//
-// QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
+// TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
// stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n";
// stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n";
// // stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n";
@@ -8439,12 +8439,12 @@ void KVpnc::disconnectClicked()
}
file.close();
- DisconnectProcess = new QProcess ();
+ DisconnectProcess = new TQProcess ();
DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
DisconnectProcess->addArgument ( CiscoVpncDisconnectScript );
- connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) );
- connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) );
if ( !DisconnectProcess->start ( env ) )
{
@@ -8457,12 +8457,12 @@ void KVpnc::disconnectClicked()
sleep ( 1 );
}
}
- disconnect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) );
- disconnect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) );
delete DisconnectProcess;
DisconnectProcess=0L;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
if ( CiscoVpncProcess != 0 && CiscoVpncProcess->isRunning() )
@@ -8474,8 +8474,8 @@ void KVpnc::disconnectClicked()
delete CiscoVpncProcess;
CiscoVpncProcess=0L;
- setGuiStatus ( disconnected );
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ setGuitqStatus ( disconnected );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
// racoon
@@ -8484,7 +8484,7 @@ void KVpnc::disconnectClicked()
// // looking for setkey
// if ( GlobalConfig->pathToSetkey.isEmpty() ) {
- // QFile setkey( "/usr/sbin/setkey" );
+ // TQFile setkey( "/usr/sbin/setkey" );
// if ( setkey.exists() )
// GlobalConfig->pathToSetkey = "/usr/sbin/setkey";
// else {
@@ -8496,7 +8496,7 @@ void KVpnc::disconnectClicked()
// if ( setkey.exists() )
// GlobalConfig->pathToSetkey = "/usr/bin/setkey";
// else {
- // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).arg("setkey") );
+ // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).tqarg("setkey") );
// ok = false;
// }
// }
@@ -8505,8 +8505,8 @@ void KVpnc::disconnectClicked()
- QFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" );
- QTextStream stream2 ( &file2 );
+ TQFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" );
+ TQTextStream stream2 ( &file2 );
if ( file2.open ( IO_WriteOnly ) )
{
stream2 << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -8520,18 +8520,18 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
-// if (QFile("/var/run/l2tpd.pid").exists())
+// if (TQFile("/var/run/l2tpd.pid").exists())
// {
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug);
-// QFile L2tpdControlFile ( "/var/run/l2tp-control" );
-// QTextStream stream( &L2tpdControlFile );
+// TQFile L2tpdControlFile ( "/var/run/l2tp-control" );
+// TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "d " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -8544,8 +8544,8 @@ void KVpnc::disconnectClicked()
if ( L2tpdProcess != 0L && L2tpdProcess->isRunning() )
{
- disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) );
- disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) );
L2tpdProcess->kill();
if ( L2tpdProcess->isRunning() )
@@ -8560,8 +8560,8 @@ void KVpnc::disconnectClicked()
if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() )
{
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) );
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) );
OpenL2tpProcess->tryTerminate();
sleep ( 1 );
@@ -8571,8 +8571,8 @@ void KVpnc::disconnectClicked()
if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() )
OpenL2tpProcess->kill();
- if ( QFile ( "/var/run/openl2tpd.pid" ).exists() )
- QFile ( "/var/run/openl2tpd.pid" ).remove();
+ if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() )
+ TQFile ( "/var/run/openl2tpd.pid" ).remove();
if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) )
{
@@ -8635,8 +8635,8 @@ void KVpnc::disconnectClicked()
if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() )
{
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) );
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) );
// terminateConnection( RacoonTailProcess );
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -8658,8 +8658,8 @@ void KVpnc::disconnectClicked()
if ( RacoonProcess != 0 && RacoonProcess->isRunning() )
{
- disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
- disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) );
// terminateConnection( RacoonProcess );
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -8688,14 +8688,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon && ( GlobalConfig->currentProfile->getL2tpDaemon() == "l2tpd" || GlobalConfig->currentProfile->getL2tpDaemon() == "l2tpd" ) )
{
// remove kvpnc entries from secrets file
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -8753,8 +8753,8 @@ void KVpnc::disconnectClicked()
}
}
- setGuiStatus ( disconnected );
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ setGuitqStatus ( disconnected );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.stop();
connectionEnded();
@@ -8763,16 +8763,16 @@ void KVpnc::disconnectClicked()
// DisconnectProcess->addArgument( "-3" );
// DisconnectProcess->addArgument( "racoon" );
//
- // connect( DisconnectProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoon() ) );
- // connect( DisconnectProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoon() ) );
- // connect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeSetkey() ) );
+ // 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() ) );
//
// if ( !DisconnectProcess->start(env) )
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg("killall -3 racoon") );
// else {
// RacoonTailProcess->tryTerminate();
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).arg("killall -3 racoon"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).tqarg("killall -3 racoon"), GlobalConfig->debug );
// }
// }
@@ -8781,7 +8781,7 @@ void KVpnc::disconnectClicked()
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
// iptables need the right interface (eth0:1 => eth0)
- QString tmpInterface2 = "";
+ TQString tmpInterface2 = "";
int pointPos = tmpInterface.find ( ':', 0, FALSE );
if ( pointPos > 1 )
{
@@ -8792,12 +8792,12 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
-// if (QFile("/var/run/l2tpd.pid").exists())
+// if (TQFile("/var/run/l2tpd.pid").exists())
// {
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug);
-// QFile L2tpdControlFile ( "/var/run/l2tp-control" );
-// QTextStream stream( &L2tpdControlFile );
+// TQFile L2tpdControlFile ( "/var/run/l2tp-control" );
+// TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "d " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -8822,8 +8822,8 @@ void KVpnc::disconnectClicked()
{
if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() )
{
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) );
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) );
//OpenL2tpProcess->tryTerminate();
sleep ( 1 );
//if (OpenL2tpProcess->isRunning())
@@ -8832,8 +8832,8 @@ void KVpnc::disconnectClicked()
if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() )
OpenL2tpProcess->kill();
- if ( QFile ( "/var/run/openl2tpd.pid" ).exists() )
- QFile ( "/var/run/openl2tpd.pid" ).remove();
+ if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() )
+ TQFile ( "/var/run/openl2tpd.pid" ).remove();
if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) )
{
@@ -8895,22 +8895,22 @@ void KVpnc::disconnectClicked()
ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" );
- QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
+ TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
int IpsecMajor= realversion.section ( '.',0,0 ).toInt();
int IpsecMinor= realversion.section ( '.',1,1 ).toInt();
int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt();
- QString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
+ TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackDeleteProcess = new QProcess ( this );
+ IpsecWhackDeleteProcess = new TQProcess ( this );
IpsecWhackDeleteProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackDeleteProcess->addArgument ( "whack" );
IpsecWhackDeleteProcess->addArgument ( "--name" );
IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackDeleteProcess->addArgument ( "--delete" );
- connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) );
- connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) );
+ connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) );
+ connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) );
if ( !IpsecWhackDeleteProcess->start ( env ) )
{
@@ -8932,8 +8932,8 @@ void KVpnc::disconnectClicked()
usleep ( 500 );
}
}
- disconnect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) );
- disconnect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) );
+ disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) );
+ disconnect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) );
delete IpsecWhackDeleteProcess;
IpsecWhackDeleteProcess=0L;
@@ -8941,7 +8941,7 @@ void KVpnc::disconnectClicked()
IpsecGotError = true;
-// IpsecStartProcess = new QProcess ( this );
+// IpsecStartProcess = new TQProcess ( this );
// IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec );
// if ( !IpsecType.contains ( "Openswan", false ) )
// {
@@ -8955,9 +8955,9 @@ void KVpnc::disconnectClicked()
// IpsecStartProcess->addArgument ( "stop" );
// }
//
-// connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
-// connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
-// // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) );
+// 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() ) );
//
// if ( !IpsecStartProcess->start ( env ) )
// {
@@ -8993,9 +8993,9 @@ void KVpnc::disconnectClicked()
// }
//
// }
-// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
-// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
-// //disconnect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) );
+// 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() ) );
// delete IpsecStartProcess;
// IpsecStartProcess=0L;
@@ -9004,8 +9004,8 @@ void KVpnc::disconnectClicked()
delRouteIpsec();
removeIptablesFreeswan();
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- setGuiStatus ( disconnected );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ setGuitqStatus ( disconnected );
durationTimer.stop();
GlobalConfig->currentConnectRetry=0;
connectionEnded();
@@ -9014,22 +9014,22 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "Restoring original ipsec settings" ), KVpncConfig::debug );
// restore system files
- QString IpsecPrefix = "/etc";
+ TQString IpsecPrefix = "/etc";
// ipsec.conf
- QFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" );
- QTextStream stream ( &originalIpsecConfFile );
- QString originalIpsecConfFileContent = "";
+ TQFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" );
+ TQTextStream stream ( &originalIpsecConfFile );
+ TQString originalIpsecConfFileContent = "";
if ( originalIpsecConfFile.exists() )
{
if ( originalIpsecConfFile.open ( IO_ReadOnly ) )
{
- originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() );
+ originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() );
originalIpsecConfFile.close();
}
}
- QFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" );
+ TQFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" );
stream.setDevice ( &backupOriginalIpsecConfFile );
if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) )
{
@@ -9039,19 +9039,19 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug );
// ipsec.secret
- QFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
+ TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
stream.setDevice ( &originalIpsecSecretFile );
- QString originalIpsecSecretFileContent = "";
+ TQString originalIpsecSecretFileContent = "";
if ( originalIpsecSecretFile.open ( IO_ReadOnly ) )
{
- originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() );
+ originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() );
originalIpsecSecretFile.close();
}
- QFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" );
+ TQFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" );
stream.setDevice ( &backupOriginalIpsecSecretFile );
if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) )
{
@@ -9064,14 +9064,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
// remove kvpnc entries from secrets file
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -9140,12 +9140,12 @@ void KVpnc::disconnectClicked()
if (PptpProcess != 0L)
{
- disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
ToolInfo *PptpInfo = Utils ( GlobalConfig ).getToolInfo ( "pptp" );
- QString pptpversion = PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
+ TQString pptpversion = PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( PptpInfo->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
int PptpMajor= pptpversion.section ( '.',0,0 ).toInt();
int PptpMinor= pptpversion.section ( '.',1,1 ).toInt();
int PptpSubMinor= pptpversion.section ( '.',2,2 ).toInt();
@@ -9154,7 +9154,7 @@ void KVpnc::disconnectClicked()
PptpProcess->kill();
-// QProcess *pptpdKillProcess = new QProcess ( this );
+// TQProcess *pptpdKillProcess = new TQProcess ( this );
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry ( i18n ( "No pid file, trying to terminate %1 with killall..." ).arg ( "pptp" ), GlobalConfig->debug );
// pptpdKillProcess->addArgument ( GlobalConfig->pathToKillall );
@@ -9163,12 +9163,12 @@ void KVpnc::disconnectClicked()
//
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
-// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
+// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
// }
//
// sleep ( 2 );
@@ -9183,7 +9183,7 @@ void KVpnc::disconnectClicked()
//
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
@@ -9216,12 +9216,12 @@ void KVpnc::disconnectClicked()
//
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
-// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
+// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
// while ( pptpdKillProcess->isRunning() )
// {
// sleep ( 1 );
@@ -9247,8 +9247,8 @@ void KVpnc::disconnectClicked()
durationTimer.stop();
// write pppd.<profile>.down
- QFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
- QTextStream downstream ( &downfile );
+ TQFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
+ TQTextStream downstream ( &downfile );
if ( downfile.open ( IO_WriteOnly ) )
{
downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -9292,7 +9292,7 @@ void KVpnc::disconnectClicked()
// if ( GlobalConfig->NewDefaultGw != "0.0.0.0" )
// {
- // QString pppdev = "";
+ // TQString pppdev = "";
// if ( !PppdDevice.isEmpty() )
// pppdev = PppdDevice;
// else
@@ -9311,7 +9311,7 @@ void KVpnc::disconnectClicked()
downfile.close();
- QProcess *pppdDownProcess = new QProcess ( this );
+ TQProcess *pppdDownProcess = new TQProcess ( this );
pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell );
pppdDownProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
@@ -9324,7 +9324,7 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "PppdDownScript" ) , GlobalConfig->debug );
while ( pppdDownProcess->isRunning() )
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "PppdDownScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" ), GlobalConfig->debug );
@@ -9358,14 +9358,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -9425,14 +9425,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -9489,10 +9489,10 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
// connectionEnded();
}
}
@@ -9504,13 +9504,13 @@ void KVpnc::disconnectClicked()
{
// delete managementhandler;
}
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- //disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
- //disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) );
+ 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() ) );
if ( managementhandler )
{
- disconnect ( managementhandler, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) );
+ disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) );
managementhandler->greetingtimer.stop();
managementhandler->closeConnection();
while( ! managementhandler->socketReallyClosed )
@@ -9525,12 +9525,12 @@ void KVpnc::disconnectClicked()
if ( OpenvpnProcess != 0L && OpenvpnProcess->isRunning() )
{
//OpenvpnProcess->tryTerminate();
- //QTimer::singleShot ( 2000, OpenvpnProcess, SLOT ( kill() ) );
+ //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) );
OpenvpnProcess->kill();
}
//sleep ( 2 );
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
@@ -9542,19 +9542,19 @@ void KVpnc::disconnectClicked()
if ( VtundProcess != 0 )
{
VtundProcess->tryTerminate();
- QTimer::singleShot ( 2000, VtundProcess, SLOT ( kill() ) );
+ TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) );
}
// terminateConnection( VtundProcess );
- // VtundProcess = new QProcess ();
+ // VtundProcess = new TQProcess ();
// VtundProcess->addArgument( GlobalConfig->pathToKillall );
// VtundProcess->addArgument( "vtund" );
//
- // connect( VtundProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) );
- // connect( VtundProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) );
+ // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) );
+ // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
// else
// {
// sleep(1);
@@ -9562,7 +9562,7 @@ void KVpnc::disconnectClicked()
// delete VtundProcess;
// VtundProcess=0L;
// }
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
sleep ( 2 );
delete VtundProcess;
@@ -9577,20 +9577,20 @@ void KVpnc::disconnectClicked()
if ( SshProcess != 0 )
{
// SshProcess->tryTerminate();
-// QTimer::singleShot ( 5000, SshProcess, SLOT ( kill() ) );
+// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) );
SshProcess->kill();
}
// terminateConnection( SshProcess );
- // SshProcess = new QProcess ();
+ // SshProcess = new TQProcess ();
// SshProcess->addArgument( GlobalConfig->pathToKillall );
// SshProcess->addArgument( "openvpn" );
//
- // connect( SshProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) );
- // connect( SshProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) );
+ // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) );
+ // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
// }
else
{
@@ -9600,8 +9600,8 @@ void KVpnc::disconnectClicked()
SshProcess=0L;
// write ssh.<profile>.down
- QFile downfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" );
- QTextStream downstream ( &downfile );
+ TQFile downfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" );
+ TQTextStream downstream ( &downfile );
if ( downfile.open ( IO_WriteOnly ) )
{
downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -9661,7 +9661,7 @@ void KVpnc::disconnectClicked()
downfile.close();
- QProcess *SshDownProcess = new QProcess ( this );
+ TQProcess *SshDownProcess = new TQProcess ( this );
SshDownProcess->addArgument ( GlobalConfig->InterpreterShell );
SshDownProcess->addArgument ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" );
@@ -9674,7 +9674,7 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "SshDownScript" ) , GlobalConfig->debug );
while ( SshDownProcess->isRunning() )
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) finished." ).arg ( "SshDownScript" ).arg ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".down" ), GlobalConfig->debug );
@@ -9707,13 +9707,13 @@ void KVpnc::disconnectClicked()
}
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
}
// ConnectingProcess = 0L;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() )
executeCommandAfterDisconnect();
@@ -9737,20 +9737,20 @@ void KVpnc::disconnectClicked()
//Vpnc_pid_file = tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getID() + ".pid"; // vpnc-pid.<id>.pid
VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh";
// write vpnc connect script
- QFile pidFile ( GlobalConfig->Vpnc_pid_file );
- QString Vpnc_pid = "";
+ TQFile pidFile ( GlobalConfig->Vpnc_pid_file );
+ TQString Vpnc_pid = "";
if ( pidFile.open ( IO_ReadOnly ) )
{
- Vpnc_pid = QString ( pidFile.readAll() ).stripWhiteSpace();
+ Vpnc_pid = TQString ( pidFile.readAll() ).stripWhiteSpace();
}
if ( VpncProcess != 0 )
{
if ( VpncProcess->isRunning() )
{
- disconnect ( VpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) );
- disconnect ( VpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readOutputFrom_vpnc() ) );
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ 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() ) );
VpncProcess->kill();
sleep ( 1 );
@@ -9767,8 +9767,8 @@ void KVpnc::disconnectClicked()
VpncProcess = 0L;
}
- QFile file ( VpncDisconnectScript );
- QTextStream stream ( &file );
+ TQFile file ( VpncDisconnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -9785,7 +9785,7 @@ void KVpnc::disconnectClicked()
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
stream << GlobalConfig->pathToKill << " -KILL " << Vpnc_pid << " > /dev/null 2>&1\n";
- QFile ( GlobalConfig->Vpnc_pid_file ).remove();
+ TQFile ( GlobalConfig->Vpnc_pid_file ).remove();
}
// else
// {
@@ -9803,7 +9803,7 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Restoring default route before connection..." ), GlobalConfig->debug );
- QString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
+ TQString OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
stream << GlobalConfig->pathToIp + " route del default > /dev/null 2>&1\n";
stream << GlobalConfig->pathToIp + " route add $(cat \"" + OldDefaultroute + "\")\n";
// stream << GlobalConfig->pathToIp + " route add $(cat \"/var/run/vpnc/defaultroute\")\n";
@@ -9831,18 +9831,18 @@ void KVpnc::disconnectClicked()
}
//if (!restoreResolvConf())
- //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").arg(""),GlobalConfig->error);
+ //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").tqarg(""),GlobalConfig->error);
stream << GlobalConfig->pathToIp + " route flush cache\n";
file.close();
- DisconnectProcess = new QProcess ();
+ DisconnectProcess = new TQProcess ();
DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
DisconnectProcess->addArgument ( VpncDisconnectScript );
- connect ( DisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_disconnect() ) );
- connect ( DisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_disconnect() ) );
+ connect ( DisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_disconnect() ) );
if ( !DisconnectProcess->start ( env ) )
{
@@ -9856,12 +9856,12 @@ void KVpnc::disconnectClicked()
DisconnectProcess=0L;
}
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
- setGuiStatus ( disconnected );
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ setGuitqStatus ( disconnected );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
timer.stop();
connectionEnded();
}
@@ -9873,7 +9873,7 @@ void KVpnc::disconnectClicked()
{
CiscoVpncProcess->kill();
CiscoVpncProcess->tryTerminate();
- QTimer::singleShot ( 5000, CiscoVpncProcess, SLOT ( kill() ) );
+ TQTimer::singleShot ( 5000, CiscoVpncProcess, TQT_SLOT ( kill() ) );
sleep ( 5 );
delete CiscoVpncProcess;
@@ -9883,7 +9883,7 @@ void KVpnc::disconnectClicked()
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
// iptables need the right interface (eth0:1 => eth0)
- QString tmpInterface2 = "";
+ TQString tmpInterface2 = "";
int pointPos = tmpInterface.find ( ':', 0, FALSE );
if ( pointPos > 1 )
{
@@ -9894,12 +9894,12 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
-// if (QFile("/var/run/l2tpd.pid").exists())
+// if (TQFile("/var/run/l2tpd.pid").exists())
// {
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug);
-// QFile L2tpdControlFile ( "/var/run/l2tp-control" );
-// QTextStream stream( &L2tpdControlFile );
+// TQFile L2tpdControlFile ( "/var/run/l2tp-control" );
+// TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "d " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -9912,8 +9912,8 @@ void KVpnc::disconnectClicked()
if ( L2tpdProcess != 0L )
{
L2tpWaitForPppUpTimer.stop();
- disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) );
- disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) );
if ( L2tpdProcess->isRunning() )
{
@@ -9931,14 +9931,14 @@ void KVpnc::disconnectClicked()
if ( OpenL2tpProcess != 0L )
{
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) );
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) );
OpenL2tpProcess->kill();
delete OpenL2tpProcess;
OpenL2tpProcess=0L;
- if ( QFile ( "/var/run/openl2tpd.pid" ).exists() )
- QFile ( "/var/run/openl2tpd.pid" ).remove();
+ if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() )
+ TQFile ( "/var/run/openl2tpd.pid" ).remove();
if ( !Utils ( GlobalConfig, parent ).unloadKernelModule ( "slhc", parent ) )
{
@@ -10000,22 +10000,22 @@ void KVpnc::disconnectClicked()
}
ToolInfo *tool = Utils ( GlobalConfig ).getToolInfo ( "ipsec" );
- QString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
+ TQString realversion = tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).right ( tool->Version.section ( ' ', 1, 1 ).section ( '/', 0, 0 ).length() - 1 );
int IpsecMajor= realversion.section ( '.',0,0 ).toInt();
int IpsecMinor= realversion.section ( '.',1,1 ).toInt();
int IpsecSubMinor= realversion.section ( '.',2,2 ).toInt();
- QString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
+ TQString realtype = tool->Version.section ( ' ', 0, 0 ).lower();
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackDeleteProcess = new QProcess ( this );
+ IpsecWhackDeleteProcess = new TQProcess ( this );
IpsecWhackDeleteProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackDeleteProcess->addArgument ( "whack" );
IpsecWhackDeleteProcess->addArgument ( "--name" );
IpsecWhackDeleteProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackDeleteProcess->addArgument ( "--delete" );
- connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackdelete() ) );
- connect ( IpsecWhackDeleteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackdelete() ) );
+ connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhackdelete() ) );
+ connect ( IpsecWhackDeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhackdelete() ) );
if ( !IpsecWhackDeleteProcess->start ( env ) )
{
@@ -10043,7 +10043,7 @@ void KVpnc::disconnectClicked()
delete IpsecWhackDeleteProcess;
IpsecWhackDeleteProcess=0L;
- IpsecStartProcess = new QProcess ( this );
+ IpsecStartProcess = new TQProcess ( this );
IpsecStartProcess->addArgument ( GlobalConfig->pathToIpsec );
if ( !IpsecType.contains ( "strongSwan", false ) )
{
@@ -10055,9 +10055,9 @@ void KVpnc::disconnectClicked()
IpsecStartProcess->addArgument ( "stop" );
}
- connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
- connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
- // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( removeRouteFreeswan() ) );
+ 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() ) );
if ( !IpsecStartProcess->start ( env ) )
{
@@ -10092,14 +10092,14 @@ void KVpnc::disconnectClicked()
usleep ( 500 );
}
}
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
+ disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStderr_ipsec() ) );
+ disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) );
delete IpsecStartProcess;
IpsecStartProcess=0L;
// delRouteIpsec();
removeIptablesFreeswan();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->currentConnectRetry=0;
@@ -10108,22 +10108,22 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Restoring original ipsec settings" ), KVpncConfig::debug );
// restore system files
- QString IpsecPrefix = "/etc";
+ TQString IpsecPrefix = "/etc";
// ipsec.conf
- QFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" );
- QTextStream stream ( &originalIpsecConfFile );
- QString originalIpsecConfFileContent = "";
+ TQFile originalIpsecConfFile ( "/etc/ipsec.conf.before.kvpnc" );
+ TQTextStream stream ( &originalIpsecConfFile );
+ TQString originalIpsecConfFileContent = "";
if ( originalIpsecConfFile.exists() )
{
if ( originalIpsecConfFile.open ( IO_ReadOnly ) )
{
- originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() );
+ originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() );
originalIpsecConfFile.close();
}
}
- QFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" );
+ TQFile backupOriginalIpsecConfFile ( "/etc/ipsec.conf" );
stream.setDevice ( &backupOriginalIpsecConfFile );
if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) )
{
@@ -10133,19 +10133,19 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug );
// ipsec.secret
- QFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
+ TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
stream.setDevice ( &originalIpsecSecretFile );
- QString originalIpsecSecretFileContent = "";
+ TQString originalIpsecSecretFileContent = "";
if ( originalIpsecSecretFile.open ( IO_ReadOnly ) )
{
- originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() );
+ originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() );
originalIpsecSecretFile.close();
}
- QFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" );
+ TQFile backupOriginalIpsecSecretFile ( "/etc/ipsec.secrets" );
stream.setDevice ( &backupOriginalIpsecSecretFile );
if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) )
{
@@ -10159,14 +10159,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10226,14 +10226,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10300,8 +10300,8 @@ void KVpnc::disconnectClicked()
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
- QFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" );
- QTextStream stream2 ( &file2 );
+ TQFile file2 ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" );
+ TQTextStream stream2 ( &file2 );
if ( file2.open ( IO_WriteOnly ) )
{
stream2 << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -10315,25 +10315,25 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
// if (RacoonctlProcess !=0 && RacoonctlProcess->isRunning())
// {
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) );
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) );
+// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_racoonctl() ) );
+// disconnect( RacoonctlProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_racoonctl() ) );
//
// RacoonctlProcess->kill();
// }
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
- //if (QFile("/var/run/l2tpd.pid").exists())
+ //if (TQFile("/var/run/l2tpd.pid").exists())
//{
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug);
- // QFile L2tpdControlFile ( "/var/run/l2tp-control" );
- // QTextStream stream( &L2tpdControlFile );
+ // TQFile L2tpdControlFile ( "/var/run/l2tp-control" );
+ // TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "d " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -10341,12 +10341,12 @@ void KVpnc::disconnectClicked()
//}
//else
//{
- // if (QFile("/var/run/l2tpd.pid").exists())
+ // if (TQFile("/var/run/l2tpd.pid").exists())
// {
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for disconnecting l2tp connection"),GlobalConfig->debug);
- // QFile L2tpdControlFile ( "/var/run/l2tp-control" );
- // QTextStream stream( &L2tpdControlFile );
+ // TQFile L2tpdControlFile ( "/var/run/l2tp-control" );
+ // TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "d " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -10359,8 +10359,8 @@ void KVpnc::disconnectClicked()
{
L2tpWaitForPppUpTimer.stop();
- disconnect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) );
- disconnect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) );
+ disconnect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) );
L2tpdProcess->kill();
if ( L2tpdProcess->isRunning() )
@@ -10374,8 +10374,8 @@ void KVpnc::disconnectClicked()
{
if ( OpenL2tpProcess != 0L && OpenL2tpProcess->isRunning() )
{
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) );
- disconnect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) );
+ disconnect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) );
OpenL2tpProcess->tryTerminate();
sleep ( 1 );
if ( OpenL2tpProcess->isRunning() )
@@ -10386,8 +10386,8 @@ void KVpnc::disconnectClicked()
delete OpenL2tpProcess;
OpenL2tpProcess=0L;
- if ( QFile ( "/var/run/openl2tpd.pid" ).exists() )
- QFile ( "/var/run/openl2tpd.pid" ).remove();
+ if ( TQFile ( "/var/run/openl2tpd.pid" ).exists() )
+ TQFile ( "/var/run/openl2tpd.pid" ).remove();
}
}
@@ -10444,8 +10444,8 @@ void KVpnc::disconnectClicked()
if ( RacoonTailProcess != 0 && RacoonTailProcess->isRunning() )
{
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) );
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) );
// terminateConnection( RacoonTailProcess );
RacoonTailProcess->kill();
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -10453,7 +10453,7 @@ void KVpnc::disconnectClicked()
}
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "%1 tunnel state: %2" ).arg ( "racoon" ).arg ( QString().setNum ( racoon_tunnel_state ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 tunnel state: %2" ).arg ( "racoon" ).arg ( TQString().setNum ( racoon_tunnel_state ) ) , GlobalConfig->debug );
if ( racoon_tunnel_state==1 )
@@ -10477,8 +10477,8 @@ void KVpnc::disconnectClicked()
if ( RacoonProcess != 0 && RacoonProcess->isRunning() )
{
- disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
- disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) );
// terminateConnection( RacoonProcess );
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -10498,14 +10498,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10565,14 +10565,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10636,8 +10636,8 @@ void KVpnc::disconnectClicked()
if ( PptpProcess != 0 && PptpProcess->isRunning())
{
- disconnect ( PptpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- disconnect ( PptpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
// try to kill the pptp process self
PptpProcess->tryTerminate();
@@ -10650,7 +10650,7 @@ void KVpnc::disconnectClicked()
// if ( PptpProcess != 0 && PptpProcess->isRunning())
// {
-// QProcess *pptpdKillProcess = new QProcess ( this );
+// TQProcess *pptpdKillProcess = new TQProcess ( this );
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry ( i18n ( "No pid file, trying to terminate %1 with killall..." ).arg ( "pptp" ), GlobalConfig->debug );
// pptpdKillProcess->addArgument ( GlobalConfig->pathToKillall );
@@ -10659,12 +10659,12 @@ void KVpnc::disconnectClicked()
//
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
-// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
+// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -TERM "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
// while ( pptpdKillProcess->isRunning() )
// {
// sleep ( 1 );
@@ -10682,12 +10682,12 @@ void KVpnc::disconnectClicked()
// {
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
-// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
+// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -KILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
// }
// usleep ( 500 );
// if (GlobalConfig->appPointer->hasPendingEvents())
@@ -10706,12 +10706,12 @@ void KVpnc::disconnectClicked()
//
// if ( !pptpdKillProcess->start ( env ) )
// {
-// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) );
+// KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
-// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
+// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( GlobalConfig->pathToKillall+" -SIGKILL "+GlobalConfig->pathToPptp ) ) , GlobalConfig->debug );
// while ( pptpdKillProcess->isRunning() )
// {
// usleep ( 500 );
@@ -10730,8 +10730,8 @@ void KVpnc::disconnectClicked()
// write pppd.<profile>.down
- QFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
- QTextStream downstream ( &downfile );
+ TQFile downfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
+ TQTextStream downstream ( &downfile );
if ( downfile.open ( IO_WriteOnly ) )
{
downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -10768,7 +10768,7 @@ void KVpnc::disconnectClicked()
downfile.close();
}
- QProcess *pppdDownProcess = new QProcess ( this );
+ TQProcess *pppdDownProcess = new TQProcess ( this );
pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell );
pppdDownProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".down" );
@@ -10815,14 +10815,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10881,14 +10881,14 @@ void KVpnc::disconnectClicked()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -10945,7 +10945,7 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
connectionEnded();
@@ -10954,7 +10954,7 @@ void KVpnc::disconnectClicked()
{
if ( managementhandler )
{
- disconnect ( managementhandler, SIGNAL ( terminate_openvpn() ), this, SLOT ( disconnectClicked() ) );
+ disconnect ( managementhandler, TQT_SIGNAL ( terminate_openvpn() ), this, TQT_SLOT ( disconnectClicked() ) );
managementhandler->greetingtimer.stop();
managementhandler->closeConnection();
while( ! managementhandler->socketReallyClosed )
@@ -10966,13 +10966,13 @@ void KVpnc::disconnectClicked()
delete managementhandler;
}
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- //disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
- //disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) );
+ 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() ) );
if ( OpenvpnProcess != 0 && OpenvpnProcess->isRunning() )
{
//OpenvpnProcess->tryTerminate();
- //QTimer::singleShot ( 2000, OpenvpnProcess, SLOT ( kill() ) );
+ //TQTimer::singleShot ( 2000, OpenvpnProcess, TQT_SLOT ( kill() ) );
OpenvpnProcess->kill();
}
@@ -10988,19 +10988,19 @@ void KVpnc::disconnectClicked()
if ( VtundProcess != 0 )
{
VtundProcess->tryTerminate();
- QTimer::singleShot ( 2000, VtundProcess, SLOT ( kill() ) );
+ TQTimer::singleShot ( 2000, VtundProcess, TQT_SLOT ( kill() ) );
}
// terminateConnection( VtundProcess );
- // VtundProcess = new QProcess ();
+ // VtundProcess = new TQProcess ();
// VtundProcess->addArgument( GlobalConfig->pathToKillall );
// VtundProcess->addArgument( "vtund" );
//
- // connect( VtundProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) );
- // connect( VtundProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) );
+ // connect( VtundProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) );
+ // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
// }
// else
// {
@@ -11009,7 +11009,7 @@ void KVpnc::disconnectClicked()
// delete VtundProcess;
// VtundProcess=0L;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
sleep ( 2 );
delete VtundProcess;
VtundProcess=0L;
@@ -11023,20 +11023,20 @@ void KVpnc::disconnectClicked()
if ( SshProcess != 0 )
{
// SshProcess->tryTerminate();
-// QTimer::singleShot ( 5000, SshProcess, SLOT ( kill() ) );
+// TQTimer::singleShot ( 5000, SshProcess, TQT_SLOT ( kill() ) );
SshProcess->kill();
}
// terminateConnection( SshProcess );
- // SshProcess = new QProcess ();
+ // SshProcess = new TQProcess ();
// SshProcess->addArgument( GlobalConfig->pathToKillall );
// SshProcess->addArgument( "openvpn" );
//
- // connect( SshProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) );
- // connect( SshProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) );
+ // connect( SshProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) );
+ // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
// }
else
{
@@ -11045,11 +11045,11 @@ void KVpnc::disconnectClicked()
delete SshProcess;
SshProcess=0L;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
//connectionEnded();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
ConnectingProcess = -1;
}
else
@@ -11057,7 +11057,7 @@ void KVpnc::disconnectClicked()
prevConnectionState = disconnected;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Not connected.\n" ), GlobalConfig->debug );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
ConnectingProcess = -1;
}
@@ -11070,51 +11070,51 @@ void KVpnc::helpClicked()
/*
mw->DebugOutput->append( "getting userID:\n" );
- QString leftid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", true ); // we
+ TQString leftid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", true ); // we
mw->DebugOutput->append( "getting issuerID:\n" );
- QString rightid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", false ); // remote
+ TQString rightid = getX509CertificateID( "/etc/racoon/certs/mykeys_thielecke.pem", false ); // remote
*/
//doPingTest();
- // QString buggystring= "aaaaa::::bbbb cccc$$$***//////";
- // mw->DebugOutput->append(QString("Buggy string: "+buggystring));
- // buggystring.replace(QRegExp("[*]+"),"_");
- // buggystring.replace(QRegExp("[+] +"),"_");
- // buggystring.replace(QRegExp("[$]+"),"_");
- // buggystring.replace(QRegExp(":+"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("+"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("ᅵ"),"_");
- // buggystring.replace(QRegExp("\\+"),"_");
- // buggystring.replace(QRegExp("/+"),"_");
- // buggystring.replace(QRegExp(";+"),"_");
- // buggystring.replace(QRegExp(" "),"_");
- // buggystring.replace(QRegExp("_+"),"_");
+ // TQString buggystring= "aaaaa::::bbbb cccc$$$***//////";
+ // mw->DebugOutput->append(TQString("Buggy string: "+buggystring));
+ // buggystring.replace(TQRegExp("[*]+"),"_");
+ // buggystring.replace(TQRegExp("[+] +"),"_");
+ // buggystring.replace(TQRegExp("[$]+"),"_");
+ // buggystring.replace(TQRegExp(":+"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("+"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("ᅵ"),"_");
+ // buggystring.replace(TQRegExp("\\+"),"_");
+ // buggystring.replace(TQRegExp("/+"),"_");
+ // buggystring.replace(TQRegExp(";+"),"_");
+ // buggystring.replace(TQRegExp(" "),"_");
+ // buggystring.replace(TQRegExp("_+"),"_");
//
- // mw->DebugOutput->append(QString("Buggy string fixed: "+buggystring));
+ // mw->DebugOutput->append(TQString("Buggy string fixed: "+buggystring));
// HelpDialog d1;
// d1.exec();
// slotStatusMsg ( i18n( "Help dialog called." ), ID_FLASH_MSG );
- // QString host = "www.fdkldghgfdsfjhsjfgdjhsgfds.de";
- // QString ip = Utils( GlobalConfig, parent ).resolveName(host, parent);
+ // TQString host = "www.fdkldghgfdsfjhsjfgdjhsgfds.de";
+ // TQString ip = Utils( GlobalConfig, parent ).resolveName(host, parent);
// if (ip=="0.0.0.0")
- // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host) );
// else
- // mw->DebugOutput->append( QString("first ip of "+host+": "+ip ));
+ // mw->DebugOutput->append( TQString("first ip of "+host+": "+ip ));
//
- // QString host2 = "www.hs-harz.de";
- // QString ip2 = Utils( GlobalConfig, parent ).resolveName(host2, parent);
+ // TQString host2 = "www.hs-harz.de";
+ // TQString ip2 = Utils( GlobalConfig, parent ).resolveName(host2, parent);
// if (ip2=="0.0.0.0")
- // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host2) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host2) );
// else
- // mw->DebugOutput->append( QString("first ip of "+host2+": "+ip2 ));
+ // mw->DebugOutput->append( TQString("first ip of "+host2+": "+ip2 ));
// if (Utils( GlobalConfig, parent ).loadKernelModule("parport_pc",parent))
// mw->DebugOutput->append( "Loading module ok" );
@@ -11125,13 +11125,13 @@ void KVpnc::helpClicked()
// appHelpActivated ();
- // QString bin="/a/b/c/myexe";
+ // TQString bin="/a/b/c/myexe";
// kdDebug() << "bin: " << bin.section('/',-1,-1) << endl;
// kdDebug() << "path: " << bin.section('/',0,-2) << endl;
// // looking for vpnc
// if ( GlobalConfig->useDefaultPaths ){
- // GlobalConfig->pathToVpnc= KStandardDirs::findExe("vpnc",QString::null);
+ // GlobalConfig->pathToVpnc= KStandardDirs::findExe("vpnc",TQString());
// kdDebug() << "vpnc found at; " << GlobalConfig->pathToVpnc << endl;
// }
// if ( GlobalConfig->pathToVpnc.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToVpnc.section('/',-1,-1),GlobalConfig->pathToVpnc.section('/',0,-2)).isEmpty())
@@ -11143,13 +11143,13 @@ void KVpnc::helpClicked()
/* network tests */
- // QString iface = "eth2";
+ // TQString iface = "eth2";
// if ( Utils(GlobalConfig,this).isValidNetworkDevice(iface) )
// std::cout << iface <<" is a valid network interface" << "\n";
// else
// std::cout << iface << " is not valid network interface" << "\n";
//
- // QString iface2 = "eth3";
+ // TQString iface2 = "eth3";
// if ( Utils(GlobalConfig,this).isValidNetworkDevice(iface2) )
// std::cout << iface2 <<" is a valid network interface" << "\n";
// else
@@ -11157,41 +11157,41 @@ void KVpnc::helpClicked()
/*
NetworkInterface iface(GlobalConfig,parent);
bool success = iface.interfaceExist( "eth0" );
- QString succString;
+ TQString succString;
if ( success == true )
mw->DebugOutput->append( "Testing interface eth0: success" );
else
mw->DebugOutput->append( "Testing interface eth0: failed" );
- QStringList list = iface.getAllNetworkInterfaces();
- QString netliststring="";
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
- QString aa = QString( *it );
+ TQStringList list = iface.getAllNetworkInterfaces();
+ TQString netliststring="";
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+ TQString aa = TQString( *it );
netliststring+=" ";
netliststring+=aa;
}
mw->DebugOutput->append( "All network interfaces:"+netliststring );
- QString defaultinterface = iface.getDefaultInterface();
+ TQString defaultinterface = iface.getDefaultInterface();
if ( defaultinterface.isEmpty() )
defaultinterface += "none";
mw->DebugOutput->append( "Defaultinterface: "+defaultinterface );
- QString interfaceaddress = "Interface address for ip 127.0.0.1: " + iface.getInterfaceAddress( "127.0.0.1" );
+ TQString interfaceaddress = "Interface address for ip 127.0.0.1: " + iface.getInterfaceAddress( "127.0.0.1" );
if ( interfaceaddress.isEmpty() )
interfaceaddress += "none";
mw->DebugOutput->append( interfaceaddress );
- QString interfaceip = "Interface IP of eth1:2: " + iface.getInterfaceIP( "eth1:2" );
+ TQString interfaceip = "Interface IP of eth1:2: " + iface.getInterfaceIP( "eth1:2" );
if ( interfaceip.isEmpty() )
interfaceip += "none";
mw->DebugOutput->append( interfaceip );
*/
// NetworkInterface iface(GlobalConfig,parent);
-// QString gatewayofdefaultinterface = "GW IP of default interface: " + iface.getGatewayOfDefaultInterface();
+// TQString gatewayofdefaultinterface = "GW IP of default interface: " + iface.getGatewayOfDefaultInterface();
// mw->DebugOutput->append( gatewayofdefaultinterface );
-// QString NetmaskOfInterface = "netmask IP of interface: " + iface.getNetmaskOfInterface("wlan0");
+// TQString NetmaskOfInterface = "netmask IP of interface: " + iface.getNetmaskOfInterface("wlan0");
// mw->DebugOutput->append( NetmaskOfInterface );
/*
if (iface.inSameNetwork("192.168.10.253","255.255.255.0","192.168.10.222","255.255.255.0"))
@@ -11205,20 +11205,20 @@ void KVpnc::helpClicked()
mw->DebugOutput->append("192.168.10.253 in same network as 192.168.1.2: no");
*/
/*
- QString gatewayofinterface = "GW IP of interface eth1:1: " + iface.getGatewayOfInterface("eth1:1");
+ TQString gatewayofinterface = "GW IP of interface eth1:1: " + iface.getGatewayOfInterface("eth1:1");
mw->DebugOutput->append( gatewayofinterface );
mw->DebugOutput->append( "www.sun.de => "+Utils(GlobalConfig).resolveName("www.sun.de") );
*/
/*
- QString ipstring = "aaa\ngot address 194.95.192.28\nbbbb\ncccc";
- mw->DebugOutput->append(QString("Ipstring: \n"+ipstring));
- QString ip = ipstring.section('\n',1,1);
+ TQString ipstring = "aaa\ngot address 194.95.192.28\nbbbb\ncccc";
+ mw->DebugOutput->append(TQString("Ipstring: \n"+ipstring));
+ TQString ip = ipstring.section('\n',1,1);
ip = ip.right(ip.length()-12);
- mw->DebugOutput->append(QString("Ip: "+ip));
+ mw->DebugOutput->append(TQString("Ip: "+ip));
*/
// NetworkInterface iface(parent);
- // QString extIP = iface.getExternalIpAddress();
+ // TQString extIP = iface.getExternalIpAddress();
// if ( extIP.isEmpty() )
// extIP += "none";
//
@@ -11232,30 +11232,30 @@ void KVpnc::helpClicked()
// if (GlobalConfig->wallet != 0)
// {
//
- // QString walletname="kvpnc";
+ // TQString walletname="kvpnc";
// // Check if folder exists, otherwise create it
//
// if (!GlobalConfig->wallet->hasFolder(walletname))
// {
// bool walletOK = GlobalConfig->wallet->createFolder(walletname);
// GlobalConfig->wallet->setFolder(walletname);
- // QString account="HS";
+ // TQString account="HS";
//
- // QString loginname="masta";
- // QString pwd="secret";
+ // TQString loginname="masta";
+ // TQString pwd="secret";
// std::cout << "[set] account: " << account << ", loginname: " << loginname << ", password: " << pwd << std::endl;
//
- // bool pwdOK = (GlobalConfig->wallet->writePassword (QString(account+"_"+loginname), pwd) == 0);
+ // bool pwdOK = (GlobalConfig->wallet->writePassword (TQString(account+"_"+loginname), pwd) == 0);
// std::cout << "success: " << pwdOK << std::endl;
// }
// // Read password entry
//
// {
// GlobalConfig->wallet->setFolder(walletname);
- // QString loginname="masta";
- // QString pwd="";
- // QString account="HS";
- // bool pwdOK = (GlobalConfig->wallet->readPassword(QString(account+"_"+loginname), pwd) == 0);
+ // TQString loginname="masta";
+ // TQString pwd="";
+ // TQString account="HS";
+ // bool pwdOK = (GlobalConfig->wallet->readPassword(TQString(account+"_"+loginname), pwd) == 0);
// std::cout << "success: " << pwdOK << std::endl;
// std::cout << "[get]: loginname: " << loginname << ", password: " << pwd << std::endl;
//
@@ -11263,12 +11263,12 @@ void KVpnc::helpClicked()
// }
// }
- // QStringList ciphers = Utils(GlobalConfig).getOpenvpnCiphers();
+ // TQStringList ciphers = Utils(GlobalConfig).getOpenvpnCiphers();
//
// std::cout << "ciphers: " << std::endl ;
//
- // for ( QStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) {
- // std::cout << QString(*it).ascii() << "\n";
+ // for ( TQStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it ) {
+ // std::cout << TQString(*it).ascii() << "\n";
// }
// std::cout << std::endl;
@@ -11280,9 +11280,9 @@ void KVpnc::helpClicked()
// mw->DebugOutput->append("private key dont need a passprase ");
/*
- QString testfilename="sfsd/::::( *#v v###\\";
- QString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename);
- cQString("testfilename: \"%1\", cleaned up: \"%2\"").arg(testfilename).arg(cleanedUpName));
+ TQString testfilename="sfsd/::::( *#v v###\\";
+ TQString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename);
+ cTQString("testfilename: \"%1\", cleaned up: \"%2\"").tqarg(testfilename).tqarg(cleanedUpName));
*/
// GlobalConfig->exportKvpncConfig("./kvpnc_export.xml");
@@ -11331,19 +11331,19 @@ void KVpnc::helpClicked()
// Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto();
//
// // phase 2 encr algos from kernel
-// QString EncrAlgos="";
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
+// TQString EncrAlgos="";
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
// {
-// EncrAlgos+= QString(", "+*it );
+// EncrAlgos+= TQString(", "+*it );
// }
// mw->DebugOutput->append( "Kernel encryption algos:\n");
// mw->DebugOutput->append( EncrAlgos+"\n");
//
// // phase 2 auth algos from kernel
-// QString AuthAlgos="";
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
+// TQString AuthAlgos="";
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
// {
-// AuthAlgos+= QString(", "+*it );
+// AuthAlgos+= TQString(", "+*it );
// }
// mw->DebugOutput->append( "Kernel auth algos:\n");
// mw->DebugOutput->append( AuthAlgos+"\n");
@@ -11369,8 +11369,8 @@ void KVpnc::vpnTypesInfoClicked()
void KVpnc::donateClicked()
{
this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG );
- QString donateurl = "http://home.gna.org/kvpnc/en/donate.html";
- QString browser = QString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+ TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html";
+ TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
if ( browser.isEmpty() )
browser = "konqueror";
@@ -11379,12 +11379,12 @@ void KVpnc::donateClicked()
if ( run )
;
-// DonateProcess = new QProcess ( this );
+// DonateProcess = new TQProcess ( this );
// DonateProcess->addArgument ( browser );
// DonateProcess->addArgument ( donateurl );
//
-// // connect( DonateProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_bugreport() ) );
-// // connect( DonateProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_bugreport() ) );
+// // connect( DonateProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) );
+// // connect( DonateProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) );
//
// if ( !DonateProcess->start(env) )
// {
@@ -11406,8 +11406,8 @@ void KVpnc::donateClicked()
void KVpnc::reportBugClicked()
{
- QString bugreporturl = "https://gna.org/bugs/?group=kvpnc";
- QString browser = QString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+ TQString bugreporturl = "https://gna.org/bugs/?group=kvpnc";
+ TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
if ( browser.isEmpty() )
browser = "konqueror";
@@ -11416,12 +11416,12 @@ void KVpnc::reportBugClicked()
// if ( run )
// ;
- BugReportProcess = new QProcess ( this );
+ BugReportProcess = new TQProcess ( this );
BugReportProcess->addArgument ( browser );
BugReportProcess->addArgument ( bugreporturl );
- // connect( BugReportProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_bugreport() ) );
- // connect( BugReportProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_bugreport() ) );
+ // connect( BugReportProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_bugreport() ) );
+ // connect( BugReportProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_bugreport() ) );
if ( !BugReportProcess->start ( env ) )
{
@@ -11454,7 +11454,7 @@ void KVpnc::readOutputFrom_vpnc()
while ( VpncProcess->canReadLineStdout() )
{
ProcessMsg_connect = VpncProcess->readLineStdout();
- // ProcessMsg_connect = QString( VpncProcess->readStdout() );
+ // ProcessMsg_connect = TQString( VpncProcess->readStdout() );
if ( deviceaddrstr2addr )
@@ -11462,13 +11462,13 @@ void KVpnc::readOutputFrom_vpnc()
deviceaddrstr = ProcessMsg_connect;
// if (GlobalConfig->KvpncDebugLevel > 0)
- // this->GlobalConfig->appendLogEntry ( QString ( "deviceaddrstr: " + deviceaddrstr ),GlobalConfig->debug);
- deviceaddr = "addr: " + QString ( deviceaddrstr.simplifyWhiteSpace ().section ( ' ', 1, 1 ) ).section ( ':', 1, 1 );
+ // this->GlobalConfig->appendLogEntry ( TQString ( "deviceaddrstr: " + deviceaddrstr ),GlobalConfig->debug);
+ deviceaddr = "addr: " + TQString ( deviceaddrstr.simplifyWhiteSpace ().section ( ' ', 1, 1 ) ).section ( ':', 1, 1 );
// if (GlobalConfig->KvpncDebugLevel > 0)
// this->GlobalConfig->appendLogEntry ( deviceaddr,GlobalConfig->debug); //
deviceaddrstr2addr = false;
- //disconnect( VpncProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutputFrom_vpnc() ) );
- //disconnect( VpncProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutputFrom_vpnc() ) );
+ //disconnect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) );
+ //disconnect( VpncProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutputFrom_vpnc() ) );
}
/* TMP !!!! */
@@ -11480,7 +11480,7 @@ void KVpnc::readOutputFrom_vpnc()
- QString GrpPassStr = "";
+ TQString GrpPassStr = "";
GrpPassStr = GlobalConfig->TmpGroupPassword;
@@ -11488,7 +11488,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).arg(GrpPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).tqarg(GrpPassStr), GlobalConfig->debug );
}
@@ -11499,12 +11499,12 @@ void KVpnc::readOutputFrom_vpnc()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password requested, send it..." ), GlobalConfig->debug );
- QString UserPassStr = GlobalConfig->TmpPassword;
+ TQString UserPassStr = GlobalConfig->TmpPassword;
VpncProcess->writeToStdin ( UserPassStr );
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).arg(UserPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).tqarg(UserPassStr), GlobalConfig->debug );
}
@@ -11516,8 +11516,8 @@ void KVpnc::readOutputFrom_vpnc()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec gateway address requested, send it..." ), GlobalConfig->debug );
- //QString GatewayStr = GlobalConfig->currentProfile->getGateway();
- QString GatewayStr = GlobalConfig->TmpGatewayIP;
+ //TQString GatewayStr = GlobalConfig->currentProfile->getGateway();
+ TQString GatewayStr = GlobalConfig->TmpGatewayIP;
VpncProcess->writeToStdin ( GatewayStr );
VpncProcess->writeToStdin ( "\n" );
}
@@ -11528,7 +11528,7 @@ void KVpnc::readOutputFrom_vpnc()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec ID requested, send it..." ), GlobalConfig->debug );
- QString IpsecIDStr = GlobalConfig->currentProfile->getID();
+ TQString IpsecIDStr = GlobalConfig->currentProfile->getID();
VpncProcess->writeToStdin ( IpsecIDStr );
VpncProcess->writeToStdin ( "\n" );
}
@@ -11539,14 +11539,14 @@ void KVpnc::readOutputFrom_vpnc()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Username requested, send it..." ), GlobalConfig->debug );
- QString UsernameStr;
+ TQString UsernameStr;
UsernameStr = GlobalConfig->TmpUsername;
VpncProcess->writeToStdin ( UsernameStr );
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).arg(UsernameStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).tqarg(UsernameStr), GlobalConfig->debug );
}
@@ -11590,11 +11590,11 @@ void KVpnc::readOutputFrom_vpnc()
GlobalConfig->status = GlobalConfig->connected;
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
NetworkInterface iface ( GlobalConfig, parent );
@@ -11620,16 +11620,16 @@ void KVpnc::readOutputFrom_vpnc()
bool abort = false;
bool doContinue = true;
- //ProcessMsg_connect = QString(VpncProcess->readStdout());
+ //ProcessMsg_connect = TQString(VpncProcess->readStdout());
// if ( this->GlobalConfig->VpncDebugLevel > 0 )
- // this->GlobalConfig->appendLogEntry ( QString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error);
+ // this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error);
if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, FALSE ) > -1 )
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) );
+ disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) );
timer.stop();
connectClicked();
}
@@ -11657,13 +11657,13 @@ void KVpnc::readOutputFrom_vpnc()
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_vpnc() ) );
+ disconnect ( VpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_vpnc() ) );
timer.stop();
connectClicked();
}
@@ -11673,7 +11673,7 @@ void KVpnc::readOutputFrom_vpnc()
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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,28 +11750,28 @@ void KVpnc::readOutputFrom_vpnc()
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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 ( QString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug );
- // QFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" );
+ GlobalConfig->appendLogEntry ( TQString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug );
+ // TQFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" );
// if (oldpidfile.exists())
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
- // QTextStream pidFileStream( &oldpidfile );
- // QString Vpnc_pid = "";
+ // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ // TQTextStream pidFileStream( &oldpidfile );
+ // TQString Vpnc_pid = "";
// if ( oldpidfile.open( IO_ReadOnly ) )
// {
// Vpnc_pid = pidFileStream.readLine();
// oldpidfile.close();
// }
- // QProcess killvpncprocess(this);
+ // TQProcess killvpncprocess(this);
// if ( !Vpnc_pid.isEmpty() )
// {
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
// killvpncprocess.addArgument(GlobalConfig->pathToKill);
// killvpncprocess.addArgument("-3");
// killvpncprocess.addArgument(Vpnc_pid);
@@ -11787,7 +11787,7 @@ void KVpnc::readOutputFrom_vpnc()
// killvpncprocess.addArgument("vpnc");
//
// if (!killvpncprocess.start())
- // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11795,12 +11795,12 @@ void KVpnc::readOutputFrom_vpnc()
// else
// {
// //kill vpnc
- // QProcess killvpncprocess(this);
+ // TQProcess killvpncprocess(this);
// killvpncprocess.addArgument(GlobalConfig->pathToKillall);
// killvpncprocess.addArgument("vpnc");
//
// if (!killvpncprocess.start())
- // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11813,22 +11813,22 @@ void KVpnc::readOutputFrom_vpnc()
//
// VpncDisconnectScript = tmpPath + "vpnc-disconnect." + GlobalConfig->currentProfile->getID() + ".sh";
//
- // QString OldDefaultroute="";
- // QString oldProfileName="";
+ // TQString OldDefaultroute="";
+ // TQString oldProfileName="";
//
- // QDir tmpDir(tmpPath);
+ // TQDir tmpDir(tmpPath);
//
- // QStringList lst = tmpDir.entryList( "default-route.*" );
+ // TQStringList lst = tmpDir.entryList( "default-route.*" );
// if (!lst.isEmpty())
// {
// OldDefaultroute = lst.first(); // default-route.<id>
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).arg(OldDefaultroute), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).tqarg(OldDefaultroute), GlobalConfig->debug );
//
//
- // QFile file( VpncDisconnectScript );
- // QTextStream stream( &file );
+ // TQFile file( VpncDisconnectScript );
+ // TQTextStream stream( &file );
// if ( file.open( IO_WriteOnly ) )
// {
// // stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -11848,7 +11848,7 @@ void KVpnc::readOutputFrom_vpnc()
// stream << "if [ -f /sbin/resolvconf ] ; then\n";
// stream << "sbin/resolvconf -d "+GlobalConfig->DnsDevice+"\n";
// oldProfileName=OldDefaultroute.section('/',-2,-1); // /root/.kde/share/apps/kvpnc/default-route.<name> -> <name>
- // if (!oldProfileName.isEmpty() &&QFile("/etc/resolv.conf.before.kvpnc_"+oldProfileName).exists() )
+ // if (!oldProfileName.isEmpty() &&TQFile("/etc/resolv.conf.before.kvpnc_"+oldProfileName).exists() )
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Old resolv.conf file found, restore it." ), GlobalConfig->debug );
@@ -11867,23 +11867,23 @@ void KVpnc::readOutputFrom_vpnc()
// }
// file.close();
//
- // DisconnectProcess = new QProcess ();
+ // DisconnectProcess = new TQProcess ();
// DisconnectProcess->addArgument( GlobalConfig->InterpreterShell );
// DisconnectProcess->addArgument( VpncDisconnectScript );
//
- // connect( DisconnectProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_disconnect() ) );
- // connect( DisconnectProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_disconnect() ) );
+ // connect( DisconnectProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_disconnect() ) );
+ // connect( DisconnectProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc_disconnect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc_disconnect" ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug );
// }
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// connectionEnded();
// }
//
@@ -11892,15 +11892,15 @@ void KVpnc::readOutputFrom_vpnc()
//
// connectClicked();
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -11922,24 +11922,24 @@ void KVpnc::readOutputFrom_vpnc()
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another program is running at this port, terminate it and try reconnect ." ), GlobalConfig->debug );
/*
- QFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" );
+ TQFile oldpidfile( tmpPath + "vpnc-pid." + GlobalConfig->currentProfile->getName() + ".pid" );
if (oldpidfile.exists())
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
- QTextStream pidFileStream( &oldpidfile );
- QString Vpnc_pid = "";
+ GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ TQTextStream pidFileStream( &oldpidfile );
+ TQString Vpnc_pid = "";
if ( oldpidfile.open( IO_ReadOnly ) )
{
Vpnc_pid = pidFileStream.readLine();
oldpidfile.close();
}
- QProcess killvpncprocess(this);
+ TQProcess killvpncprocess(this);
if ( !Vpnc_pid.isEmpty() )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug);
+ GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
killvpncprocess.addArgument(GlobalConfig->pathToKill);
killvpncprocess.addArgument("-3");
killvpncprocess.addArgument(Vpnc_pid);
@@ -11955,7 +11955,7 @@ void KVpnc::readOutputFrom_vpnc()
killvpncprocess.addArgument("vpnc");
if (!killvpncprocess.start())
- GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -11963,12 +11963,12 @@ void KVpnc::readOutputFrom_vpnc()
else
{
//kill vpnc
- QProcess killvpncprocess(this);
+ TQProcess killvpncprocess(this);
killvpncprocess.addArgument(GlobalConfig->pathToKillall);
killvpncprocess.addArgument("vpnc");
if (!killvpncprocess.start())
- GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -11990,7 +11990,7 @@ void KVpnc::readOutputFrom_vpnc()
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
KMessageBox::error ( this, i18n ( "Invalid ISAKMP exchange type received" ) );
GlobalConfig->appendLogEntry ( i18n ( "Invalid ISAKMP exchange type received" ) , GlobalConfig->error );
abort = true;
@@ -12079,17 +12079,17 @@ void KVpnc::readOutputFrom_ciscovpnc()
bool terminatedByClient=false;
//mw->DebugOutput->append( "readOutputFrom_vpnc!\n" );
- QString line2 = QString ( CiscoVpncProcess->readStdout() );
- QStringList lines = QStringList::split ( '\n', line2 );
- for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it )
+ TQString line2 = TQString ( CiscoVpncProcess->readStdout() );
+ TQStringList lines = TQStringList::split ( '\n', line2 );
+ for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it )
// while ( CiscoVpncProcess->canReadLineStdout() )
{
-// QString ProcessMsg_connect = CiscoVpncProcess->readLineStdout();
-// QString ProcessMsg_connect = QString( CiscoVpncProcess->readStdout() );
- QString ProcessMsg_connect = *it;
+// TQString ProcessMsg_connect = CiscoVpncProcess->readLineStdout();
+// TQString ProcessMsg_connect = TQString( CiscoVpncProcess->readStdout() );
+ TQString ProcessMsg_connect = *it;
if ( GlobalConfig->KvpncDebugLevel> 3 )
- GlobalConfig->appendLogEntry ( QString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug );
if ( ProcessMsg_connect.find ( "illegal read", 0 , FALSE ) > -1 )
@@ -12116,17 +12116,17 @@ void KVpnc::readOutputFrom_ciscovpnc()
{
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug );
- GlobalConfig->appendLogEntry ( QString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "binding" + ProcessMsg_connect ), GlobalConfig->debug );
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -12169,7 +12169,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Username requested, send it...\n" ), GlobalConfig->debug );
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -12186,7 +12186,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
- QString UserPassStr = "";
+ TQString UserPassStr = "";
if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry )
UserPassStr = GlobalConfig->TmpPassword;
else
@@ -12205,7 +12205,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
{
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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;
@@ -12238,7 +12238,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Certificate password requested, send it...\n" ), GlobalConfig->debug );
- QString PrivKeyPassStr = "";
+ TQString PrivKeyPassStr = "";
// if (GlobalConfig->currentProfile->getSavePsk())
PrivKeyPassStr = GlobalConfig->currentProfile->getPrivateKeyPass();
// else
@@ -12246,14 +12246,14 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( PrivKeyPassStr.isEmpty() )
{
GlobalConfig->TmpPrivateKeyPass = "";
- QString pass="";
+ TQString pass="";
bool allowEmptyPassword=true;
EnterXauthInteractivePasscodeDialog dlg ( 0, allowEmptyPassword);
dlg.setCaption(i18n ( "Enter certificate password" ) );
dlg.main->DescriptionLabel->setText ( i18n ( "Enter certificate password to unlock certificate:" ) );
dlg.main->LabelPassword->setText ( i18n ( "Certificate password:" ) );
dlg.main->SavePasswordCheckBox->setText ( i18n ( "Save certificate password" ) );
-// dlg.resize(QSize(dlg.width()+20,dlg.height()));
+// dlg.resize(TQSize(dlg.width()+20,dlg.height()));
dlg.main->PasswordEdit->setFocus();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Password for certificate requested...\n" ), GlobalConfig->debug );
@@ -12274,10 +12274,10 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( dlg.main->SavePasswordCheckBox->isChecked() )
{
GlobalConfig->currentProfile->setSavePrivateKeyPassword ( true );
- GlobalConfig->currentProfile->setPrivateKeyPass ( QString ( pass ) );
+ GlobalConfig->currentProfile->setPrivateKeyPass ( TQString ( pass ) );
}
- GlobalConfig->TmpPrivateKeyPass = QString ( pass );
+ GlobalConfig->TmpPrivateKeyPass = TQString ( pass );
// if ( GlobalConfig->KvpncDebugLevel > 5 )
// GlobalConfig->appendLogEntry( "[vpnclient]: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug );
@@ -12322,7 +12322,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
//abort = true;
AuthRetry = true;
GlobalConfig->haveUserData = false;
- disconnect ( CiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutputFrom_ciscovpnc() ) );
+ disconnect ( CiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutputFrom_ciscovpnc() ) );
timer.stop();
connectClicked();
}
@@ -12358,14 +12358,14 @@ void KVpnc::readOutputFrom_ciscovpnc()
if ( ProcessMsg_connect.find ( "Encryption:",0,FALSE ) > -1 )
{
- QString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
+ TQString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Encrypion algorithm used: %1" ).arg ( Encryption ),GlobalConfig->debug );
}
if ( ProcessMsg_connect.find ( "Authentication:",0,FALSE ) > -1 )
{
- QString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
+ TQString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Authentication algorithm used: %1" ).arg ( Authentication ),GlobalConfig->debug );
}
@@ -12380,11 +12380,11 @@ void KVpnc::readOutputFrom_ciscovpnc()
GlobalConfig->status = GlobalConfig->connected;
timer.stop();
connectCounter=0;
- disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
GlobalConfig->AuthRetryCount=0;
@@ -12410,9 +12410,9 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
- //ProcessMsg_connect = QString(CiscoVpncProcess->readStdout());
+ //ProcessMsg_connect = TQString(CiscoVpncProcess->readStdout());
// if ( this->GlobalConfig->VpncDebugLevel > 0 )
- // this->GlobalConfig->appendLogEntry ( QString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error);
+ // this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error);
if ( abort )
{
@@ -12451,12 +12451,12 @@ void KVpnc::wroteToStdin_vpncConfig()
void KVpnc::readFromStdout_racoon()
{
bool abort = false;
-// QString ProcessMsg_connect_raw = QString ( RacoonProcess->readStdout() );
+// TQString ProcessMsg_connect_raw = TQString ( RacoonProcess->readStdout() );
// if (ProcessMsg_connect_raw.length() ==0)
// return;
//
-// QStringList ProcessMsg_connect_raw_list = QStringList::split( '\n', ProcessMsg_connect_raw);
-// for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
+// TQStringList ProcessMsg_connect_raw_list = TQStringList::split( '\n', ProcessMsg_connect_raw);
+// for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
while ( RacoonProcess != 0L && RacoonProcess->canReadLineStdout() )
{
@@ -12550,10 +12550,10 @@ void KVpnc::readFromStdout_racoon()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -12607,10 +12607,10 @@ void KVpnc::readFromStdout_racoon()
L2tpdProcess->kill();
}
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
@@ -12619,23 +12619,23 @@ void KVpnc::readFromStdout_racoon()
if ( Name == "racoon" )
{
- //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error );
- QProcess killracoonprocess ( this );
+ TQProcess killracoonprocess ( this );
killracoonprocess.addArgument ( GlobalConfig->pathToKillall );
killracoonprocess.addArgument ( "racoon" );
if ( !killracoonprocess.start() )
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
abort = true;
}
else
@@ -12653,7 +12653,7 @@ void KVpnc::readFromStdout_racoon()
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RacoonProcess = new QProcess ( this );
+ RacoonProcess = new TQProcess ( this );
RacoonProcess->addArgument ( GlobalConfig->pathToRacoon );
RacoonProcess->addArgument ( "-F" ); // foreground we want :)
// RacoonProcess->addArgument ( "-v" );
@@ -12665,16 +12665,16 @@ void KVpnc::readFromStdout_racoon()
GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug );
- //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
if ( !RacoonProcess->start ( env ) )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
abort = false;
}
else
@@ -12697,14 +12697,14 @@ void KVpnc::readFromStdout_racoon()
}
else
{
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error );
abort = true;
}
}
else
{
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
abort = true;
}
}
@@ -12732,7 +12732,7 @@ void KVpnc::readFromStdout_racoon()
void KVpnc::readFromStderr_racoon()
{
bool abort = false;
-// QString ProcessMsg_connect = QString ( RacoonProcess->readStderr() );
+// TQString ProcessMsg_connect = TQString ( RacoonProcess->readStderr() );
// if (ProcessMsg_connect.length() ==0)
// return;
while ( RacoonProcess != 0L && RacoonProcess->canReadLineStderr() )
@@ -12752,10 +12752,10 @@ void KVpnc::readFromStderr_racoon()
L2tpdProcess->kill();
}
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
@@ -12764,23 +12764,23 @@ void KVpnc::readFromStderr_racoon()
if ( Name == "racoon" )
{
- //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error );
- QProcess killracoonprocess ( this );
+ TQProcess killracoonprocess ( this );
killracoonprocess.addArgument ( GlobalConfig->pathToKillall );
killracoonprocess.addArgument ( "racoon" );
if ( !killracoonprocess.start() )
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
abort = true;
}
else
@@ -12798,7 +12798,7 @@ void KVpnc::readFromStderr_racoon()
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RacoonProcess = new QProcess ( this );
+ RacoonProcess = new TQProcess ( this );
RacoonProcess->addArgument ( GlobalConfig->pathToRacoon );
RacoonProcess->addArgument ( "-F" ); // foreground we want :)
// RacoonProcess->addArgument ( "-v" );
@@ -12810,16 +12810,16 @@ void KVpnc::readFromStderr_racoon()
GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug );
- //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
if ( !RacoonProcess->start ( env ) )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
abort = false;
}
else
@@ -12842,14 +12842,14 @@ void KVpnc::readFromStderr_racoon()
}
else
{
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error );
abort = true;
}
}
else
{
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
abort = true;
}
}
@@ -12990,10 +12990,10 @@ void KVpnc::readFromStderr_racoon()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -13077,7 +13077,7 @@ void KVpnc::readFromStdout_racoon_helper()
while ( RacoonHelperProcess && RacoonHelperProcess->canReadLineStdout() )
{
ProcessMsg_connect = RacoonHelperProcess->readLineStdout();
- // QString ProcessMsg_connect = QString ( RacoonHelperProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString ( RacoonHelperProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( "[racoon helper] " + ProcessMsg_connect, GlobalConfig->debug );
}
@@ -13090,7 +13090,7 @@ void KVpnc::readFromStderr_racoon_helper()
while ( RacoonHelperProcess && RacoonHelperProcess->canReadLineStderr() )
{
ProcessMsg_connect = RacoonHelperProcess->readLineStderr();
-// QString ProcessMsg_connect = QString ( RacoonHelperProcess->readStderr() );
+// TQString ProcessMsg_connect = TQString ( RacoonHelperProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[racoon helper err] " + ProcessMsg_connect, GlobalConfig->error );
bool wrong_algo=false;
@@ -13130,7 +13130,7 @@ void KVpnc::readFromStdout_ipsec()
while ( IpsecStartProcess != 0 && IpsecStartProcess->canReadLineStdout() )
{
ProcessMsg_connect = IpsecStartProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( IpsecStartProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStdout() );
bool NormalMsg = true;
bool ErrorMsg = false;
@@ -13165,15 +13165,15 @@ void KVpnc::readFromStdout_ipsec()
// FATAL ERROR:
if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 )
{
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -13185,9 +13185,9 @@ void KVpnc::readFromStdout_ipsec()
else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 )
{
- QString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', "");
- KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) );
- GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) , GlobalConfig->error );
+ TQString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', "");
+ KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) );
+ GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) , GlobalConfig->error );
abort = true;
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
@@ -13237,7 +13237,7 @@ void KVpnc::readFromStdout_ipsec()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -13251,19 +13251,19 @@ void KVpnc::readFromStderr_ipsec()
while ( IpsecStartProcess->canReadLineStderr() )
{
ProcessMsg_connect = IpsecStartProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( IpsecStartProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStderr() );
if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 )
{
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -13362,7 +13362,7 @@ void KVpnc::readFromStderr_ipsec()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -13373,7 +13373,7 @@ void KVpnc::readFromStdout_ipsecwhack()
while ( IpsecWhackProcess->canReadLineStdout() )
{
ProcessMsg_connect = IpsecWhackProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( IpsecWhackProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackProcess->readStdout() );
bool NormalMsg = true;
bool ErrorMsg = false;
@@ -13429,26 +13429,26 @@ void KVpnc::readFromStdout_ipsecwhack()
else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 )
{
// strongswan after ipsec whack --listen
- /* disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
+ /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) );
+ disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) );
delete(IpsecWhackProcess);*/
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackProcess = new QProcess ( this );
+ IpsecWhackProcess = new TQProcess ( this );
IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackProcess->addArgument ( "whack" );
IpsecWhackProcess->addArgument ( "--name" );
IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackProcess->addArgument ( "--initiate" );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
if ( !IpsecWhackProcess->start ( env ) )
{
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
delete IpsecWhackProcess;
IpsecWhackProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) );
@@ -13472,27 +13472,27 @@ void KVpnc::readFromStdout_ipsecwhack()
sleep ( 3 );
//openswan
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackProcess = new QProcess ( this );
+ IpsecWhackProcess = new TQProcess ( this );
IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackProcess->addArgument ( "whack" );
IpsecWhackProcess->addArgument ( "--name" );
IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackProcess->addArgument ( "--initiate" );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
- QString LogPassword="";
+ TQString LogPassword="";
if ( GlobalConfig->KvpncDebugLevel > 5 )
LogPassword=GlobalConfig->TmpPassword;
else
LogPassword="*****";
if ( !IpsecWhackProcess->start ( env ) )
{
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
delete IpsecWhackProcess;
IpsecWhackProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) );
@@ -13527,27 +13527,27 @@ void KVpnc::readFromStdout_ipsecwhack()
sleep ( 3 );
//openswan
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackProcess = new QProcess ( this );
+ IpsecWhackProcess = new TQProcess ( this );
IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackProcess->addArgument ( "whack" );
IpsecWhackProcess->addArgument ( "--name" );
IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackProcess->addArgument ( "--initiate" );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
- QString LogPassword="";
+ TQString LogPassword="";
if ( GlobalConfig->KvpncDebugLevel > 5 )
LogPassword=GlobalConfig->TmpPassword;
else
LogPassword="*****";
if ( !IpsecWhackProcess->start ( env ) )
{
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
delete IpsecWhackProcess;
IpsecWhackProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) );
@@ -13701,8 +13701,8 @@ void KVpnc::readFromStdout_ipsecwhack()
}
else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 )
{
- QString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
- QString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
+ TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
+ TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
KMessageBox::error ( this, i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) );
GlobalConfig->appendLogEntry ( i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) , GlobalConfig->error );
int result = KMessageBox::questionYesNo ( this, i18n ( "Do you want to use \"%1\" instead of \"%2\" as remote ID and reconnect?" ).arg ( PeerID ).arg ( OurID ), i18n ( "Fix remote ID?" ) );
@@ -13733,7 +13733,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "deleting state (STATE_TQUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 )
{
//KMessageBox::error ( this, i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13761,7 +13761,7 @@ void KVpnc::readFromStdout_ipsecwhack()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -13778,7 +13778,7 @@ void KVpnc::readFromStderr_ipsecwhack()
bool abort = false;
ProcessMsg_connect = IpsecWhackProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( IpsecWhackProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[ipsec whack err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -13795,14 +13795,14 @@ void KVpnc::readFromStderr_ipsecwhack()
//
// if (GlobalConfig->doKillIpsecIfStillRunning)
// {
- // QProcess killipsecprocess(this);
+ // TQProcess killipsecprocess(this);
// killipsecprocess.addArgument(GlobalConfig->pathToKillall);
// killipsecprocess.addArgument("ipsec");
//
// if (!killipsecprocess.start())
// {
- // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("ipsec") ,GlobalConfig->error);
- // GlobalConfig->appendLogEntry ( QString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("ipsec") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug );
// abort = true;
// }
// else
@@ -13817,7 +13817,7 @@ void KVpnc::readFromStderr_ipsecwhack()
// // IpsecProcess->kill();
//
// putenv( ( char* ) ( "LC_ALL=C" ) );
- // IpsecProcess = new QProcess ( this );
+ // IpsecProcess = new TQProcess ( this );
// IpsecProcess->addArgument( GlobalConfig->pathToIpsec );
// IpsecProcess->addArgument( "-F" ); // foreground we want :)
// IpsecProcess->addArgument( "-f" );
@@ -13830,15 +13830,15 @@ void KVpnc::readFromStderr_ipsecwhack()
// if ( !IpsecProcess->start(env) )
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).arg( "l2tpd" ), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).tqarg( "l2tpd" ), GlobalConfig->error );
//
- // GlobalConfig->appendLogEntry ( QString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug );
// abort=false;
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).arg( "ipsec" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).tqarg( "ipsec" ), GlobalConfig->debug );
// }
// }
// }
@@ -13853,15 +13853,15 @@ void KVpnc::readFromStderr_ipsecwhack()
if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 )
{
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -13956,8 +13956,8 @@ void KVpnc::readFromStderr_ipsecwhack()
}
else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 )
{
- QString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
- QString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
+ TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
+ TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
KMessageBox::error ( this, i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) );
GlobalConfig->appendLogEntry ( i18n ( "Wrong ID \"%1\" from peer got, we expect \"%2\"." ).arg ( PeerID ).arg ( OurID ) , GlobalConfig->error );
int result = KMessageBox::questionYesNo ( this, i18n ( "Do you want to use \"%1\" instead of \"%2\" as remote ID and reconnect?" ).arg ( PeerID ).arg ( OurID ), i18n ( "Fix remote ID?" ) );
@@ -13986,7 +13986,7 @@ void KVpnc::readFromStderr_ipsecwhack()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --initiate" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -13999,7 +13999,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
while ( IpsecWhackListenProcess->canReadLineStdout() )
{
ProcessMsg_connect = IpsecWhackListenProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( IpsecWhackListenProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackListenProcess->readStdout() );
bool NormalMsg = true;
bool ErrorMsg = false;
@@ -14014,7 +14014,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug );
start_ipsec_initiate();
}
- else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_TQUICK_I1 to state STATE_TQUICK_I2", 0 , FALSE ) > -1 )
{
timer.stop();
@@ -14093,10 +14093,10 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -14136,7 +14136,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
// GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
// disconnectClicked();
// GlobalConfig->status = GlobalConfig->disconnected;
-// setGuiStatus ( disconnected );
+// setGuitqStatus ( disconnected );
// return ;
// }
}
@@ -14150,7 +14150,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
while ( IpsecWhackListenProcess->canReadLineStderr() )
{
ProcessMsg_connect = IpsecWhackListenProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( IpsecWhackListenProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackListenProcess->readStderr() );
// GlobalConfig->appendLogEntry ( "[ipsec whack listen err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
else
{
// we have to give some time to sleep and try again...
- connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) );
- connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) );
+ connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
+ connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
IpsecWhackListenProcess->tryTerminate();
sleep ( 2 );
if ( IpsecWhackListenProcess->isRunning() )
@@ -14200,7 +14200,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -14210,14 +14210,14 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
{
if ( IpsecWhackStatusProcess ==0 || IpsecGotError )
return;
-// QString ProcessMsg_connect_full = QString( IpsecWhackStatusProcess->readStdout() );
-// QStringList ProcessMsg_connect_list = QStringList::split('\n', ProcessMsg_connect_full);
+// TQString ProcessMsg_connect_full = TQString( IpsecWhackStatusProcess->readStdout() );
+// TQStringList ProcessMsg_connect_list = TQStringList::split('\n', ProcessMsg_connect_full);
while ( IpsecWhackStatusProcess !=0 && IpsecWhackStatusProcess->canReadLineStdout() )
-// for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
+// for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
{
-// QString ProcessMsg_connect = *it;
- QString ProcessMsg_connect = IpsecWhackStatusProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( IpsecWhackStatusProcess->readStdout() );
+// TQString ProcessMsg_connect = *it;
+ TQString ProcessMsg_connect = IpsecWhackStatusProcess->readLineStdout();
+ // TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStdout() );
bool NormalMsg = true;
bool ErrorMsg = false;
@@ -14226,10 +14226,10 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
if ( GlobalConfig->KvpncDebugLevel > 5 )
GlobalConfig->appendLogEntry ( "[ipsec whack status] " + ProcessMsg_connect, GlobalConfig->debug );
- if ( ProcessMsg_connect.find ( QString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 )
{
- if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_TQUICK_I1 to state STATE_TQUICK_I2", 0 , FALSE ) > -1 )
{
timer.stop();
@@ -14292,7 +14292,7 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
// GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack status" ) , GlobalConfig->debug );
// disconnectClicked();
// GlobalConfig->status = GlobalConfig->disconnected;
-// setGuiStatus ( disconnected );
+// setGuitqStatus ( disconnected );
// return ;
// }
}
@@ -14306,7 +14306,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
while ( IpsecWhackStatusProcess !=0 && IpsecWhackStatusProcess->canReadLineStderr() )
{
ProcessMsg_connect = IpsecWhackStatusProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( IpsecWhackStatusProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStderr() );
// if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 )
// {
@@ -14353,7 +14353,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
// GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error );
// disconnectClicked();
// GlobalConfig->status = GlobalConfig->disconnected;
-// setGuiStatus ( disconnected );
+// setGuitqStatus ( disconnected );
// return ;
// }
}
@@ -14364,7 +14364,7 @@ void KVpnc::readFromStdout_ipsecwhackdelete()
while ( IpsecWhackDeleteProcess->canReadLineStdout() )
{
ProcessMsg_connect = IpsecWhackDeleteProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( IpsecWhackDeleteProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackDeleteProcess->readStdout() );
bool NormalMsg = true;
bool ErrorMsg = false;
@@ -14399,7 +14399,7 @@ void KVpnc::readFromStderr_ipsecwhackdelete()
while ( IpsecWhackDeleteProcess->canReadLineStderr() )
{
ProcessMsg_connect = IpsecWhackDeleteProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( IpsecWhackDeleteProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( IpsecWhackDeleteProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[ipsec whack delete err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -14416,11 +14416,11 @@ void KVpnc::readFromStderr_ipsecwhackdelete()
void KVpnc::readFromStdout_tail_racoon()
{
- // QString ProcessMsg_connect = QString( RacoonTailProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( RacoonTailProcess->readStdout() );
while ( RacoonTailProcess->canReadLineStdout() )
{
- QString ProcessMsg_connect = RacoonTailProcess->readLineStdout() + "\n";
- // QString ProcessMsg_connect = RacoonTailProcess->readStdout();
+ TQString ProcessMsg_connect = RacoonTailProcess->readLineStdout() + "\n";
+ // TQString ProcessMsg_connect = RacoonTailProcess->readStdout();
bool abort = false;
bool error_found = false;
@@ -14447,10 +14447,10 @@ void KVpnc::readFromStdout_tail_racoon()
// L2tpdProcess->kill();
// }
//
-// QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
+// TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
// GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
// int pid = -1;
-// QString Name = "";
+// TQString Name = "";
// if ( !NameAndPid.isEmpty() )
// {
// pid = NameAndPid.section ( '/', 0, 0 ).toInt();
@@ -14459,23 +14459,23 @@ void KVpnc::readFromStdout_tail_racoon()
// if ( Name == "racoon" )
// {
//
-// //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// // disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// // disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
//
// if ( GlobalConfig->doKillRacoonIfStillRunning && abort == false )
// {
// if ( GlobalConfig->KvpncDebugLevel > 3 )
// GlobalConfig->appendLogEntry ( i18n ( "%1 could not bind too port, tring to kill it...." ).arg ( "racoon" ) , GlobalConfig->error );
//
-// QProcess killracoonprocess ( this );
+// TQProcess killracoonprocess ( this );
// killracoonprocess.addArgument ( GlobalConfig->pathToKillall );
// killracoonprocess.addArgument ( "racoon" );
//
// if ( !killracoonprocess.start() )
// {
// GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "racoon" ) , GlobalConfig->error );
-// GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+// GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
// abort = true;
// }
// else
@@ -14494,7 +14494,7 @@ void KVpnc::readFromStdout_tail_racoon()
// }
//
// putenv ( ( char* ) ( "LC_ALL=C" ) );
-// RacoonProcess = new QProcess ( this );
+// RacoonProcess = new TQProcess ( this );
// RacoonProcess->addArgument ( GlobalConfig->pathToRacoon );
// /*RacoonProcess->addArgument ( "-F" )*/; // foreground we want :)
// // RacoonProcess->addArgument ( "-v" );
@@ -14506,16 +14506,16 @@ void KVpnc::readFromStdout_tail_racoon()
// GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon" + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug );
//
//
-// //RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
-// // connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
-// // connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( 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() ) );
//
// if ( !RacoonProcess->start(env) )
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "racoon" ), GlobalConfig->error );
//
-// GlobalConfig->appendLogEntry ( QString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
+// GlobalConfig->appendLogEntry ( TQString ( "[racoon err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( "racoon" ) ) , GlobalConfig->error );
// abort = false;
// }
// else
@@ -14538,14 +14538,14 @@ void KVpnc::readFromStdout_tail_racoon()
// }
// else
// {
-// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
// GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error );
// abort = true;
// }
// }
// else
// {
-// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( 500 ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+// KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( 500 ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
// abort = true;
// }
// }
@@ -14702,34 +14702,34 @@ void KVpnc::readFromStdout_tail_racoon()
if ( GlobalConfig->currentProfile->getUseModeConfig() )
{
- QFile ModeCfgFile ( QString ( tmpPath + "/racoon-" + GlobalConfig->currentProfile->getName() + ".modecfg" ) );
+ TQFile ModeCfgFile ( TQString ( tmpPath + "/racoon-" + GlobalConfig->currentProfile->getName() + ".modecfg" ) );
if ( ModeCfgFile.exists() )
{
- QString TmpDns1="";
- QString TmpDns2="";
- QString internal_addr4="";
- QString internal_netmask4="";
- QString internal_cidr4="";
- QString internal_dns4="";
- QString internal_dns4_list="";
- QString internal_wins4="";
- QString internal_wins4_list="";
- QString split_include="";
- QString split_local="";
- QString default_domain="";
- QString resolvtemp="";
+ TQString TmpDns1="";
+ TQString TmpDns2="";
+ TQString internal_addr4="";
+ TQString internal_netmask4="";
+ TQString internal_cidr4="";
+ TQString internal_dns4="";
+ TQString internal_dns4_list="";
+ TQString internal_wins4="";
+ TQString internal_wins4_list="";
+ TQString split_include="";
+ TQString split_local="";
+ TQString default_domain="";
+ TQString resolvtemp="";
if ( ModeCfgFile.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &ModeCfgFile );
- QString line="";
+ TQTextStream stream ( &ModeCfgFile );
+ TQString line="";
while ( !stream.atEnd() )
{
line = stream.readLine(); // line of text excluding '\n'
if ( GlobalConfig->KvpncDebugLevel > 5 )
GlobalConfig->appendLogEntry ( "[ModeCfg] "+line, GlobalConfig->debug );
- QString ModeCfgVar=line.section ( '=',0,0 );
- QString ModeCfgVal=line.section ( '=',1,-1 );
+ TQString ModeCfgVar=line.section ( '=',0,0 );
+ TQString ModeCfgVal=line.section ( '=',1,-1 );
if ( ModeCfgVal=="INTERNAL_ADDR4" )
internal_addr4 = ModeCfgVal;
else if ( ModeCfgVal=="INTERNAL_NETMASK4" )
@@ -14758,11 +14758,11 @@ void KVpnc::readFromStdout_tail_racoon()
TmpDns1 = internal_dns4;
- QFile racoonupfile ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".up" );
- QTextStream racoonupstream ( &racoonupfile );
+ TQFile racoonupfile ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".up" );
+ TQTextStream racoonupstream ( &racoonupfile );
if ( racoonupfile.open ( IO_WriteOnly ) )
{
- QString DefaultDevice = NetworkInterface ( GlobalConfig,parent ).getDefaultInterface();
+ TQString DefaultDevice = NetworkInterface ( GlobalConfig,parent ).getDefaultInterface();
/* update dns? */
if ( GlobalConfig->currentProfile->getUseDnsUpdate() )
{
@@ -14807,7 +14807,7 @@ void KVpnc::readFromStdout_tail_racoon()
racoonupstream << "fi" << "\n";
}
- QProcess *pppdUpProcess = new QProcess ( this );
+ TQProcess *pppdUpProcess = new TQProcess ( this );
pppdUpProcess->addArgument ( GlobalConfig->InterpreterShell );
pppdUpProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" );
@@ -14821,7 +14821,7 @@ void KVpnc::readFromStdout_tail_racoon()
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdUpScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug );
while ( pppdUpProcess->isRunning() )
{
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
sleep ( 1 );
}
@@ -14855,10 +14855,10 @@ void KVpnc::readFromStdout_tail_racoon()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
doIptablesRacoon();
@@ -14928,13 +14928,13 @@ void KVpnc::readFromStdout_tail_racoon()
void KVpnc::readFromStderr_tail_racoon()
{
- // QString ProcessMsg_connect = QString( RacoonTailProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( RacoonTailProcess->readStderr() );
while ( RacoonTailProcess->canReadLineStderr() )
{
bool error_found =false;
bool abort = false;
- QString ProcessMsg_connect = RacoonTailProcess->readLineStderr() + "\n";
- //QString ProcessMsg_connect = RacoonTailProcess->readStderr();
+ TQString ProcessMsg_connect = RacoonTailProcess->readLineStderr() + "\n";
+ //TQString ProcessMsg_connect = RacoonTailProcess->readStderr();
// if ( GlobalConfig->KvpncDebugLevel > 0 )
{
GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -14956,13 +14956,13 @@ void KVpnc::readFromStderr_tail_racoon()
void KVpnc::readFromStdout_racoonctl()
{
- // QString ProcessMsg_connect = QString( RacoonctlProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( RacoonctlProcess->readStdout() );
while ( RacoonctlProcess->canReadLineStdout() )
{
bool abort = false;
- QString ProcessMsg_connect = RacoonctlProcess->readLineStdout() + "\n";
- //QString ProcessMsg_connect = RacoonctlProcess->readStdout();
+ TQString ProcessMsg_connect = RacoonctlProcess->readLineStdout() + "\n";
+ //TQString ProcessMsg_connect = RacoonctlProcess->readStdout();
// if ( GlobalConfig->KvpncDebugLevel > 3 )
{
GlobalConfig->appendLogEntry ( "[racoonctl] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -14996,9 +14996,9 @@ void KVpnc::readFromStdout_racoonctl()
// sleep(2);
// if (RacoonctlProcess->isRunning())
// {
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) );
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) );
-// disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
// RacoonctlProcess->kill();
// sleep(1);
// racoonStarted();
@@ -15025,7 +15025,7 @@ void KVpnc::readFromStdout_racoonctl()
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
- QString UserPassStr = "";
+ TQString UserPassStr = "";
// if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry )
UserPassStr = GlobalConfig->TmpPassword;
// else
@@ -15061,9 +15061,9 @@ void KVpnc::readFromStdout_racoonctl()
//
// GlobalConfig->status = GlobalConfig->connected;
//
-// connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+// connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
// durationTimer.start ( 1000, FALSE );
-// setGuiStatus ( connected );
+// setGuitqStatus ( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -15088,12 +15088,12 @@ void KVpnc::readFromStdout_racoonctl()
void KVpnc::readFromStderr_racoonctl()
{
- // QString ProcessMsg_connect = QString( RacoonctlProcess->readStderr() );
+ // TQString ProcessMsg_connect = TQString( RacoonctlProcess->readStderr() );
while ( RacoonctlProcess->canReadLineStderr() )
{
bool abort = false;
- QString ProcessMsg_connect = RacoonctlProcess->readLineStderr() + "\n";
- //QString ProcessMsg_connect = RacoonctlProcess->readStderr();
+ TQString ProcessMsg_connect = RacoonctlProcess->readLineStderr() + "\n";
+ //TQString ProcessMsg_connect = RacoonctlProcess->readStderr();
// if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -15114,7 +15114,7 @@ void KVpnc::readFromStderr_racoonctl()
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl err] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
- QString UserPassStr = "";
+ TQString UserPassStr = "";
// if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry )
UserPassStr = GlobalConfig->TmpPassword;
// else
@@ -15189,7 +15189,7 @@ void KVpnc::readFromStdout_pptp()
{
timer.stop();
connectCounter=0;
- // disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
KMessageBox::error ( this, i18n ( "The peer refused to authenticate." ) );
GlobalConfig->appendLogEntry ( i18n ( "The peer refused to authenticate." ) , GlobalConfig->error );
abort = true;
@@ -15240,7 +15240,7 @@ void KVpnc::readFromStdout_pptp()
// NetworkInterface iface(GlobalConfig,parent);
// TunnelInterfaceIP = iface.getInterfaceIP( PppdDevice );
// if (GlobalConfig->VpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).arg(TunnelInterfaceIP) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).tqarg(TunnelInterfaceIP) , GlobalConfig->debug);
//
abort = false;
@@ -15263,8 +15263,8 @@ void KVpnc::readFromStdout_pptp()
{
// example: primary DNS address 132.210.*.2 secondary DNS address 132.210.**.2
bool got2dns = false;
- QString DNS1 = ProcessMsg_connect.section ( ' ', 3, 3 );
- QString DNS2 = ProcessMsg_connect.section ( ' ', 7, 7 );
+ TQString DNS1 = ProcessMsg_connect.section ( ' ', 3, 3 );
+ TQString DNS2 = ProcessMsg_connect.section ( ' ', 7, 7 );
got2dns = Utils ( GlobalConfig ).isValidIPv4Address ( DNS2 );
@@ -15300,7 +15300,7 @@ void KVpnc::readFromStdout_pptp()
else if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 )
{
// if (GlobalConfig->KvpncDebugLevel > 0)
- // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( ProcessMsg_connect), GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).tqarg( ProcessMsg_connect), GlobalConfig->debug);
TunnelInterfaceIP = ProcessMsg_connect.simplifyWhiteSpace().section ( ' ', 3, 3 );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Tunnel IP address: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug );
@@ -15324,10 +15324,10 @@ void KVpnc::readFromStdout_pptp()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -15335,9 +15335,9 @@ void KVpnc::readFromStdout_pptp()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface IP address: %1" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug );
- // GlobalConfig->appendLogEntry( QString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( TQString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug );
- QString pppdev = "";
+ TQString pppdev = "";
if ( !PppdDevice.isEmpty() )
pppdev = PppdDevice;
else
@@ -15345,8 +15345,8 @@ void KVpnc::readFromStdout_pptp()
// write pppd.<profile>.up
- QFile pppdupfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" );
- QTextStream pppdupstream ( &pppdupfile );
+ TQFile pppdupfile ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" );
+ TQTextStream pppdupstream ( &pppdupfile );
if ( pppdupfile.open ( IO_WriteOnly ) )
{
pppdupstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -15362,7 +15362,7 @@ void KVpnc::readFromStdout_pptp()
pppdupstream << " echo \"# generated by kvpnc. Do not edit it.\" > /etc/resolv.conf" << "\n";
pppdupstream << "fi\n";
- QString resolvtemp="";
+ TQString resolvtemp="";
bool no_nameserver=true;
if ( !GlobalConfig->currentProfile->getUseDnsServer() )
{
@@ -15484,7 +15484,7 @@ void KVpnc::readFromStdout_pptp()
pppdupstream << GlobalConfig->pathToRoute << " add default " << pppdev << "\n";
if ( GlobalConfig->KvpncDebugLevel > 4 )
- GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( QString().setNum ( defaultroutecount ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( TQString().setNum ( defaultroutecount ) ), GlobalConfig->debug );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "No default route found but replace it was requested, adding one over device %1 with gateway %2..." ).arg ( pppdev ).arg ( GlobalConfig->NewDefaultGw ), GlobalConfig->debug );
@@ -15504,7 +15504,7 @@ void KVpnc::readFromStdout_pptp()
pppdupstream << GlobalConfig->pathToRoute << " add default " << pppdev << "\n";
if ( GlobalConfig->KvpncDebugLevel > 4 )
- GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( QString().setNum ( defaultroutecount ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "default route count: %1" ).arg ( TQString().setNum ( defaultroutecount ) ), GlobalConfig->debug );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "More than one default route found, deleting all and adding one over device %1 with gateway %2..." ).arg ( pppdev ).arg ( GlobalConfig->NewDefaultGw ), GlobalConfig->debug );
@@ -15524,14 +15524,14 @@ void KVpnc::readFromStdout_pptp()
// if (GlobalConfig->NewDefaultGw != "0.0.0.0")
// {
// if ( GlobalConfig->KvpncDebugLevel > 3 )
- // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).arg( pppdev ).arg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).tqarg( pppdev ).tqarg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
// pppdupstream << GlobalConfig->pathToIp + " route add 0.0.0.0 via " << GlobalConfig->NewDefaultGw << " dev " << pppdev << "\n";
// }
pppdupfile.close();
}
- QProcess *pppdUpProcess = new QProcess ( this );
+ TQProcess *pppdUpProcess = new TQProcess ( this );
pppdUpProcess->addArgument ( GlobalConfig->InterpreterShell );
pppdUpProcess->addArgument ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" );
@@ -15545,7 +15545,7 @@ void KVpnc::readFromStdout_pptp()
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "PppdUpScript" ).arg ( tmpPath + "pppd." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug );
while ( pppdUpProcess->isRunning() )
{
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
sleep ( 1 );
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -15555,10 +15555,10 @@ void KVpnc::readFromStdout_pptp()
delete pppdUpProcess;
pppdUpProcess=0L;
- QString iplocal=getenv ( "IPLOCAL" );
- QString ipremote=getenv ( "IPREMOTE" );
- QString ifname=getenv ( "IFNAME" );
- QString speed=getenv ( "SPEED" );
+ TQString iplocal=getenv ( "IPLOCAL" );
+ TQString ipremote=getenv ( "IPREMOTE" );
+ TQString ifname=getenv ( "IFNAME" );
+ TQString speed=getenv ( "SPEED" );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Local IP address: %1, remote IP address: %2, device: %3, speed: %4" ).arg ( TunnelInterfaceIP ).arg ( ipremote ).arg ( ifname ).arg ( speed ), GlobalConfig->debug );
@@ -15573,28 +15573,28 @@ void KVpnc::readFromStdout_pptp()
// if (! pppdHasReplacedefaultrouteSupport)
// {
// tmpPath = locateLocal ( "data", "kvpnc/" );
- // QString PppdReplaceDefaultRouteScript = tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh";
+ // TQString PppdReplaceDefaultRouteScript = tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh";
//
- // QFile file ( PppdReplaceDefaultRouteScript );
- // QTextStream stream ( &file );
+ // TQFile file ( PppdReplaceDefaultRouteScript );
+ // TQTextStream stream ( &file );
// if ( file.open ( IO_WriteOnly ) )
// {
// stream << "# generated by kvpnc. Do not edit it." << "\n";
// stream << "\n";
// file.close();
- // ReplaceDefaultRouteProcess = new QProcess ( this );
+ // ReplaceDefaultRouteProcess = new TQProcess ( this );
// ReplaceDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell );
// ReplaceDefaultRouteProcess->addArgument ( PppdReplaceDefaultRouteScript );
// if ( !ReplaceDefaultRouteProcess->start(env) )
// {
- // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
+ // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
// // disconnectClicked();
- // // setGuiStatus(disconnected);
+ // // setGuitqStatus(disconnected);
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug );
// while (ReplaceDefaultRouteProcess->isRunning())
// {
// sleep(1);
@@ -15605,7 +15605,7 @@ void KVpnc::readFromStdout_pptp()
// }
// else
// {
- // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).arg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).tqarg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
// }
//
// }
@@ -15614,7 +15614,7 @@ void KVpnc::readFromStdout_pptp()
// GlobalConfig->appendLogEntry ( i18n ( "pppd supports replacedefaultroute and replace the route it" ) , config->debug );
// }
// }
- // PptpRouteProcess = new QProcess( this );
+ // PptpRouteProcess = new TQProcess( this );
// PptpRouteProcess->addArgument( GlobalConfig->pathToRoute );
// PptpRouteProcess->addArgument( "add" );
// PptpRouteProcess->addArgument( "-net" );
@@ -15623,9 +15623,9 @@ void KVpnc::readFromStdout_pptp()
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// }
// else
// {
@@ -15635,7 +15635,7 @@ void KVpnc::readFromStdout_pptp()
// }
// delete PptpRouteProcess;
// PptpRouteProcess=0L;
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
if ( GlobalConfig->currentProfile->getUseAdditionalNetworkRoutes() && !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() )
addAdditionalNetworkRoutes();
@@ -15655,21 +15655,21 @@ void KVpnc::readFromStdout_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
// // remove password entries
// if (GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
// {
// // remove kvpnc entries from chap-secerets
- // QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ // TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- // QTextStream stream ( &ChapSecretsFile );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // TQTextStream stream ( &ChapSecretsFile );
// if ( ChapSecretsFile.open ( IO_ReadOnly ) )
// {
- // QString line = "";
- // QString chapsecret_content = "";
+ // TQString line = "";
+ // TQString chapsecret_content = "";
// bool kvpnc_start_marker_found = false;
// bool kvpnc_end_marker_found = false;
// while ( !stream.atEnd() )
@@ -15729,14 +15729,14 @@ void KVpnc::readFromStdout_pptp()
// if (GlobalConfig->currentProfile->getAuthMethod() == "pap")
// {
// // remove kvpnc entries from pap-secerets
- // QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ // TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- // QTextStream stream ( &papSecretsFile );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // TQTextStream stream ( &papSecretsFile );
// if ( papSecretsFile.open ( IO_ReadOnly ) )
// {
- // QString line = "";
- // QString papsecret_content = "";
+ // TQString line = "";
+ // TQString papsecret_content = "";
// bool kvpnc_start_marker_found = false;
// bool kvpnc_end_marker_found = false;
// while ( !stream.atEnd() )
@@ -15924,7 +15924,7 @@ void KVpnc::readFromStderr_pptp()
error_found=true;
}
- GlobalConfig->appendLogEntry ( QString ( "[pppd err] " + ProcessMsg_connect ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[pppd err] " + ProcessMsg_connect ) , GlobalConfig->error );
if ( abort )
{
@@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
{
@@ -15958,17 +15958,17 @@ void KVpnc::readFromStderr_pptp()
void KVpnc::readOutput_openvpn()
{
- QString ProcessMsg = "";
+ TQString ProcessMsg = "";
bool stderr = false;
bool connectSuccess = false;
- QString NetworkDevice = "";
+ TQString NetworkDevice = "";
while ( OpenvpnProcess != 0L && OpenvpnProcess->canReadLineStdout() )
{
- ProcessMsg = QString ( OpenvpnProcess->readLineStdout() );
+ ProcessMsg = TQString ( OpenvpnProcess->readLineStdout() );
- // ProcessMsg = QString( OpenvpnProcess->readStdout() );
+ // ProcessMsg = TQString( OpenvpnProcess->readStdout() );
if ( !ProcessMsg.isEmpty() && GlobalConfig->KvpncDebugLevel > 4 )
{
@@ -15977,7 +15977,7 @@ void KVpnc::readOutput_openvpn()
// else
// {
// stderr=true;
- // ProcessMsg = QString( OpenvpnProcess->readStderr() );
+ // ProcessMsg = TQString( OpenvpnProcess->readStderr() );
// GlobalConfig->appendLogEntry ( "stderr openvpn: "+ProcessMsg, GlobalConfig->debug );
// }
@@ -16006,29 +16006,29 @@ void KVpnc::readOutput_openvpn()
{
AuthRetry = true;
GlobalConfig->haveUserData = false;
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) );
+ // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) );
connectClicked();
- // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error );
// abort=true;
}
else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, FALSE ) > -1 )
{
;
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) );
+ // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) );
connectClicked();
- // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, FALSE ) > -1 )
{
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) );
+ // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) );
connectClicked();
- // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
@@ -16036,16 +16036,16 @@ void KVpnc::readOutput_openvpn()
{
AuthRetry = true;
GlobalConfig->haveUserData = false;
- disconnect ( OpenvpnProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readOutput_openvpn() ) );
- // disconnect( OpenvpnProcess, SIGNAL( readyReadStderr() ), this, SLOT( readOutput_openvpn() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) );
+ // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) );
connectClicked();
- // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg.find ( "not found", 0, FALSE ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, FALSE ) > -1 )
{
- QString hash_algo= ProcessMsg.section ( "'",1,1 );
+ TQString hash_algo= ProcessMsg.section ( "'",1,1 );
KMessageBox::error ( this, i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) );
GlobalConfig->appendLogEntry ( i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) , GlobalConfig->error );
abort = true;
@@ -16058,8 +16058,8 @@ void KVpnc::readOutput_openvpn()
}
else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , FALSE ) > -1 )
{
- // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tun" ).arg( "tap" ) );
- // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tun" ).arg( "tap" ) , GlobalConfig->error );
+ // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tun" ).tqarg( "tap" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tun" ).tqarg( "tap" ) , GlobalConfig->error );
// abort = true;
GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tun" ).arg ( "tap" ), GlobalConfig->info );
@@ -16070,8 +16070,8 @@ void KVpnc::readOutput_openvpn()
}
else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , FALSE ) > -1 )
{
- // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tap" ).arg( "tun" ) );
- // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tap" ).arg( "tun" ), GlobalConfig->error );
+ // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tap" ).tqarg( "tun" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tap" ).tqarg( "tun" ), GlobalConfig->error );
// abort = true;
GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tap" ).arg ( "tun" ), GlobalConfig->info );
@@ -16080,7 +16080,7 @@ void KVpnc::readOutput_openvpn()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg.find ( "connect to " + QString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + QString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 )
{
// else if ( ProcessMsg.find( "Connection refused", 0, FALSE ) > -1 ) {
// if ( ProcessMsg.find( "failed", 0, FALSE ) > -1 ) {
@@ -16101,15 +16101,15 @@ void KVpnc::readOutput_openvpn()
// GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error );
// KMessageBox::error ( this, i18n ( "The management port cant bind, please try again later." ) );
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
KMessageBox::error ( this, i18n ( "Port binding failed" ) );
@@ -16117,21 +16117,21 @@ void KVpnc::readOutput_openvpn()
abort = true;
}
- else if ( ProcessMsg.find ( QString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+QString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 )
{
// GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ) ) , GlobalConfig->error );
// KMessageBox::error ( this, i18n ( "The management port cant bind, please try again later." ) );
- QString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort );
+ TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( GlobalConfig->OpenvpnManagementPort );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
int pid = -1;
- QString Name = "";
+ TQString Name = "";
if ( !NameAndPid.isEmpty() )
{
pid = NameAndPid.section ( '/', 0, 0 ).toInt();
Name = NameAndPid.section ( '/', 1, 1 );
- KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( QString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( QString().setNum ( pid ) ) );
+ KMessageBox::error ( this, i18n ( "Binding port %1 failed. Program \"%2\" with PID \"%3\" is using it. You have to stop it first." ).arg ( TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) ).arg ( Name ).arg ( TQString().setNum ( pid ) ) );
}
else
{
@@ -16160,7 +16160,7 @@ void KVpnc::readOutput_openvpn()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Private key password requested, send it...\n" ), GlobalConfig->debug );
- QString PrivKeyPassStr = "";
+ TQString PrivKeyPassStr = "";
// if (GlobalConfig->currentProfile->getSavePsk())
PrivKeyPassStr = GlobalConfig->currentProfile->getPrivateKeyPass();
// else
@@ -16168,7 +16168,7 @@ void KVpnc::readOutput_openvpn()
if ( PrivKeyPassStr.isEmpty() )
{
GlobalConfig->TmpPrivateKeyPass = "";
- QString pass="";
+ TQString pass="";
EnterXauthInteractivePasscodeDialog dlg ( 0);
dlg.setCaption( i18n ( "Enter private key password" ) );
dlg.main->DescriptionLabel->setText ( i18n ( "Enter private key password to unlock private key:" ) );
@@ -16189,10 +16189,10 @@ void KVpnc::readOutput_openvpn()
if ( dlg.main->SavePasswordCheckBox->isChecked() )
{
GlobalConfig->currentProfile->setSavePrivateKeyPassword ( true );
- GlobalConfig->currentProfile->setPrivateKeyPass ( QString ( pass ) );
+ GlobalConfig->currentProfile->setPrivateKeyPass ( TQString ( pass ) );
}
- GlobalConfig->TmpPrivateKeyPass = QString ( pass );
+ GlobalConfig->TmpPrivateKeyPass = TQString ( pass );
// if ( GlobalConfig->KvpncDebugLevel > 5 )
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: private key password: " + GlobalConfig->TmpPrivateKeyPass, GlobalConfig->debug );
@@ -16222,7 +16222,7 @@ void KVpnc::readOutput_openvpn()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "User name requested, send it...\n" ), GlobalConfig->debug );
- QString UsernameStr = "";
+ TQString UsernameStr = "";
if ( !GlobalConfig->currentProfile->getUserName().isEmpty() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -16297,10 +16297,10 @@ void KVpnc::readOutput_openvpn()
}
else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , FALSE ) > -1 )
{
- QString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
- QString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" );
- // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) );
- // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error );
+ TQString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
+ TQString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" );
+ // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) );
+ // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error );
// abort = true;
GlobalConfig->appendLogEntry ( i18n ( "Wrong authentication method used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalAuth ).arg ( PeerAuth ) , GlobalConfig->info );
@@ -16313,10 +16313,10 @@ void KVpnc::readOutput_openvpn()
else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , FALSE ) > -1 )
{
// example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC'
- QString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
- QString PeerCipher = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" );
- // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) );
- // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error );
+ TQString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
+ TQString PeerCipher = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" );
+ // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) );
+ // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error );
// abort = true;
GlobalConfig->appendLogEntry ( i18n ( "Wrong chipher used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalCipher ).arg ( PeerCipher ) , GlobalConfig->info );
@@ -16414,7 +16414,7 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "%1 is shutting down." ).arg ( "openvpn" ), GlobalConfig->debug );
connectionEnded();
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 )
{
@@ -16450,10 +16450,10 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -16492,10 +16492,10 @@ void KVpnc::readOutput_openvpn()
while ( OpenvpnProcess != 0L && OpenvpnProcess->canReadLineStderr() )
{
- ProcessMsg = QString ( OpenvpnProcess->readLineStderr() );
+ ProcessMsg = TQString ( OpenvpnProcess->readLineStderr() );
- // ProcessMsg = QString( OpenvpnProcess->readStdout() );
+ // ProcessMsg = TQString( OpenvpnProcess->readStdout() );
if ( !ProcessMsg.isEmpty() && GlobalConfig->KvpncDebugLevel > 2 )
{
@@ -16506,7 +16506,7 @@ void KVpnc::readOutput_openvpn()
void KVpnc::readFromStdout_l2tpd()
{
- L2tpdBufferStdoutString += QString ( L2tpdProcess->readStdout() );
+ L2tpdBufferStdoutString += TQString ( L2tpdProcess->readStdout() );
emit L2tpdStdoutRecieved();
return;
@@ -16514,7 +16514,7 @@ void KVpnc::readFromStdout_l2tpd()
void KVpnc::readFromStderr_l2tpd()
{
- L2tpdBufferStderrString += QString ( L2tpdProcess->readStderr() );
+ L2tpdBufferStderrString += TQString ( L2tpdProcess->readStderr() );
emit L2tpdStderrRecieved();
return;
@@ -16523,17 +16523,17 @@ void KVpnc::readFromStderr_l2tpd()
void KVpnc::processStdout_l2tpd()
{
- QString ProcessMsg_connect_raw = L2tpdBufferStdoutString;
- QStringList ProcessMsg_connect_list = QStringList::split ( '\n',ProcessMsg_connect_raw );
+ TQString ProcessMsg_connect_raw = L2tpdBufferStdoutString;
+ TQStringList ProcessMsg_connect_list = TQStringList::split ( '\n',ProcessMsg_connect_raw );
L2tpdBufferStdoutString ="";
- for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
+ for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
{
bool NormalMsg = true;
bool ErrorMsg = false;
- QString ProcessMsg_connect = *it;
+ TQString ProcessMsg_connect = *it;
if ( GlobalConfig->KvpncDebugLevel > 7 )
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd raw] " + ProcessMsg_connect ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd raw] " + ProcessMsg_connect ) , GlobalConfig->debug );
bool abort = false;
@@ -16543,13 +16543,13 @@ void KVpnc::processStdout_l2tpd()
{
bool kill_l2tpd=true;
- QString deamon="xl2tpd";
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ TQString deamon="xl2tpd";
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
deamon="xl2tpd";
if ( !GlobalConfig->doKillXl2tpdIfStillRunning )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
kill_l2tpd=false;
}
@@ -16559,7 +16559,7 @@ void KVpnc::processStdout_l2tpd()
deamon="l2tpd";
if ( !GlobalConfig->doKillL2tpdIfStillRunning )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
kill_l2tpd=false;
}
@@ -16567,9 +16567,9 @@ void KVpnc::processStdout_l2tpd()
if ( kill_l2tpd == true )
{
- QProcess killl2tpdprocess ( this );
+ TQProcess killl2tpdprocess ( this );
killl2tpdprocess.addArgument ( GlobalConfig->pathToKillall );
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
killl2tpdprocess.addArgument ( "xl2tpd" );
else
killl2tpdprocess.addArgument ( "l2tpd" );
@@ -16577,7 +16577,7 @@ void KVpnc::processStdout_l2tpd()
if ( !killl2tpdprocess.start() )
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "l2tpd" ) , GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
}
else
@@ -16593,9 +16593,9 @@ void KVpnc::processStdout_l2tpd()
sleep ( 1 );
- L2tpdProcess = new QProcess ( this );
+ L2tpdProcess = new TQProcess ( this );
//
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug );
@@ -16620,7 +16620,7 @@ void KVpnc::processStdout_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -16635,19 +16635,19 @@ void KVpnc::processStdout_l2tpd()
else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error );
abort = true;
}
@@ -16670,21 +16670,21 @@ void KVpnc::processStdout_l2tpd()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
// remove kvpnc entries from secrets file
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -16744,14 +16744,14 @@ void KVpnc::processStdout_l2tpd()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -16820,10 +16820,10 @@ void KVpnc::processStdout_l2tpd()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -16861,66 +16861,66 @@ void KVpnc::processStdout_l2tpd()
void KVpnc::processStderr_l2tpd()
{
- QString ProcessMsg_connect_raw = L2tpdBufferStderrString;
- QStringList ProcessMsg_connect_list = QStringList::split ( '\n',ProcessMsg_connect_raw );
+ TQString ProcessMsg_connect_raw = L2tpdBufferStderrString;
+ TQStringList ProcessMsg_connect_list = TQStringList::split ( '\n',ProcessMsg_connect_raw );
L2tpdBufferStderrString ="";
- for ( QStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
+ for ( TQStringList::Iterator it = ProcessMsg_connect_list.begin(); it != ProcessMsg_connect_list.end(); ++it )
{
bool NormalMsg = true;
bool ErrorMsg = false;
- QString ProcessMsg_connect = *it;
+ TQString ProcessMsg_connect = *it;
bool abort = false;
bool connectSuccess = false;
if ( GlobalConfig->KvpncDebugLevel > 7 )
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err raw] " + ProcessMsg_connect ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err raw] " + ProcessMsg_connect ) , GlobalConfig->debug );
//
// if ( ProcessMsg_connect.length() > 3 )
{
- // GlobalConfig->appendLogEntry ( QString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( TQString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error );
if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug );
// abort=true;
}
else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , FALSE ) > -1 )
{
NormalMsg=true;
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug );
// abort=true;
}
else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , FALSE ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) );
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error );
abort = true;
}
else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 )
@@ -16928,13 +16928,13 @@ void KVpnc::processStderr_l2tpd()
ErrorMsg=true;
bool kill_l2tpd=true;
- QString deamon="xl2tpd";
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ TQString deamon="xl2tpd";
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
deamon="xl2tpd";
if ( !GlobalConfig->doKillXl2tpdIfStillRunning )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
kill_l2tpd=false;
}
@@ -16944,7 +16944,7 @@ void KVpnc::processStderr_l2tpd()
deamon="l2tpd";
if ( !GlobalConfig->doKillL2tpdIfStillRunning )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
kill_l2tpd=false;
}
@@ -16952,9 +16952,9 @@ void KVpnc::processStderr_l2tpd()
if ( kill_l2tpd == true )
{
- QProcess killl2tpdprocess ( this );
+ TQProcess killl2tpdprocess ( this );
killl2tpdprocess.addArgument ( GlobalConfig->pathToKillall );
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
killl2tpdprocess.addArgument ( "xl2tpd" );
else
killl2tpdprocess.addArgument ( "l2tpd" );
@@ -16962,7 +16962,7 @@ void KVpnc::processStderr_l2tpd()
if ( !killl2tpdprocess.start() )
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not be killed." ).arg ( "l2tpd" ) , GlobalConfig->error );
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg ( deamon ) ) , GlobalConfig->debug );
abort = true;
}
else
@@ -16978,9 +16978,9 @@ void KVpnc::processStderr_l2tpd()
sleep ( 1 );
- L2tpdProcess = new QProcess ( this );
+ L2tpdProcess = new TQProcess ( this );
//
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug );
@@ -17005,7 +17005,7 @@ void KVpnc::processStderr_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -17021,23 +17021,23 @@ void KVpnc::processStderr_l2tpd()
else if ( ProcessMsg_connect.find ( "Connection established", 0 , FALSE ) > -1 )
{
NormalMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
}
else if ( ProcessMsg_connect.find ( "Call established", 0 , FALSE ) > -1 )
{
NormalMsg=true;
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info );
abort = false;
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "Low level connection %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info );
abort = false;
}
- disconnect ( &L2tpWaitForPppUpTimer, SIGNAL ( timeout() ), this, SLOT ( checkL2tpPppUp() ) );
- connect ( &L2tpWaitForPppUpTimer, SIGNAL ( timeout() ), this, SLOT ( checkL2tpPppUp() ) );
+ disconnect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) );
+ connect ( &L2tpWaitForPppUpTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkL2tpPppUp() ) );
L2tpWaitForPppUpTimer.start ( 1000, FALSE );
}
@@ -17059,7 +17059,7 @@ void KVpnc::processStderr_l2tpd()
// cid is greather than 0
if ( ProcessMsg_connect.section ( ',', 1, 1 ).section ( '=', 1, 1 ).stripWhiteSpace() != "0" ) // check_control: control, cid = 17467, Ns = 2, Nr = 4
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
connectSuccess = true;
@@ -17067,11 +17067,11 @@ void KVpnc::processStderr_l2tpd()
}
else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
- GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
+ GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
}
@@ -17084,10 +17084,10 @@ void KVpnc::processStderr_l2tpd()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -17123,19 +17123,19 @@ void KVpnc::processStderr_l2tpd()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
// remove kvpnc entries from chap-secerets
- QFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
+ TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &ChapSecretsFile );
+ TQTextStream stream ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString chapsecret_content = "";
+ TQString line = "";
+ TQString chapsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -17195,14 +17195,14 @@ void KVpnc::processStderr_l2tpd()
if ( GlobalConfig->currentProfile->getAuthMethod() == "pap" )
{
// remove kvpnc entries from pap-secerets
- QFile papSecretsFile ( "/etc/ppp/pap-secrets" );
+ TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QTextStream stream ( &papSecretsFile );
+ TQTextStream stream ( &papSecretsFile );
if ( papSecretsFile.open ( IO_ReadOnly ) )
{
- QString line = "";
- QString papsecret_content = "";
+ TQString line = "";
+ TQString papsecret_content = "";
bool kvpnc_start_marker_found = false;
bool kvpnc_end_marker_found = false;
while ( !stream.atEnd() )
@@ -17340,10 +17340,10 @@ void KVpnc::readFromStdout_openl2tp()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -17368,7 +17368,7 @@ void KVpnc::readFromStdout_openl2tp()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -17405,7 +17405,7 @@ void KVpnc::readFromStderr_openl2tp()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -17437,7 +17437,7 @@ void KVpnc::readFromStdout_startstopOpenl2tp()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -17460,7 +17460,7 @@ void KVpnc::readFromStderr_startstopOpenl2tp()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tp" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -17474,7 +17474,7 @@ void KVpnc::readFromStdout_vtun()
bool NormalMsg = true;
bool ErrorMsg = false;
ProcessMsg_connect = VtundProcess->readLineStdout();
- // ProcessMsg_connect = QString( VtundProcess->readStdout() );
+ // ProcessMsg_connect = TQString( VtundProcess->readStdout() );
//if ( !ProcessMsg_connect.isEmpty() )
@@ -17511,7 +17511,7 @@ void KVpnc::readFromStdout_vtun()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
// success
@@ -17522,10 +17522,10 @@ void KVpnc::readFromStdout_vtun()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -17575,7 +17575,7 @@ void KVpnc::readFromStderr_vtun()
bool NormalMsg = true;
bool ErrorMsg = false;
ProcessMsg_connect = VtundProcess->readLineStderr();
- // // ProcessMsg_connect = QString( L2tpdProcess->readStderr() );
+ // // ProcessMsg_connect = TQString( L2tpdProcess->readStderr() );
// // if ( !ProcessMsg_connect.isEmpty() )
//
bool abort = false;
@@ -17613,7 +17613,7 @@ void KVpnc::readFromStderr_vtun()
}
// // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 )
// // {
-// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
+// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
// // abort=true;
// // ErrorMsg=true;
// // }
@@ -17639,7 +17639,7 @@ void KVpnc::readFromStderr_vtun()
if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,FALSE ) > -1 )
{
- KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( QString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) );
+ KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( TQString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Can't allocate pseudo tty." ),GlobalConfig->error );
abort=true;
ErrorMsg=true;
@@ -17651,7 +17651,7 @@ void KVpnc::readFromStderr_vtun()
// // cid is greather than 0
// if ( ProcessMsg_connect.section ( ',', 1, 1 ).section ( '=', 1, 1 ).stripWhiteSpace() != "0" ) // check_control: control, cid = 17467, Ns = 2, Nr = 4
// {
-// GlobalConfig->appendLogEntry ( QString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
+// GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP tunnel to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
//
// abort = false;
// connectSuccess = true;
@@ -17669,10 +17669,10 @@ void KVpnc::readFromStderr_vtun()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
setFirewallAfterConnect();
@@ -17712,7 +17712,7 @@ void KVpnc::readFromStderr_vtun()
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "vtund" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
GlobalConfig->appPointer->processEvents();
@@ -17724,13 +17724,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// while ( SshProcess->canReadLineStdout() )
// {
// ProcessMsg_connect = SshProcess->readLineStdout();
- // QString ProcessMsg_connect = QString( SshProcess->readStdout() );
+ // TQString ProcessMsg_connect = TQString( SshProcess->readStdout() );
-// QString ProcessMsg_connect = QString::fromLatin1(buffer, buflen);
- QString ProcessMsg_connect_raw = QString::fromLatin1 ( buffer, buflen );
- QStringList ProcessMsg_connect_raw_list = QStringList::split ( "debug1:",ProcessMsg_connect_raw );
+// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
+ TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+ TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
- for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
+ for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
{
ProcessMsg_connect = *it;
@@ -17786,7 +17786,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
KMessageBox::error(this, i18n("Permission denied."));
connectCounter = 0;
GlobalConfig->appendLogEntry(i18n("Permission denied") , GlobalConfig->error);
- // disconnect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ // disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
abort = true; KMessageBox::error(this, i18n("Authentication has failed."));
GlobalConfig->appendLogEntry(i18n("Authentication has failed.") , GlobalConfig->error);
//abort = true;
@@ -17827,7 +17827,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
@@ -17838,15 +17838,15 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
- // GlobalConfig->appendLogEntry( QString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( TQString("connectstring: "+ProcessMsg_connect), GlobalConfig->debug );
SshDevice = "";
if ( !PppdDevice.isEmpty() )
@@ -17860,8 +17860,8 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
}
// write ssh.<profile>.up
- QFile sshupfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" );
- QTextStream sshupstream ( &sshupfile );
+ TQFile sshupfile ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" );
+ TQTextStream sshupstream ( &sshupfile );
if ( sshupfile.open ( IO_WriteOnly ) )
{
sshupstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -17894,7 +17894,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[ssh] " + i18n ( "Tunnel IP: %1" ).arg ( TunnelInterfaceIP ) , GlobalConfig->debug );
- QString resolvtemp="";
+ TQString resolvtemp="";
bool no_nameserver=true;
/* update dns? */
if ( GlobalConfig->currentProfile->getUseDnsUpdate() )
@@ -18020,7 +18020,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
}
- QProcess *SshUpProcess = new QProcess ( this );
+ TQProcess *SshUpProcess = new TQProcess ( this );
SshUpProcess->addArgument ( GlobalConfig->InterpreterShell );
SshUpProcess->addArgument ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" );
@@ -18034,7 +18034,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( "SshUpScript" ).arg ( tmpPath + "ssh." + GlobalConfig->currentProfile->getName() + ".up" ) , GlobalConfig->debug );
while ( SshUpProcess->isRunning() )
{
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
sleep ( 1 );
}
@@ -18051,23 +18051,23 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() )
{
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString SshReplaceDefaultRouteScript = tmpPath + "ssh_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh";
+ TQString SshReplaceDefaultRouteScript = tmpPath + "ssh_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh";
- QFile file ( SshReplaceDefaultRouteScript );
- QTextStream stream ( &file );
+ TQFile file ( SshReplaceDefaultRouteScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "# generated by kvpnc. Do not edit it." << "\n";
stream << "\n";
file.close();
- ReplaceDefaultRouteProcess = new QProcess ( this );
+ ReplaceDefaultRouteProcess = new TQProcess ( this );
ReplaceDefaultRouteProcess->addArgument ( GlobalConfig->InterpreterShell );
ReplaceDefaultRouteProcess->addArgument ( SshReplaceDefaultRouteScript );
if ( !ReplaceDefaultRouteProcess->start ( env ) )
{
KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "ssh replace route process" ) ).arg ( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh" ) );
// disconnectClicked();
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
}
else
{
@@ -18091,7 +18091,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
}
- // PptpRouteProcess = new QProcess( this );
+ // PptpRouteProcess = new TQProcess( this );
// PptpRouteProcess->addArgument( GlobalConfig->pathToRoute );
// PptpRouteProcess->addArgument( "add" );
// PptpRouteProcess->addArgument( "-net" );
@@ -18100,13 +18100,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuiStatus(disconnected);
+ // setGuitqStatus(disconnected);
// }
// else
{
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
// while (PptpRouteProcess->isRunning())
// {
@@ -18138,13 +18138,13 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
// while ( SshProcess->canReadLineStderr() )
// {
// ProcessMsg_connect = SshProcess->readLineStderr();
- // QString ProcessMsg_connect = QString( SshProcess->readStderr() );
-// QString ProcessMsg_connect = QString::fromLatin1(buffer, buflen);
+ // TQString ProcessMsg_connect = TQString( SshProcess->readStderr() );
+// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
- QString ProcessMsg_connect_raw = QString::fromLatin1 ( buffer, buflen );
- QStringList ProcessMsg_connect_raw_list = QStringList::split ( "debug1:",ProcessMsg_connect_raw );
+ TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+ TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
- for ( QStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
+ for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
{
ProcessMsg_connect = *it;
@@ -18223,7 +18223,7 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return ;
}
}
@@ -18233,19 +18233,19 @@ void KVpnc::readFromStdout_ping()
{
//while ( PingProcess->canReadLineStdout() ) {
//ProcessMsg_connect = PingProcess->readLineStdout();
- ProcessMsg_connect = QString ( PingProcess->readStdout() );
+ ProcessMsg_connect = TQString ( PingProcess->readStdout() );
//mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect );
if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- KNotifyClient::event ( topLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
}
else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
- KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
}
else
{
@@ -18270,7 +18270,7 @@ void KVpnc::readFromStderr_ping()
{
// while ( PingProcess->canReadLineStderr() ) {
// ProcessMsg_connect = PingProcess->readLineStderr();
- ProcessMsg_connect = QString ( PingProcess->readStderr() );
+ ProcessMsg_connect = TQString ( PingProcess->readStderr() );
//mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect );
if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
@@ -18301,7 +18301,7 @@ void KVpnc::readFromStdout_route()
{
//while ( RouteProcess->canReadLineStdout() ) {
//ProcessMsg_connect = RouteProcess->readLineStdout();
- ProcessMsg_connect = QString ( RouteProcess->readStdout() );
+ ProcessMsg_connect = TQString ( RouteProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[route] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18313,7 +18313,7 @@ void KVpnc::readFromStderr_route()
{
// while ( RouteProcess->canReadLineStderr() ) {
// ProcessMsg_connect = RouteProcess->readLineStderr();
- ProcessMsg_connect = QString ( RouteProcess->readStderr() );
+ ProcessMsg_connect = TQString ( RouteProcess->readStderr() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[route err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -18325,7 +18325,7 @@ void KVpnc::readFromStdout_disconnect()
while ( DisconnectProcess->canReadLineStdout() )
{
ProcessMsg_connect = DisconnectProcess->readLineStdout();
- //ProcessMsg_connect = QString( DisconnectProcess->readStdout() );
+ //ProcessMsg_connect = TQString( DisconnectProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[disconnect] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18338,7 +18338,7 @@ void KVpnc::readFromStderr_disconnect()
while ( DisconnectProcess->canReadLineStderr() )
{
ProcessMsg_connect = DisconnectProcess->readLineStderr();
- //ProcessMsg_connect = QString( DisconnectProcess->readStderr() );
+ //ProcessMsg_connect = TQString( DisconnectProcess->readStderr() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[disconnect err] " + ProcessMsg_connect, GlobalConfig->error );
@@ -18347,21 +18347,21 @@ void KVpnc::readFromStderr_disconnect()
void KVpnc::readFromStdout_setVirtualIP()
{
- QString msg = QString ( SetVirtualIPProcess->readStdout() );
+ TQString msg = TQString ( SetVirtualIPProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( msg, GlobalConfig->debug );
}
void KVpnc::readFromStderr_setVirtualIP()
{
- QString msg = QString ( SetVirtualIPProcess->readStderr() );
+ TQString msg = TQString ( SetVirtualIPProcess->readStderr() );
GlobalConfig->appendLogEntry ( msg, GlobalConfig->error );
setVirtualIPSuccess = false;
}
void KVpnc::readFromStdout_connectionStatusCheck()
{
- QString msg = QString ( ConnectionStatusCheckProcess->readStdout() );
+ TQString msg = TQString ( ConnectionStatusCheckProcess->readStdout() );
if ( msg.find ( "PING ok.", 0 , FALSE ) > -1 )
{
@@ -18386,16 +18386,16 @@ void KVpnc::readFromStdout_connectionStatusCheck()
if ( GlobalConfig->currentProfile->getDoPingIP() )
{
GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
- KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
}
else
{
GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
- 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() ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->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, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) );
- disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
ConnectionStatusCheckProcess->kill();
// kill connection
disconnectClicked();
@@ -18420,21 +18420,21 @@ void KVpnc::readFromStdout_connectionStatusCheck()
void KVpnc::readFromStderr_connectionStatusCheck()
{
- QString msg = QString ( ConnectionStatusCheckProcess->readStderr() );
+ TQString msg = TQString ( ConnectionStatusCheckProcess->readStderr() );
// if ( msg.find( "PING ok.", 0 , FALSE ) > -1 )
// {
// /* Connection alive */
// if (GlobalConfig->KvpncDebugLevel > 0)
- // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug );
//
// }
// if ( msg.find( "PING failed!", 0 , FALSE ) > -1 )
// {
// /* Connection dead?! */
// if (GlobalConfig->KvpncDebugLevel > 0)
- // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
- // KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()) );
+ // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
+ // KNotifyClient::event( tqtopLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) );
// // kill connection
// disconnectClicked();
// }
@@ -18445,7 +18445,7 @@ void KVpnc::readFromStdout_executeCommandBeforeConnect()
while ( CmdBeforeConnectProcess->canReadLineStdout() )
{
ProcessMsg_connect = CmdBeforeConnectProcess->readLineStdout();
- //ProcessMsg_connect = QString( CmdBeforeConnectProcess->readStdout() );
+ //ProcessMsg_connect = TQString( CmdBeforeConnectProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "[CmdBeforeConnect] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18457,7 +18457,7 @@ void KVpnc::readFromStderr_executeCommandBeforeConnect()
while ( CmdBeforeConnectProcess->canReadLineStderr() )
{
ProcessMsg_connect = CmdBeforeConnectProcess->readLineStderr();
- //ProcessMsg_connect = QString( CmdBeforeConnectProcess->readStderr() );
+ //ProcessMsg_connect = TQString( CmdBeforeConnectProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[CmdBeforeConnect err] " + ProcessMsg_connect, GlobalConfig->error );
}
@@ -18468,7 +18468,7 @@ void KVpnc::readFromStdout_executeCommandAfterConnect()
while ( CmdAfterConnectProcess->canReadLineStdout() )
{
ProcessMsg_connect = CmdAfterConnectProcess->readLineStdout();
- //ProcessMsg_connect = QString( CmdAfterConnectProcess->readStdout() );
+ //ProcessMsg_connect = TQString( CmdAfterConnectProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "[CmdAfterConnect] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18480,7 +18480,7 @@ void KVpnc::readFromStderr_executeCommandAfterConnect()
while ( CmdAfterConnectProcess->canReadLineStderr() )
{
ProcessMsg_connect = CmdAfterConnectProcess->readLineStderr();
- //ProcessMsg_connect = QString( CmdAfterConnectProcess->readStderr() );
+ //ProcessMsg_connect = TQString( CmdAfterConnectProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[CmdAfterConnect err] " + ProcessMsg_connect, GlobalConfig->error );
}
@@ -18491,7 +18491,7 @@ void KVpnc::readFromStdout_executeCommandBeforeDisconnect()
while ( CmdBeforeDisconnectProcess->canReadLineStdout() )
{
ProcessMsg_connect = CmdBeforeDisconnectProcess->readLineStdout();
- //ProcessMsg_connect = QString( CmdBeforeDisconnectProcess->readStdout() );
+ //ProcessMsg_connect = TQString( CmdBeforeDisconnectProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "[CmdBeforeDisconnect] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18503,7 +18503,7 @@ void KVpnc::readFromStderr_executeCommandBeforeDisconnect()
while ( CmdBeforeDisconnectProcess->canReadLineStderr() )
{
ProcessMsg_connect = CmdBeforeDisconnectProcess->readLineStderr();
- //ProcessMsg_connect = QString( CmdBeforeDisconnectProcess->readStderr() );
+ //ProcessMsg_connect = TQString( CmdBeforeDisconnectProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[CmdBeforeDisconnect err] " + ProcessMsg_connect, GlobalConfig->error );
}
@@ -18514,7 +18514,7 @@ void KVpnc::readFromStdout_executeCommandAfterDisconnect()
while ( CmdAfterDisconnectProcess->canReadLineStdout() )
{
ProcessMsg_connect = CmdAfterDisconnectProcess->readLineStdout();
- //ProcessMsg_connect = QString( CmdAfterDisconnectProcess->readStdout() );
+ //ProcessMsg_connect = TQString( CmdAfterDisconnectProcess->readStdout() );
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "[CmdAfterDisconnect] " + ProcessMsg_connect, GlobalConfig->debug );
@@ -18526,7 +18526,7 @@ void KVpnc::readFromStderr_executeCommandAfterDisconnect()
while ( CmdAfterDisconnectProcess->canReadLineStderr() )
{
ProcessMsg_connect = CmdAfterDisconnectProcess->readLineStderr();
- //ProcessMsg_connect = QString( CmdAfterDisconnectProcess->readStderr() );
+ //ProcessMsg_connect = TQString( CmdAfterDisconnectProcess->readStderr() );
GlobalConfig->appendLogEntry ( "[CmdAfterDisconnect err] " + ProcessMsg_connect, GlobalConfig->error );
}
@@ -18534,10 +18534,10 @@ void KVpnc::readFromStderr_executeCommandAfterDisconnect()
void KVpnc::readCiscoVpncTestProcessOutput()
{
- QString msg = "";
+ TQString msg = "";
while ( TestCiscoVpncProcess->canReadLineStdout() )
{
- msg = QString ( TestCiscoVpncProcess->readLineStdout() );
+ msg = TQString ( TestCiscoVpncProcess->readLineStdout() );
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "msg: %1" ).arg ( msg ), GlobalConfig->debug );
@@ -18561,7 +18561,7 @@ void KVpnc::readCiscoVpncTestProcessOutput()
}
}
-void KVpnc::terminateConnection ( QProcess *proc )
+void KVpnc::terminateConnection ( TQProcess *proc )
{
if ( proc->isRunning() )
{
@@ -18569,14 +18569,14 @@ void KVpnc::terminateConnection ( QProcess *proc )
// proc->tryTerminate();
// proc->tryTerminate();
- // QTimer::singleShot( 5000, proc, SLOT( kill() ) );
+ // TQTimer::singleShot( 5000, proc, TQT_SLOT( kill() ) );
}
timer.stop();
durationTimer.stop();
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
@@ -18602,13 +18602,13 @@ void KVpnc::connectionEnded()
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
{
- QFile file ( QString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +QString ( "kvpnc_" ) +QString ( GlobalConfig->currentProfile->getName() +".pcf" ) );
+ TQFile file ( TQString ( "/etc/opt/cisco-vpnclient/Profiles/" ) +TQString ( "kvpnc_" ) +TQString ( GlobalConfig->currentProfile->getName() +".pcf" ) );
file.remove();
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon )
{
- QFile file ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".conf" );
+ TQFile file ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".conf" );
file.remove();
file.setName ( tmpPath + "/setkey." + GlobalConfig->currentProfile->getName() + ".sh" );
file.remove();
@@ -18632,7 +18632,7 @@ void KVpnc::connectionEnded()
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan )
{
- QFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" );
+ TQFile file ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" );
file.remove();
file.setName ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
file.remove();
@@ -18653,8 +18653,8 @@ void KVpnc::connectionEnded()
if ( prevConnectionState != 1 ) // connected
{
- QString durationString ( i18n ( "%1:%2:%3" ).arg ( QString().sprintf ( "%02u", hour ) ).arg ( QString().sprintf ( "%02u", min ) , QString().sprintf ( "%02u", sec ) ) );
- GlobalConfig->appendLogEntry ( i18n ( "Connection duration was %1 hours, %2 minutes, %3 seconds" ).arg ( QString().sprintf ( "%02u", hour ), QString().sprintf ( "%02u", min ) , QString().sprintf ( "%02u", sec ) ), GlobalConfig->info );
+ TQString durationString ( i18n ( "%1:%2:%3" ).arg ( TQString().sprintf ( "%02u", hour ) ).arg ( TQString().sprintf ( "%02u", min ) , TQString().sprintf ( "%02u", sec ) ) );
+ GlobalConfig->appendLogEntry ( i18n ( "Connection duration was %1 hours, %2 minutes, %3 seconds" ).arg ( TQString().sprintf ( "%02u", hour ), TQString().sprintf ( "%02u", min ) , TQString().sprintf ( "%02u", sec ) ), GlobalConfig->info );
}
connectCounter = 0;
GlobalConfig->TmpPassword = "";
@@ -18685,16 +18685,16 @@ void KVpnc::slotConnectTimedOut()
this->ConnectAction->setEnabled ( true );
this->DisconnectAction->setEnabled ( false );
//parent->statusBar() ->insertItem( i18n( "Connected" ), 2, 0, true );
- KVpncDock->setStatus ( disconnected );
+ KVpncDock->settqStatus ( disconnected );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connection failed (timeout)." ), GlobalConfig->debug );
disconnectClicked();
slotStatusMsg ( i18n ( "Timeout while connecting to %1. %2 connect process will be killed.!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( "vpnc" ), ID_FLASH_MSG );
slotStatusMsg ( i18n ( "Disconnected" ), ID_CONNECTION_MSG );
- QToolTip::remove( KVpncDock );
- QToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
+ TQToolTip::remove( KVpncDock );
+ TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
connectCounter = 0;
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
KMessageBox::error ( this, i18n ( "Timeout while connecting to %1 (%2) after %3s. Please check if the VPN server is reachable and the settings (UDP/TCP, local port, UDP encapsulation port) are correct. Maybe the timeout must be increased too." ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getName() ).arg ( GlobalConfig->tryConnectTimeout ) );
}
else if ( GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
@@ -18723,19 +18723,19 @@ void KVpnc::newSessionClicked()
VpnAccountData * it;
bool nameOk = false;
bool ok;
- QString newName=newdlg.getName();
- QString Oldname = newdlg.getName();
+ TQString newName=newdlg.getName();
+ TQString Oldname = newdlg.getName();
while ( nameOk == false )
{
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
{
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
- newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( Oldname + "_2" ), &ok );
+ newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok );
if ( ok == false )
{
KMessageBox::information ( 0, i18n ( "Rename at new created profile was canceled." ) );
@@ -18806,7 +18806,7 @@ void KVpnc::newSessionClicked()
void KVpnc::saveSessionClicked()
{
- GlobalConfig->appPointer->setOverrideCursor ( QCursor ( Qt::WaitCursor ) );
+ GlobalConfig->appPointer->setOverrideCursor ( TQCursor ( TQt::WaitCursor ) );
GlobalConfig->appendLogEntry ( i18n ( "Saving profiles and global options..." ),GlobalConfig->info );
this->slotStatusMsg ( i18n ( "Saving profiles and global options..." ), ID_STATUS_MSG );
if ( !GlobalConfig->AccountList->isEmpty() )
@@ -18827,11 +18827,11 @@ void KVpnc::deleteSessionClicked()
if ( GlobalConfig->currentProfile == 0 )
return ;
- QString Name = GlobalConfig->currentProfile->getName();
+ TQString Name = GlobalConfig->currentProfile->getName();
ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ;
- QString TypeString = i18n ( "unknown" );
+ TQString TypeString = i18n ( "unknown" );
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
TypeString = i18n ( "Cisco" );
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
@@ -18919,20 +18919,20 @@ void KVpnc::renameSessionClicked ()
VpnAccountData * it;
bool nameOk = false;
bool ok = true;
- QString newName="";
- QString Oldname = GlobalConfig->currentProfile->getName();
- newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( GlobalConfig->currentProfile->getName() ), &ok );
+ TQString newName="";
+ TQString Oldname = GlobalConfig->currentProfile->getName();
+ newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( GlobalConfig->currentProfile->getName() ), &ok );
while ( nameOk == false )
{
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
{
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == GlobalConfig->currentProfile->getName() ) )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
- newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok );
+ newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok );
if ( ok == false )
{
KMessageBox::information ( 0, i18n ( "Rename was canceled." ) );
@@ -18994,7 +18994,7 @@ void KVpnc::renameSessionClicked ()
}
}
-void KVpnc::sessionToggled ( const QString& Name )
+void KVpnc::sessionToggled ( const TQString& Name )
{
// mw->DebugOutput->append( "sessionToggled" );
if ( Name.isEmpty() || GlobalConfig->AccountList->isEmpty() )
@@ -19013,36 +19013,36 @@ void KVpnc::sessionToggled ( const QString& Name )
GlobalConfig->currentProfile = GlobalConfig->AccountList->first();
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
{
- QString Name = mw->SessionCombo->currentText();
+ TQString Name = mw->SessionCombo->currentText();
if ( !Name.isEmpty() )
{
if ( it->getName() == Name )
{
// profile found
GlobalConfig->currentProfile = it;
- QString ProfileInfo = "";
- QString TypeString = "";
- QString Gateway = it->getGateway();
- QString Username = it->getUserName();
+ TQString ProfileInfo = "";
+ TQString TypeString = "";
+ TQString Gateway = it->getGateway();
+ TQString Username = it->getUserName();
//if ( GlobalConfig->KvpncDebugLevel > 2 )
- // GlobalConfig->appendLogEntry (i18n("Username: \"%1").arg(Username), KVpncConfig::debug);
+ // GlobalConfig->appendLogEntry (i18n("Username: \"%1").tqarg(Username), KVpncConfig::debug);
if (it->getDontSaveUsername() || (Username == ""))
Username = i18n("&lt;ask at connect&gt;");
- QString IpsecId = "";
- QString RemotePort=0;
- QString IkeOptions = "";
- QString EspOptions = "";
- QString TunnelDeviceType=it->getTunnelDeviceType();
+ TQString IpsecId = "";
+ TQString RemotePort=0;
+ TQString IkeOptions = "";
+ TQString EspOptions = "";
+ TQString TunnelDeviceType=it->getTunnelDeviceType();
this->ExportOpenvpnProfileAction->setEnabled ( FALSE );
- QString type = ""; // visible name
- QString bin = ""; // executable name
+ TQString type = ""; // visible name
+ TQString bin = ""; // executable name
ProfileInfo += "<table>";
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry ( i18n ( "connectionType raw: %1" ).arg ( QString().setNum ( GlobalConfig->currentProfile->getConnectionType() ) ), KVpncConfig::debug );
+ GlobalConfig->appendLogEntry ( i18n ( "connectionType raw: %1" ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionType() ) ), KVpncConfig::debug );
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
{
@@ -19100,7 +19100,7 @@ void KVpnc::sessionToggled ( const QString& Name )
TypeString = i18n ( "PPTP" );
ProfileInfo += "<tr><td>"+i18n("Type:")+"</td><td>"+TypeString+"</td></tr>";
ProfileInfo += "<tr><td>"+i18n("Gateway (VPN server):")+"</td><td>"+Gateway+"</td></tr>";
- QString PptpOptions = "";
+ TQString PptpOptions = "";
PptpOptions += "<tr><td colspan=\"2\"><table>";
if (it->getRequireMppe())
PptpOptions += "<tr><td>"+i18n("Require MPPE:")+"</td><td>"+ i18n("yes")+"</td></tr>";
@@ -19154,7 +19154,7 @@ void KVpnc::sessionToggled ( const QString& Name )
PptpOptions += "<tr><td>"+i18n("Allow stateful mode:")+"</td><td>"+ i18n("yes")+"</td></tr>";
else
PptpOptions += "<tr><td>"+i18n("Allow stateful mode:")+"</td><td>"+ i18n("no")+"</td></tr>";
- QString NtDomainName = "-";
+ TQString NtDomainName = "-";
if ( it->getUseNtDomainName() )
NtDomainName = it->getNtDomainName();
PptpOptions += "<tr><td>"+i18n("NT domain name:")+"</td><td>"+ NtDomainName+"</td></tr>";
@@ -19179,7 +19179,7 @@ void KVpnc::sessionToggled ( const QString& Name )
int RemotePort = 1194;
if (it->getUseRemotePort())
RemotePort = it->getRemotePort();
- ProfileInfo += "<tr><td>"+i18n("Remote port:")+"</td><td>"+QString().setNum(RemotePort)+"</td></tr>";
+ ProfileInfo += "<tr><td>"+i18n("Remote port:")+"</td><td>"+TQString().setNum(RemotePort)+"</td></tr>";
ProfileInfo += "<tr><td>"+i18n("Username:")+"</td><td>"+Username+"</td></tr>";
ProfileInfo += "<tr><td>"+i18n("Tunnel device type:")+"</td><td>"+TunnelDeviceType+"</td></tr>";
@@ -19258,8 +19258,8 @@ void KVpnc::sessionToggled ( const QString& Name )
GlobalConfig->appendLogEntry ( i18n ( "Selected connection type: %1." ).arg ( type ), GlobalConfig->debug );
int Authtype = it->getAuthType();
- QString AuthTypeText="";
- QString AuthTypePretty = "";
+ TQString AuthTypeText="";
+ TQString AuthTypePretty = "";
if ( Authtype == VpnAccountData::cert )
{
AuthTypeText="cert";
@@ -19311,9 +19311,9 @@ void KVpnc::sessionToggled ( const QString& Name )
AuthTypePretty += i18n(" (using password)");
else
if (it->getPskIsInFile())
- AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKeyFile());
+ AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKeyFile());
else
- AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKey());
+ AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKey());
}
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -19323,7 +19323,7 @@ void KVpnc::sessionToggled ( const QString& Name )
// ToolInfo *it;
// std::cout << "Tool (bin): " << bin << std::endl;
- QString TypeRequirementStatus="";
+ TQString TypeRequirementtqStatus="";
if ( !GlobalConfig->ToolList->isEmpty() )
{
@@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemon (%1) available").arg(bin);
+ TypeRequirementtqStatus = i18n ( "Daemon (%1) available").tqarg(bin);
}
else
{
@@ -19358,7 +19358,7 @@ void KVpnc::sessionToggled ( const QString& Name )
this->ConnectAction->setEnabled ( FALSE );
mw->buttonConnect->setEnabled ( FALSE );
GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
@@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const QString& Name )
mw->buttonConnect->setEnabled ( TRUE );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool");
+ TypeRequirementtqStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool");
}
}
}
@@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const QString& Name )
this->ConnectAction->setEnabled ( FALSE );
mw->buttonConnect->setEnabled ( FALSE );
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin);
+ TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").tqarg(bin);
}
}
else
@@ -19401,7 +19401,7 @@ void KVpnc::sessionToggled ( const QString& Name )
// programs are installed
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "l2tpd" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19412,7 +19412,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "xl2tpd" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19420,7 +19420,7 @@ void KVpnc::sessionToggled ( const QString& Name )
else if ( racoon_and_l2tpd_available==false && racoon_and_xl2tpd_available==false )
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "racoon" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
}
}
if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp )
@@ -19431,7 +19431,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "openl2tp" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19453,7 +19453,7 @@ void KVpnc::sessionToggled ( const QString& Name )
ipsec_and_openl2tp_available = true;
}
- QString deamon="";
+ TQString deamon="";
if ( ipsec_and_l2tpd_available )
deamon="l2tpd";
if ( ipsec_and_xl2tpd_available )
@@ -19473,7 +19473,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "l2tpd" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19484,7 +19484,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "xl2tpd" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19492,7 +19492,7 @@ void KVpnc::sessionToggled ( const QString& Name )
else if ( ipsec_and_l2tpd_available==false && ipsec_and_xl2tpd_available==false )
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
}
}
if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp )
@@ -19503,7 +19503,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19511,7 +19511,7 @@ void KVpnc::sessionToggled ( const QString& Name )
else if ( ipsec_and_openl2tp_available==false )
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
}
}
}
@@ -19524,15 +19524,15 @@ void KVpnc::sessionToggled ( const QString& Name )
this->ConnectAction->setEnabled ( FALSE );
mw->buttonConnect->setEnabled ( FALSE );
GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( QString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" );
+ GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" );
}
}
}
@@ -19540,7 +19540,7 @@ void KVpnc::sessionToggled ( const QString& Name )
else
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
}
}
if ( type == "pptp" )
@@ -19556,7 +19556,7 @@ void KVpnc::sessionToggled ( const QString& Name )
// programs are installed
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19565,7 +19565,7 @@ void KVpnc::sessionToggled ( const QString& Name )
else
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
}
}
if ( type == "ssh" )
@@ -19585,7 +19585,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "ksshaskpass" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19597,7 +19597,7 @@ void KVpnc::sessionToggled ( const QString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "gnome-ssh-askpass" ), KVpncConfig::info );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19606,15 +19606,15 @@ void KVpnc::sessionToggled ( const QString& Name )
else
{
GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are not available, connect will be disabled." ).arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) ), KVpncConfig::error );
- TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
+ TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
}
}
}
}
- ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementStatus+"</td></tr>";
+ ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementtqStatus+"</td></tr>";
ProfileInfo += "</table>";
- QToolTip::add( mw->SessionCombo, ProfileInfo );
+ TQToolTip::add( mw->SessionCombo, ProfileInfo );
break;
}
}
@@ -19642,9 +19642,9 @@ void KVpnc::slotDurationEvent()
if ( !isHidden() )
{
- QString StatusMsg = "";
- QString durationString(i18n("%1:%2:%3" ).arg( QString().sprintf("%02u", hour)).arg( QString().sprintf("%02u", min)).arg( QString().sprintf("%02u", sec)));
- QString Username = "";
+ TQString StatusMsg = "";
+ TQString durationString(i18n("%1:%2:%3" ).tqarg( TQString().sprintf("%02u", hour)).tqarg( TQString().sprintf("%02u", min)).tqarg( TQString().sprintf("%02u", sec)));
+ TQString Username = "";
if (!GlobalConfig->TmpUsername.isEmpty())
Username = GlobalConfig->TmpUsername;
@@ -19653,15 +19653,15 @@ void KVpnc::slotDurationEvent()
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg( GlobalConfig->currentProfile->getGateway()).arg( Username).arg( PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg( Username).tqarg( PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan ||
(GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() == true) ||
@@ -19672,37 +19672,37 @@ void KVpnc::slotDurationEvent()
{
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && !(GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()))
{
- StatusMsg = i18n("Connected: %1 [%2], %3").arg( GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon)
{
- StatusMsg = i18n("Connected: %1 [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()))
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
}
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(QString(PrettyTypeString)).arg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQString(PrettyTypeString)).tqarg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
- StatusMsg = i18n("Connected: %1@%2 [%3], %4").arg(QString(Username)).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
+ StatusMsg = i18n("Connected: %1@%2 [%3], %4").tqarg(TQString(Username)).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
}
@@ -19725,7 +19725,7 @@ void KVpnc::slotDurationEvent()
void KVpnc::showDockTooltip()
{
- QString IP;
+ TQString IP;
if (GlobalConfig->showInterfaceIPinTooltip)
{
if (TunnelInterfaceIP.isEmpty())
@@ -19757,22 +19757,22 @@ void KVpnc::showDockTooltip()
if (IP.isEmpty())
IP = i18n("none");
}
- QString durationString ="";
- QString ToolTipMsg = "<table>";
+ TQString durationString ="";
+ TQString ToolTipMsg = "<table>";
- QString Username = "";
- QString ConnectionStatus="";
+ TQString Username = "";
+ TQString ConnectiontqStatus="";
if (GlobalConfig->status == GlobalConfig->connected || GlobalConfig->status == GlobalConfig->connecting)
{
if (GlobalConfig->status == GlobalConfig->connected)
{
- ConnectionStatus = i18n("connected");
- durationString = i18n("%1:%2:%3").arg( QString().sprintf("%02u", hour)).arg(QString().sprintf("%02u", min)).arg(QString().sprintf("%02u", sec));
+ ConnectiontqStatus = i18n("connected");
+ durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec));
}
else
{
- ConnectionStatus = i18n("connecting");
+ ConnectiontqStatus = i18n("connecting");
}
if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19780,9 +19780,9 @@ void KVpnc::showDockTooltip()
else
Username = GlobalConfig->currentProfile->getUserName();
- ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectionStatus+"</td></tr>";
- ToolTipMsg += "<tr><td>"+i18n("Server:")+"</td><td>"+QString(GlobalConfig->currentProfile->getGateway())+"</td></tr>";
- ToolTipMsg += "<tr><td>"+i18n("Type:")+"</td><td>"+QString(PrettyTypeString)+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectiontqStatus+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Server:")+"</td><td>"+TQString(GlobalConfig->currentProfile->getGateway())+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Type:")+"</td><td>"+TQString(PrettyTypeString)+"</td></tr>";
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig)
ToolTipMsg += "<tr><td>"+i18n("IPSec ID:")+"</td><td>"+GlobalConfig->currentProfile->getID()+"</td></tr>";
@@ -19792,14 +19792,14 @@ void KVpnc::showDockTooltip()
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ||
(GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()))
{
- ToolTipMsg += "<tr><td>"+i18n("user:")+"</td><td>"+QString(Username)+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("user:")+"</td><td>"+TQString(Username)+"</td></tr>";
}
if ((GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp ||
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ||
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ||
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ||
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) && GlobalConfig->showInterfaceIPinTooltip == true)
- ToolTipMsg += "<tr><td>"+i18n("tunnel IP:")+"</td><td>"+QString(IP)+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("tunnel IP:")+"</td><td>"+TQString(IP)+"</td></tr>";
if ( GlobalConfig->currentProfile->getUseLeftSourceIp() && (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan) && GlobalConfig->showInterfaceIPinTooltip == true)
{
@@ -19809,7 +19809,7 @@ void KVpnc::showDockTooltip()
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getUseHttpProxy())
{
- ToolTipMsg += "<tr><td>"+i18n("HTTP proxy:")+"</td><td>"+GlobalConfig->currentProfile->getHttpProxy()+":"+QString().setNum(GlobalConfig->currentProfile->getHttpProxyPort())+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("HTTP proxy:")+"</td><td>"+GlobalConfig->currentProfile->getHttpProxy()+":"+TQString().setNum(GlobalConfig->currentProfile->getHttpProxyPort())+"</td></tr>";
if (GlobalConfig->currentProfile->getUseHttpProxyAuth())
{
ToolTipMsg += "<tr><td>"+i18n("HTTP proxy type:")+"</td><td>"+GlobalConfig->currentProfile->getHttpProxyAuthType().upper()+"</td></tr>";
@@ -19820,7 +19820,7 @@ void KVpnc::showDockTooltip()
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ||
GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
- ToolTipMsg += "<tr><td>"+i18n("Tunnel device type:")+"</td><td>"+QString(GlobalConfig->currentProfile->getTunnelDeviceType())+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Tunnel device type:")+"</td><td>"+TQString(GlobalConfig->currentProfile->getTunnelDeviceType())+"</td></tr>";
}
if (GlobalConfig->showConnectionTimeInTooltip)
@@ -19828,33 +19828,33 @@ void KVpnc::showDockTooltip()
}
else if (GlobalConfig->status == GlobalConfig->disconnected)
{
- ConnectionStatus = i18n("disconnected");
- ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectionStatus+"</td></tr>";
+ ConnectiontqStatus = i18n("disconnected");
+ ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectiontqStatus+"</td></tr>";
}
ToolTipMsg += "</table>";
- QToolTip::remove ( KVpncDock);
- QToolTip::add ( KVpncDock, ToolTipMsg );
+ TQToolTip::remove ( KVpncDock);
+ TQToolTip::add ( KVpncDock, ToolTipMsg );
}
-void KVpnc::setGuiStatus ( int status )
+void KVpnc::setGuitqStatus ( int status )
{
- QString durationString = "";
- QString DaemonString = "";
- QString ToolTipMsg = "";
- QString ConnectMsg = "";
- QString LogMsg = "";
- QString ConnectionStatus = i18n("unknown");
- QString Username = "";
+ TQString durationString = "";
+ TQString DaemonString = "";
+ TQString ToolTipMsg = "";
+ TQString ConnectMsg = "";
+ TQString LogMsg = "";
+ TQString ConnectiontqStatus = i18n("unknown");
+ TQString Username = "";
if (status == GlobalConfig->connected)
{
setIcon ( connectedIcon );
- durationString = i18n ( "%1:%2:%3" ).arg ( QString().sprintf ( "%02u", hour ) ).arg ( QString().sprintf ( "%02u", min ) ).arg ( QString().sprintf ( "%02u", sec ) ) ;
- QString ConnectMsg = "";
- QString LogMsg = "";
- QString ToolTipMsg = "";
- QString DeamonString = "";
- ConnectionStatus = i18n("connected");
+ durationString = i18n ( "%1:%2:%3" ).arg ( TQString().sprintf ( "%02u", hour ) ).arg ( TQString().sprintf ( "%02u", min ) ).arg ( TQString().sprintf ( "%02u", sec ) ) ;
+ TQString ConnectMsg = "";
+ TQString LogMsg = "";
+ TQString ToolTipMsg = "";
+ TQString DeamonString = "";
+ ConnectiontqStatus = i18n("connected");
if ( !GlobalConfig->TmpUsername.isEmpty() )
Username=GlobalConfig->TmpUsername;
@@ -19868,7 +19868,7 @@ void KVpnc::setGuiStatus ( int status )
ImportSessionAction->setEnabled ( false );
NewProfileWizardAction->setEnabled ( false );
- KVpncDock->setStatus ( connected );
+ KVpncDock->settqStatus ( connected );
GlobalConfig->status = GlobalConfig->connected;
statusColorLabel->setPixmap ( *connectedStatusPixmap );
mw->buttonConnect->setEnabled ( false );
@@ -19882,7 +19882,7 @@ void KVpnc::setGuiStatus ( int status )
PrefAction ->setEnabled ( false );
ToolTipMsg = ConnectMsg;
- QToolTip::add
+ TQToolTip::add
( KVpncDock, ToolTipMsg );
slotStatusMsg ( i18n ( "Successful connected." ), ID_FLASH_MSG );
@@ -19894,7 +19894,7 @@ void KVpnc::setGuiStatus ( int status )
hide();
- QuickConnectMenu = new QPopupMenu ( KVpncDock->menu() );
+ QuickConnectMenu = new TQPopupMenu ( KVpncDock->menu() );
//setItemEnabled ( int id, bool enable )
@@ -19911,7 +19911,7 @@ void KVpnc::setGuiStatus ( int status )
DeleteSessionAction->setEnabled ( false );
ImportSessionAction->setEnabled ( false );
- KVpncDock->setStatus ( connecting );
+ KVpncDock->settqStatus ( connecting );
GlobalConfig->status = GlobalConfig->connecting;
mw->SessionCombo->setEnabled ( false );
PreferencesAction->setEnabled ( false );
@@ -19919,7 +19919,7 @@ void KVpnc::setGuiStatus ( int status )
NewProfileWizardAction->setEnabled ( false );
PrefAction ->setEnabled ( false );
- ConnectionStatus = i18n("connecting");
+ ConnectiontqStatus = i18n("connecting");
statusColorLabel->setPixmap ( *connectingStatusPixmap );
@@ -19941,15 +19941,15 @@ void KVpnc::setGuiStatus ( int status )
RenameSessionAction->setEnabled ( true );
DeleteSessionAction->setEnabled ( true );
ImportSessionAction->setEnabled ( true );
- KVpncDock->setStatus ( disconnected );
+ KVpncDock->settqStatus ( disconnected );
mw->SessionCombo->setEnabled ( true );
PreferencesAction->setEnabled ( true );
ProfileManagerAction->setEnabled ( true );
NewProfileWizardAction->setEnabled ( true );
PrefAction ->setEnabled ( true );
- QToolTip::remove( KVpncDock );
- QToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
+ TQToolTip::remove( KVpncDock );
+ TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
statusColorLabel->setPixmap ( *disconnectedStatusPixmap );
@@ -19957,9 +19957,9 @@ void KVpnc::setGuiStatus ( int status )
slotStatusMsg ( i18n ( "Disconnected." ), ID_FLASH_MSG );
if ( prevConnectionState == GlobalConfig->connected )
- KNotifyClient::event ( topLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
else if ( prevConnectionState == GlobalConfig->connecting )
- KNotifyClient::event ( topLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
}
if (status == GlobalConfig->connecting || status == GlobalConfig->connected)
{
@@ -19977,31 +19977,31 @@ void KVpnc::setGuiStatus ( int status )
}
if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk)
{
- ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
- LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(QDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
}
if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert)
{
- ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
- LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(QDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
}
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp)
{
PrettyTypeString = i18n("PPTP");
DaemonString = "pppd, pptp";
- ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
- QString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + QString("]");
- LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(QString(QDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2);
+ TQString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + TQString("]");
+ LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQString(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)) + TypeString2);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
{
@@ -20009,88 +20009,88 @@ void KVpnc::setGuiStatus ( int status )
{
PrettyTypeString = i18n("racoon");
DaemonString = "racoon";
- ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").arg(DaemonString);
+ ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").tqarg(DaemonString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan)
{
PrettyTypeString = IpsecType; // openswan, strongswan, ...
DaemonString = "ipsec";
- ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").arg(DaemonString);
+ ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").tqarg(DaemonString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon)
{
PrettyTypeString = i18n("L2TP (racoon)");
DaemonString = "racoon, " + GlobalConfig->currentProfile->getL2tpDaemon();
- ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString).arg(QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
{
PrettyTypeString = IpsecType;
- if (!GlobalConfig->pathToXl2tpd.isEmpty() && QFile(GlobalConfig->pathToXl2tpd).exists())
+ if (!GlobalConfig->pathToXl2tpd.isEmpty() && TQFile(GlobalConfig->pathToXl2tpd).exists())
DaemonString = "ipsec, " + GlobalConfig->currentProfile->getL2tpDaemon();
- ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("%4: %2@%1, %3").arg(QString(GlobalConfig->currentProfile->getGateway())).arg( Username).arg(durationString).arg(ConnectionStatus);
+ ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())
{
PrettyTypeString = IpsecType;
DaemonString = "ipsec";
- ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
}
- LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").arg(DaemonString).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
PrettyTypeString = i18n("OpenVPN");
DaemonString = "openvpn";
- ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
PrettyTypeString = i18n("Vtun");
DaemonString = "vtun";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(QString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(QString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
PrettyTypeString = i18n("SSH");
DaemonString = "ssh";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
- ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").arg(QString(GlobalConfig->currentProfile->getGateway())).arg(durationString ).arg(QString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
- LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(QDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
if (status == GlobalConfig->connected)
- KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg );
+ KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg );
}
}
void KVpnc::importKvpncSettingsClicked()
{
- QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings import" ) );
+ TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings import" ) );
if ( !filename.isEmpty() )
{
bool openProfileManager=false;
- QString RetName="";
+ TQString RetName="";
bool ret = GlobalConfig->importKvpncConfig ( filename,RetName,openProfileManager );
if ( ret == true )
{
@@ -20121,7 +20121,7 @@ void KVpnc::importKvpncSettingsClicked()
void KVpnc::exportKvpncSettingsClicked()
{
- QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings export" ) );
+ TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.xml *.kvpnc" ), 0,i18n ( "KVpnc settings export" ) );
if ( !filename.isEmpty() )
{
@@ -20130,7 +20130,7 @@ void KVpnc::exportKvpncSettingsClicked()
}
}
-void KVpnc::importProfileClicked ( QString file )
+void KVpnc::importProfileClicked ( TQString file )
{
ImportProfileDialog dlg ( GlobalConfig, this, i18n ( "Import profile" ), file );
@@ -20152,11 +20152,11 @@ void KVpnc::importProfileClicked ( QString file )
{
if ( it->getName() == account->getName() )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
nameOk = false;
- QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() + "_2" ), &ok );
+ TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
if (newName.isEmpty())
{
KMessageBox::information ( 0, i18n ( "Import was canceled." ) );
@@ -20202,7 +20202,7 @@ void KVpnc::importProfileClicked ( QString file )
GlobalConfig->saveOptions();
// std::cout << "save done" << std::endl;
- QString bin = "vpnc";
+ TQString bin = "vpnc";
ToolInfo *tool;
//std::cout << "Tool (bin): " << bin << std::endl;
if ( !GlobalConfig->ToolList->isEmpty() )
@@ -20243,7 +20243,7 @@ void KVpnc::importOpenvpnProfileClicked()
importOpenvpnProfileClicked ( "" );
}
-void KVpnc::importOpenvpnProfileClicked ( QString file )
+void KVpnc::importOpenvpnProfileClicked ( TQString file )
{
ImportOpenvpnProfileDialog dlg ( GlobalConfig, this, i18n ( "Import OpenVPN profile" ), file );
@@ -20264,11 +20264,11 @@ void KVpnc::importOpenvpnProfileClicked ( QString file )
{
if ( it->getName() == account->getName() )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
- QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() + "_2" ), &ok );
+ TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
if ( ok == false )
{
KMessageBox::information ( 0, i18n ( "Import was canceled." ) );
@@ -20312,7 +20312,7 @@ void KVpnc::importOpenvpnProfileClicked ( QString file )
GlobalConfig->saveOptions();
// std::cout << "save done" << std::endl;
- QString bin = "openvpn";
+ TQString bin = "openvpn";
ToolInfo *tool;
//std::cout << "Tool (bin): " << bin << std::endl;
if ( !GlobalConfig->ToolList->isEmpty() )
@@ -20341,12 +20341,12 @@ void KVpnc::importOpenvpnProfileClicked ( QString file )
void KVpnc::importIpsecProfileClicked ()
{
- QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.ipsec *.conf" ), 0,i18n ( "IPSec settings import" ) );
+ TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.ipsec *.conf" ), 0,i18n ( "IPSec settings import" ) );
if ( !filename.isEmpty() )
{
bool openProfileManager=false;
- QString RetName="";
+ TQString RetName="";
bool ret = GlobalConfig->importIpsecConfig ( filename,RetName,openProfileManager );
if ( ret == true )
{
@@ -20380,12 +20380,12 @@ void KVpnc::importIpsecProfileClicked ()
void KVpnc::importFritzboxProfileClicked ()
{
- QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "vpnuser*.cfg" ), 0,i18n ( "Fritzbox VPN settings import" ) );
+ TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "vpnuser*.cfg" ), 0,i18n ( "Fritzbox VPN settings import" ) );
if ( !filename.isEmpty() )
{
bool openProfileManager=false;
- QString RetName="";
+ TQString RetName="";
bool ret = GlobalConfig->importFritzboxConfig ( filename,RetName,openProfileManager );
if ( ret == true )
{
@@ -20427,30 +20427,30 @@ void KVpnc::addRouteRacoon()
// if ( RacoonHelperProcess->normalExit () )
{
- // disconnect( RacoonHelperProcess, SIGNAL( processExited () ), this, SLOT( addRouteRacoon() ) );
- // disconnect( RacoonHelperProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoon_helper() ) );
- // disconnect( RacoonHelperProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoon_helper() ) );
+ // 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() ) );
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString RacoonRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh";
+ TQString RacoonRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh";
NetworkInterface iface ( GlobalConfig, parent );
- QString defaultinterface = iface.getDefaultInterface();
- QString dev = "lo";
+ TQString defaultinterface = iface.getDefaultInterface();
+ TQString dev = "lo";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
tmpInterface = iface.getDefaultInterface();
if ( GlobalConfig->currentProfile->getUseVirtualIP() )
- dev = QString ( dev + ":100" );
+ dev = TQString ( dev + ":100" );
else
dev = tmpInterface;
- QFile RacoonSetRouteScript ( RacoonRouteSetScript );
- QTextStream stream ( &RacoonSetRouteScript );
+ TQFile RacoonSetRouteScript ( RacoonRouteSetScript );
+ TQTextStream stream ( &RacoonSetRouteScript );
if ( RacoonSetRouteScript.open ( IO_WriteOnly ) )
{
if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() )
@@ -20475,12 +20475,12 @@ void KVpnc::addRouteRacoon()
}
RacoonSetRouteScript.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( RacoonRouteSetScript );
- connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
if ( !RouteProcess->start ( env ) )
{
@@ -20513,26 +20513,26 @@ void KVpnc::delRouteRacoon()
// if ( DisconnectProcess != 0 )
{
- disconnect ( DisconnectProcess, SIGNAL ( processExited () ), this, SLOT ( delRouteRacoon() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( delRouteRacoon() ) );
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString RacoonRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh";
+ TQString RacoonRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh";
NetworkInterface iface ( GlobalConfig, parent );
- QString dev = "lo";
+ TQString dev = "lo";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
tmpInterface = iface.getDefaultInterface();
if ( GlobalConfig->currentProfile->getUseVirtualIP() )
- dev = QString ( dev + ":100" );
+ dev = TQString ( dev + ":100" );
else
dev = tmpInterface;
- QFile RacoonSetRouteScript ( RacoonRouteSetScript );
- QTextStream stream ( &RacoonSetRouteScript );
+ TQFile RacoonSetRouteScript ( RacoonRouteSetScript );
+ TQTextStream stream ( &RacoonSetRouteScript );
if ( RacoonSetRouteScript.open ( IO_WriteOnly ) )
{
if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() )
@@ -20553,13 +20553,13 @@ void KVpnc::delRouteRacoon()
}
RacoonSetRouteScript.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( RacoonRouteSetScript );
- connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
- // connect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesRacoon() ) );
+ 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() ) );
if ( !RouteProcess->start ( env ) )
{
@@ -20592,16 +20592,16 @@ void KVpnc::doIptablesRacoon()
// if ( ConnectProcess->normalExit () )
{
// if ( ConnectProcess )
- // disconnect( ConnectProcess, SIGNAL( processExited () ), this, SLOT( doIptablesRacoon() ) );
+ // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesRacoon() ) );
/*
iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT
*/
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IptablesProcess = new QProcess ( this );
+ IptablesProcess = new TQProcess ( this );
IptablesProcess->addArgument ( GlobalConfig->InterpreterShell );
IptablesProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_racoon.sh" );
- // connect( IptablesProcess, SIGNAL( processExited () ), this, SLOT( doRacoon() ) );
+ // connect( IptablesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doRacoon() ) );
if ( !IptablesProcess->start ( env ) )
{
@@ -20630,8 +20630,8 @@ void KVpnc::doPingKickupTunnel()
GlobalConfig->appendLogEntry ( i18n ( "Sending ping for kicking up the tunnel..." ), GlobalConfig->debug );
/* first: kick up the tunnel */
putenv ( ( char* ) ( "LC_ALL=C" ) );
- QProcess PingProcess;
- QString PathToPing = "";
+ TQProcess PingProcess;
+ TQString PathToPing = "";
ToolInfo *Tool;
for ( Tool = GlobalConfig->ToolList->first();Tool;Tool = GlobalConfig->ToolList->next() )
{
@@ -20660,9 +20660,9 @@ void KVpnc::doPingKickupTunnel()
void KVpnc::doRacoon()
{
- disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon_helper() ) );
- disconnect ( RacoonHelperProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon_helper() ) );
- disconnect ( RacoonHelperProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
@@ -20674,10 +20674,10 @@ void KVpnc::doRacoon()
/*
/usr/sbin/racoon -f <configfile> -l <logfile>
*/
- QFile f ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" );
+ TQFile f ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" );
if ( f.exists() )
f.remove();
- QTextStream s ( &f );
+ TQTextStream s ( &f );
if ( f.open ( IO_WriteOnly ) )
{
s << "\n";
@@ -20686,7 +20686,7 @@ void KVpnc::doRacoon()
s.unsetDevice();
putenv ( ( char* ) ( "LC_ALL=C" ) );
RacoonProcess = 0;
- RacoonProcess = new QProcess ( this );
+ RacoonProcess = new TQProcess ( this );
RacoonProcess->addArgument ( GlobalConfig->pathToRacoon );
RacoonProcess->addArgument ( "-F" ); // foreground we want :)
// RacoonProcess->addArgument ( "-v" );
@@ -20698,16 +20698,16 @@ void KVpnc::doRacoon()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "racoon: " + GlobalConfig->pathToRacoon + " -f " + tmpPath + "/racoon." + GlobalConfig->currentProfile->getName() + ".conf", GlobalConfig->debug );
-// RacoonProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
+// RacoonProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
// RacoonProcess->closeStdin();
- connect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
- connect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) );
+ connect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) );
+ connect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_racoon() ) );
if ( !RacoonProcess->start ( env ) )
{
- disconnect ( RacoonProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoon() ) );
- disconnect ( RacoonProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_racoon() ) );
+ disconnect ( RacoonProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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, SIGNAL( timeout() ), this, SLOT( slotDurationEvent() ) );
+ // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) );
// durationTimer.start( 1000, FALSE );
}
}
@@ -20750,8 +20750,8 @@ void KVpnc::stopRacoon()
GlobalConfig->appendLogEntry ( i18n ( "Stopping %1." ).arg ( "racoon" ), GlobalConfig->debug );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RacoonctlProcess = new QProcess ( this );
- QString PathToRacoonctl = "";
+ RacoonctlProcess = new TQProcess ( this );
+ TQString PathToRacoonctl = "";
ToolInfo* Tool = Utils ( GlobalConfig ).getToolInfo ( "racoonctl" );
PathToRacoonctl = Tool->PathToExec;
@@ -20760,29 +20760,29 @@ void KVpnc::stopRacoon()
RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP );
- connect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) );
- connect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) );
- connect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) );
+ 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() ) );
if ( !RacoonctlProcess->start ( env ) )
- KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ) );
+ KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ) );
else
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry ( i18n ( "%1 started. " ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->info );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 started. " ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->info );
while ( RacoonctlProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( QString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( TQString ( "racoonctl vpn-disconnect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
}
- disconnect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) );
- disconnect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) );
- disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
delete RacoonctlProcess;
RacoonctlProcess=0L;
}
@@ -20790,20 +20790,20 @@ void KVpnc::stopRacoon()
void KVpnc::doTailRacoonLog()
{
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RacoonTailProcess = new QProcess ( this );
+ RacoonTailProcess = new TQProcess ( this );
RacoonTailProcess->addArgument ( GlobalConfig->pathToTail );
RacoonTailProcess->addArgument ( "-n" );
RacoonTailProcess->addArgument ( "1000" );
RacoonTailProcess->addArgument ( "-f" );
RacoonTailProcess->addArgument ( tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" );
- connect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) );
- connect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) );
+ connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) );
+ connect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_tail_racoon() ) );
if ( !RacoonTailProcess->start ( env ) )
{
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_tail_racoon() ) );
- disconnect ( RacoonTailProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_tail_racoon() ) );
+ disconnect ( RacoonTailProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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" ) );
@@ -20813,7 +20813,7 @@ void KVpnc::doTailRacoonLog()
else
{
// status=connected;
- // setGuiStatus(connected);
+ // setGuitqStatus(connected);
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ), GlobalConfig->debug );
@@ -20827,10 +20827,10 @@ void KVpnc::removeIptablesRacoon()
// if ( DisconnectProcess != 0 )
{
// if ( DisconnectProcess )
- // disconnect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesRacoon() ) );
+ // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesRacoon() ) );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- DisconnectProcess = new QProcess ( this );
+ DisconnectProcess = new TQProcess ( this );
DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_racoon.sh" );
if ( !DisconnectProcess->start ( env ) )
@@ -20846,7 +20846,7 @@ void KVpnc::removeIptablesRacoon()
while ( DisconnectProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
}
delete DisconnectProcess;
@@ -20857,20 +20857,20 @@ void KVpnc::removeIptablesRacoon()
void KVpnc::removeSetkey()
{
if ( DisconnectProcess )
- disconnect ( DisconnectProcess, SIGNAL ( processExited () ), this, SLOT ( removeSetkey() ) );
+ disconnect ( DisconnectProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removeSetkey() ) );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RemoveSetkeyProcess = new QProcess ( this );
+ RemoveSetkeyProcess = new TQProcess ( this );
RemoveSetkeyProcess->addArgument ( GlobalConfig->InterpreterShell );
RemoveSetkeyProcess->addArgument ( tmpPath + "setkey." + GlobalConfig->currentProfile->getName() + ".remove_setkey.sh" );
- // connect( RemoveSetkeyProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_remove_setkey() ) );
- // connect( RemoveSetkeyProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_remove_setkey() ) );
- // connect( RemoveSetkeyProcess, SIGNAL( processExited () ), this, SLOT( delRouteRacoon() ) );
+ // 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() ) );
if ( !RemoveSetkeyProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
else
@@ -20880,7 +20880,7 @@ void KVpnc::removeSetkey()
while ( RemoveSetkeyProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
}
delete RemoveSetkeyProcess;
@@ -20893,12 +20893,12 @@ void KVpnc::doIptablesFreeswan()
{
// if ( ConnectProcess->normalExit () )
{
- // disconnect( ConnectProcess, SIGNAL( processExited () ), this, SLOT( doIptablesFreeswan() ) );
+ // disconnect( ConnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( doIptablesFreeswan() ) );
/*
iptables -I INPUT -p 50 -i $IFACE -s $VPNGW_IP -j ACCEPT
*/
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IptablesProcess = new QProcess ( this );
+ IptablesProcess = new TQProcess ( this );
IptablesProcess->addArgument ( GlobalConfig->InterpreterShell );
IptablesProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" );
@@ -20916,7 +20916,7 @@ void KVpnc::doIptablesFreeswan()
while ( IptablesProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
setFirewallAfterConnect();
@@ -20931,14 +20931,14 @@ void KVpnc::doIptablesFreeswan()
void KVpnc::addRouteIpsec()
{
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString IpsecRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh";
+ TQString IpsecRouteSetScript = tmpPath + "/set_route." + GlobalConfig->currentProfile->getName() + ".sh";
NetworkInterface iface ( GlobalConfig, parent );
- QString defaultinterface = iface.getDefaultInterface();
- QString dev = "lo";
+ TQString defaultinterface = iface.getDefaultInterface();
+ TQString dev = "lo";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
if ( iface.interfaceExist ( "ipsec0" ) )
tmpInterface = "ipsec0";
@@ -20946,12 +20946,12 @@ void KVpnc::addRouteIpsec()
tmpInterface = iface.getDefaultInterface();
if ( GlobalConfig->currentProfile->getUseVirtualIP() )
- dev = QString ( dev + ":100" );
+ dev = TQString ( dev + ":100" );
else
dev = tmpInterface;
- QFile IpsecSetRouteScript ( IpsecRouteSetScript );
- QTextStream stream ( &IpsecSetRouteScript );
+ TQFile IpsecSetRouteScript ( IpsecRouteSetScript );
+ TQTextStream stream ( &IpsecSetRouteScript );
if ( IpsecSetRouteScript.open ( IO_WriteOnly ) )
{
if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() )
@@ -20964,12 +20964,12 @@ void KVpnc::addRouteIpsec()
// stream << GlobalConfig->pathToRoute << " add -net " << RemoteNet << " " << dev << "\n"; // set by opnswan
IpsecSetRouteScript.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( IpsecRouteSetScript );
- connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
if ( !RouteProcess->start ( env ) )
{
@@ -20983,16 +20983,16 @@ void KVpnc::addRouteIpsec()
{
if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() )
GlobalConfig->appendLogEntry ( i18n ( "route (%1): route add default gw " ).arg ( "ipsec" ) + GlobalConfig->currentProfile->getGateway() + " " + tmpInterface, GlobalConfig->debug );
- // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).arg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).tqarg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
while ( RouteProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
}
}
- disconnect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
delete RouteProcess;
RouteProcess=0L;
}
@@ -21001,13 +21001,13 @@ void KVpnc::addRouteIpsec()
void KVpnc::delRouteIpsec()
{
tmpPath = locateLocal ( "data", "kvpnc/" );
- QString IpsecRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh";
+ TQString IpsecRouteSetScript = tmpPath + "/remove_route." + GlobalConfig->currentProfile->getName() + ".sh";
NetworkInterface iface ( GlobalConfig, parent );
- QString dev = "lo";
+ TQString dev = "lo";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
if ( iface.interfaceExist ( "ipsec0" ) )
tmpInterface = "ipsec0";
@@ -21015,12 +21015,12 @@ void KVpnc::delRouteIpsec()
tmpInterface = iface.getDefaultInterface();
if ( GlobalConfig->currentProfile->getUseVirtualIP() )
- dev = QString ( dev + ":100" );
+ dev = TQString ( dev + ":100" );
else
dev = tmpInterface;
- QFile IpsecSetRouteScript ( IpsecRouteSetScript );
- QTextStream stream ( &IpsecSetRouteScript );
+ TQFile IpsecSetRouteScript ( IpsecRouteSetScript );
+ TQTextStream stream ( &IpsecSetRouteScript );
if ( IpsecSetRouteScript.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -21035,16 +21035,16 @@ void KVpnc::delRouteIpsec()
stream << GlobalConfig->pathToRoute << " del -net " << RemoteNet << " " << dev << "\n";
IpsecSetRouteScript.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( IpsecRouteSetScript );
- connect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
if ( !RouteProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "del route ("+IpsecType+")" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "del route ("+IpsecType+")" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "del route (" + IpsecType + ")" ) , GlobalConfig->error );
}
else
@@ -21055,11 +21055,11 @@ void KVpnc::delRouteIpsec()
while ( RouteProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
}
- disconnect ( RouteProcess, SIGNAL ( readyReadStdout () ), this, SLOT ( readFromStdout_route() ) );
- disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout () ), this, TQT_SLOT ( readFromStdout_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
delete RouteProcess;
RouteProcess=0L;
}
@@ -21069,15 +21069,15 @@ void KVpnc::removeIptablesFreeswan()
{
// if ( DisconnectProcess->normalExit () )
{
- // disconnect( DisconnectProcess, SIGNAL( processExited () ), this, SLOT( removeIptablesFreeswan() ) );
+ // disconnect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeIptablesFreeswan() ) );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- DisconnectProcess = new QProcess ( this );
+ DisconnectProcess = new TQProcess ( this );
DisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
if ( !DisconnectProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ), GlobalConfig->error );
}
else
@@ -21087,7 +21087,7 @@ void KVpnc::removeIptablesFreeswan()
while ( DisconnectProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
}
delete DisconnectProcess;
@@ -21100,23 +21100,23 @@ void KVpnc::doPingTest()
/*
ping -c3 -I <interfaceIP> <gateway>
*/
- QString LocalIP;
- QString Interface;
+ TQString LocalIP;
+ TQString Interface;
NetworkInterface iface ( GlobalConfig, parent );
//LocalIP = iface.getInterfaceIP( iface.getDefaultInterface() );
if ( GlobalConfig->currentProfile->getNetworkDevice().isEmpty() )
Interface = iface.getInterfaceIP ( iface.getDefaultInterface() );
else
Interface = GlobalConfig->currentProfile->getNetworkDevice();
- QString PingHostIP = GlobalConfig->currentProfile->getPingHostIP();
+ TQString PingHostIP = GlobalConfig->currentProfile->getPingHostIP();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Host for ping: %1" ).arg ( PingHostIP ), GlobalConfig->debug );
/* first: kick up the tunnel */
putenv ( ( char* ) ( "LC_ALL=C" ) );
- PingProcess = new QProcess ( this );
+ PingProcess = new TQProcess ( this );
- QString PathToPing = "";
+ TQString PathToPing = "";
ToolInfo *Tool;
for ( Tool = GlobalConfig->ToolList->first();Tool;Tool = GlobalConfig->ToolList->next() )
{
@@ -21148,9 +21148,9 @@ void KVpnc::doPingTest()
//PingProcess->addArgument( Interface );
PingProcess->addArgument ( PingHostIP );
- connect ( PingProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ping() ) );
- connect ( PingProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ping() ) );
- connect ( PingProcess, SIGNAL ( processExited() ), this, SLOT ( pingTestExited() ) );
+ 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() ) );
pingtest = true;
@@ -21170,9 +21170,9 @@ void KVpnc::doPingTest()
{
sleep ( 1 );
}
- disconnect ( PingProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ping() ) );
- disconnect ( PingProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ping() ) );
- disconnect ( PingProcess, SIGNAL ( processExited() ), this, SLOT ( pingTestExited() ) );
+ 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() ) );
}
}
@@ -21182,15 +21182,15 @@ void KVpnc::doPingTest()
void KVpnc::pingTestExited()
{
- disconnect ( PingProcess, SIGNAL ( processExited () ), this, SLOT ( pingTestExited() ) );
- // disconnect( PingProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_ping() ) );
- // disconnect( PingProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_ping() ) );
+ 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() ) );
// pingtest = false;
}
void KVpnc::vpncStarted()
{
- disconnect ( VpncProcess, SIGNAL ( processExited () ), this, SLOT ( vpncStarted() ) );
+ disconnect ( VpncProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( vpncStarted() ) );
/* doing some after tunnel is up */
@@ -21198,14 +21198,14 @@ void KVpnc::vpncStarted()
// VpncProcess->addArgument( GlobalConfig->InterpreterShell );
// VpncProcess->addArgument( VpncConnectScript );
//
- // connect( VpncProcess, SIGNAL( readyReadStdout() ), this, SLOT( readOutputFrom_vpnc() ) );
+ // connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) );
//
// if ( !VpncProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc-connect" ) );
// } else {
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg("vpnc-connect"),GlobalConfig->info );
//
- // // connect( &timer, SIGNAL( timeout() ), this, SLOT( slotConnectTimedOut() ) );
+ // // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) );
// // timer.start( tryConnectTimeout * 1000, FALSE );
// //
// // mw->buttonConnect->setEnabled( false );
@@ -21223,7 +21223,7 @@ void KVpnc::racoonStarted()
int tryCounter=0;
while ( !AdminSockExist && tryCounter < 20 )
{
- AdminSockExist=QFile ( "/var/run/racoon/racoon.sock" ).exists();
+ AdminSockExist=TQFile ( "/var/run/racoon/racoon.sock" ).exists();
tryCounter++;
if ( tryCounter ==20 )
break;
@@ -21247,8 +21247,8 @@ void KVpnc::racoonStarted()
}
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RacoonctlProcess = new QProcess ( this );
- QString PathToRacoonctl = "";
+ RacoonctlProcess = new TQProcess ( this );
+ TQString PathToRacoonctl = "";
ToolInfo* Tool = Utils ( GlobalConfig ).getToolInfo ( "racoonctl" );
PathToRacoonctl = Tool->PathToExec;
@@ -21263,24 +21263,24 @@ void KVpnc::racoonStarted()
RacoonctlProcess->addArgument ( GlobalConfig->TmpGatewayIP );
- connect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) );
- connect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) );
- connect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( racoonctlExited() ) );
+ 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() ) );
if ( !RacoonctlProcess->start ( env ) )
if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
- KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ) );
+ KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ) );
else
- KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( QString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ) );
+ KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( TQString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ) );
else
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
{
if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
- GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( "racoonctl vpn-connect -u "+GlobalConfig->TmpUsername+" "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
else
- GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( QString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( TQString ( "racoonctl vpn-connect "+GlobalConfig->TmpGatewayIP ) ), GlobalConfig->debug );
}
if ( GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
@@ -21292,7 +21292,7 @@ void KVpnc::racoonStarted()
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
- QString UserPassStr = "";
+ TQString UserPassStr = "";
//if ( !GlobalConfig->currentProfile->getSaveUserPassword() || AuthRetry )
UserPassStr = GlobalConfig->TmpPassword;
//else
@@ -21318,9 +21318,9 @@ void KVpnc::racoonStarted()
GlobalConfig->appPointer->processEvents();
usleep ( 500 );
}
- disconnect ( RacoonctlProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_racoonctl() ) );
- disconnect ( RacoonctlProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_racoonctl() ) );
- disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
delete RacoonctlProcess;
RacoonctlProcess=0L;
}
@@ -21335,9 +21335,9 @@ void KVpnc::racoonStarted()
//
// GlobalConfig->status = GlobalConfig->connected;
//
- // connect( &durationTimer, SIGNAL( timeout() ), this, SLOT( slotDurationEvent() ) );
+ // connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) );
// durationTimer.start( 1000, FALSE );
- // setGuiStatus( connected );
+ // setGuitqStatus( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -21353,9 +21353,9 @@ void KVpnc::racoonStarted()
void KVpnc::ipsecStarted()
{
- disconnect ( IpsecStartProcess, SIGNAL ( processExited () ), this, SLOT ( ipsecStarted() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
+ 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() ) );
delete IpsecStartProcess;
IpsecStartProcess=0L;
@@ -21365,7 +21365,7 @@ void KVpnc::ipsecStarted()
// GlobalConfig->appendLogEntry ( "[ipsec] " + i18n ( "Starting connection \"%1\"..." ).arg ( GlobalConfig->currentProfile->getName() ) , GlobalConfig->debug );
// /* Kick up the connection */
-// IpsecProcess = new QProcess ( this );
+// IpsecProcess = new TQProcess ( this );
// //
// IpsecProcess->addArgument ( GlobalConfig->pathToIpsec );
// IpsecProcess->addArgument ( "auto" );
@@ -21375,9 +21375,9 @@ void KVpnc::ipsecStarted()
// IpsecProcess->addArgument ( GlobalConfig->currentProfile->getName() );
//
//
-// connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
-// connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
-// // connect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( doRouteFreeswan() ) );
+// 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() ) );
//
// if ( !IpsecStartProcess->start(env) )
// {
@@ -21393,15 +21393,15 @@ void KVpnc::ipsecStarted()
// {
// sleep(1);
// }
-// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStderr_ipsec() ) );
-// disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
-// // disconnect( IpsecStartProcess, SIGNAL( processExited () ), this, SLOT( doRouteFreeswan() ) );
+// 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() ) );
// delete IpsecStartProcess;
// IpsecStartProcess=0L;
// }
IpsecStatusCheck=true;
- checkIpsecWhackStatus();
+ checkIpsecWhacktqStatus();
IpsecStatusCheck=false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -21411,18 +21411,18 @@ void KVpnc::ipsecStarted()
connectCounter=0;
sleep ( 1 );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackListenProcess = new QProcess ( this );
+ IpsecWhackListenProcess = new TQProcess ( this );
IpsecWhackListenProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackListenProcess->addArgument ( "whack" );
IpsecWhackListenProcess->addArgument ( "--listen" );
- connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) );
- connect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) );
+ connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
+ connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
if ( !IpsecWhackListenProcess->start ( env ) )
{
- disconnect ( IpsecWhackListenProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhacklisten() ) );
- disconnect ( IpsecWhackListenProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhacklisten() ) );
+ disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
+ disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
delete IpsecWhackListenProcess;
IpsecWhackListenProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) );
@@ -21442,29 +21442,29 @@ void KVpnc::ipsecStarted()
}
}
-void KVpnc::checkIpsecWhackStatus()
+void KVpnc::checkIpsecWhacktqStatus()
{
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackStatusProcess = new QProcess ( this );
+ IpsecWhackStatusProcess = new TQProcess ( this );
IpsecWhackStatusProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackStatusProcess->addArgument ( "whack" );
IpsecWhackStatusProcess->addArgument ( "--status" );
- disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) );
- disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) );
- connect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) );
- connect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) );
+ 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() ) );
- connect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( IpsecWhackStatusProcessExited() ) );
+ connect ( IpsecWhackStatusProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( IpsecWhackStatusProcessExited() ) );
if ( !IpsecWhackStatusProcess->start ( env ) )
{
if ( IpsecStatusCheck == false && IpsecPhase2Up==false )
{
- disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) );
- disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) );
- disconnect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( 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() ) );
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, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
- connect ( &timer, SIGNAL ( timeout() ), this, SLOT ( slotConnectTimedOut() ) );
+ disconnect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
+ connect ( &timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotConnectTimedOut() ) );
// FIXME make connect timeout value in GUI available
timer.start ( 2000 * 1000, FALSE );
}
if ( !IpsecWhackStatusTimer.isActive() )
{
- disconnect ( &IpsecWhackStatusTimer, SIGNAL ( timeout() ), this, SLOT ( checkIpsecWhackStatus() ) );
- connect ( &IpsecWhackStatusTimer, SIGNAL ( timeout() ), this, SLOT ( checkIpsecWhackStatus() ) );
+ disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
+ connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
IpsecWhackStatusTimer.start ( 5 * 1000, FALSE );
}
}
@@ -21500,7 +21500,7 @@ void KVpnc::startStopIpsec ( bool stop, bool silent )
ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ;
- IpsecStartProcess = new QProcess ( this );
+ IpsecStartProcess = new TQProcess ( this );
if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) )
{
@@ -21561,8 +21561,8 @@ void KVpnc::startStopIpsec ( bool stop, bool silent )
if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 )
{
- connect ( IpsecStartProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- connect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
+ connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) );
+ connect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsec() ) );
- disconnect ( IpsecStartProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsec() ) );
+ disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsec() ) );
+ disconnect ( IpsecStartProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsec() ) );
}
}
}
@@ -21627,8 +21627,8 @@ void KVpnc::addIpsecConnection()
void KVpnc::start_ipsec_initiate()
{
// strongswan after ipsec whack --listen
- /* disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
+ /* disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) );
+ disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) );
delete(IpsecWhackProcess);*/
if ( IpsecGotError)
@@ -21636,21 +21636,21 @@ void KVpnc::start_ipsec_initiate()
sleep ( 4 );
putenv ( ( char* ) ( "LC_ALL=C" ) );
- IpsecWhackProcess = new QProcess ( this );
+ IpsecWhackProcess = new TQProcess ( this );
IpsecWhackProcess->addArgument ( GlobalConfig->pathToIpsec );
IpsecWhackProcess->addArgument ( "whack" );
IpsecWhackProcess->addArgument ( "--name" );
IpsecWhackProcess->addArgument ( GlobalConfig->currentProfile->getName() );
IpsecWhackProcess->addArgument ( "--initiate" );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- connect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
if ( !IpsecWhackProcess->start ( env ) )
{
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( exited() ), this, SLOT ( ipsecwhack_exited() ) );
+ 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() ) );
delete IpsecWhackProcess;
IpsecWhackProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --name "+GlobalConfig->currentProfile->getName() +" --initiate" ) );
@@ -21663,7 +21663,7 @@ void KVpnc::start_ipsec_initiate()
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToIpsec+" whack --name "+GlobalConfig->currentProfile->getName() +" --initiate" ), GlobalConfig->debug );
if (!IpsecGotError)
- checkIpsecWhackStatus();
+ checkIpsecWhacktqStatus();
}
@@ -21706,10 +21706,10 @@ void KVpnc::ipsecPhase2Established()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -21727,24 +21727,24 @@ void KVpnc::ipsecPhase2Established()
}
-void KVpnc::doAddRemoveVirtualIp(QString vaction)
+void KVpnc::doAddRemoveVirtualIp(TQString vaction)
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "doAddRemoveVirtualIp() action: %1" ).arg ( vaction ), GlobalConfig->debug );
- QString ActionPretty=i18n("Adding");
+ TQString ActionPretty=i18n("Adding");
if (vaction =="del")
ActionPretty=i18n("Removing");
if ( GlobalConfig->KvpncDebugLevel > 4 )
- GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).arg(ActionPretty).arg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).tqarg(ActionPretty).tqarg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
// FIXME convert LeftSourceIp to Virtual IP
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QString IpsecVirtualIpFilename = tmpPath+"do-"+vaction+"-"+GlobalConfig->currentProfile->getName()+".virtualip.sh";
- QFile virtualfile ( IpsecVirtualIpFilename );
- QTextStream stream ( &virtualfile );
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQString IpsecVirtualIpFilename = tmpPath+"do-"+vaction+"-"+GlobalConfig->currentProfile->getName()+".virtualip.sh";
+ TQFile virtualfile ( IpsecVirtualIpFilename );
+ TQTextStream stream ( &virtualfile );
if ( virtualfile.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
@@ -21783,7 +21783,7 @@ void KVpnc::doAddRemoveVirtualIp(QString vaction)
virtualfile.close();
- QProcess IpsecVirtualIpProcess;
+ TQProcess IpsecVirtualIpProcess;
IpsecVirtualIpProcess.addArgument ( GlobalConfig->InterpreterShell );
IpsecVirtualIpProcess.addArgument ( IpsecVirtualIpFilename );
@@ -21807,15 +21807,15 @@ void KVpnc::doAddRemoveVirtualIp(QString vaction)
}
else
{
- GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).arg("VirtualIpScript"), GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).tqarg("VirtualIpScript"), GlobalConfig->error );
}
}
void KVpnc::pppdStarted()
{
-// disconnect ( PptpProcess, SIGNAL( processExited () ), this, SLOT( pppdStarted() ) );
-// disconnect ( pppdUpProcess, SIGNAL ( processExited () ), this, SLOT ( pppdStarted() ) );
+// disconnect ( PptpProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( pppdStarted() ) );
+// disconnect ( pppdUpProcess, TQT_SIGNAL ( processExited () ), this, TQT_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, SIGNAL ( processExited () ), this, SLOT ( openvpnStarted() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( openvpnStarted() ) );
}
@@ -21833,7 +21833,7 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent )
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[openl2tp] " + i18n ( "Starting %1..." ).arg ( "/etc/init.d/openl2tpd" ) , GlobalConfig->debug );
- StartStopOpenl2tpProcess = new QProcess ( this );
+ StartStopOpenl2tpProcess = new TQProcess ( this );
StartStopOpenl2tpProcess->addArgument ( "/etc/init.d/openl2tp" );
if ( stop==false )
@@ -21859,8 +21859,8 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent )
if ( silent==false|| GlobalConfig->KvpncDebugLevel > 8 )
{
- connect ( StartStopOpenl2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_startstopOpenl2tp() ) );
- connect ( StartStopOpenl2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( rreadFromStderr_startstopOpenl2tp() ) );
+ connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_startstopOpenl2tp() ) );
+ connect ( StartStopOpenl2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( rreadFromStderr_startstopOpenl2tp() ) );
}
IpsecStartingInProgress=true;
@@ -21939,7 +21939,7 @@ void KVpnc::startStopOpenl2tp ( bool stop, bool silent )
}
-QString KVpnc::getX509CertificateID ( QString Cert, bool user )
+TQString KVpnc::getX509CertificateID ( TQString Cert, bool user )
{
issuerID = "";
userID = "";
@@ -21952,7 +21952,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user )
openssl x509 -noout -subject -in mykeys.pem
*/
putenv ( ( char* ) ( "LC_ALL=C" ) );
- X509CertificateExtractProcess = new QProcess ( this );
+ X509CertificateExtractProcess = new TQProcess ( this );
X509CertificateExtractProcess->addArgument ( GlobalConfig->pathToOpenssl );
X509CertificateExtractProcess->addArgument ( "x509" );
X509CertificateExtractProcess->addArgument ( "-noout" );
@@ -21966,15 +21966,15 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user )
X509CertificateExtractUser = user;
- connect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) );
- connect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) );
- connect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) );
+ 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() ) );
if ( !X509CertificateExtractProcess->start ( env ) )
{
- disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) );
- disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) );
- disconnect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) );
+ 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() ) );
delete X509CertificateExtractProcess;
X509CertificateExtractProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "openssl" ) );
@@ -21983,7 +21983,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user )
}
else
{
- //KMessageBox::information( this, i18n( "\"%1\" started." ).arg("openssl") );
+ //KMessageBox::information( this, i18n( "\"%1\" started." ).tqarg("openssl") );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "openssl (getCertificate)" ), GlobalConfig->debug );
X509CertificateExtractRunning = true;
@@ -21992,11 +21992,11 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Waiting for process end (getCertificate)." ), GlobalConfig->debug );
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
}
- disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_getX509CertificateID() ) );
- disconnect ( X509CertificateExtractProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_getX509CertificateID() ) );
- disconnect ( X509CertificateExtractProcess, SIGNAL ( processExited () ), this, SLOT ( openSSLEnded() ) );
+ 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() ) );
delete X509CertificateExtractProcess;
X509CertificateExtractProcess=0L;
if ( user )
@@ -22009,7 +22009,7 @@ QString KVpnc::getX509CertificateID ( QString Cert, bool user )
void KVpnc::readFromStdout_getX509CertificateID()
{
- QString ProcessMsg = "";
+ TQString ProcessMsg = "";
if ( X509CertificateExtractProcess->canReadLineStdout() )
ProcessMsg = X509CertificateExtractProcess->readLineStdout();
if ( !ProcessMsg.isEmpty() )
@@ -22035,7 +22035,7 @@ void KVpnc::readFromStdout_getX509CertificateID()
void KVpnc::readFromStderr_getX509CertificateID()
{
- QString ProcessMsg = QString ( X509CertificateExtractProcess->readStderr() );
+ TQString ProcessMsg = TQString ( X509CertificateExtractProcess->readStderr() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "getX509CertificateID() err: %1" ).arg ( ProcessMsg ), GlobalConfig->debug );
}
@@ -22064,8 +22064,8 @@ void KVpnc::manageCiscoCertClicked()
void KVpnc::enrollCiscoCertClicked()
{
- QString ciscoCertMgr = GlobalConfig->pathToCiscoCertMgr;
- if (!ciscoCertMgr.isEmpty() && QFile::exists(ciscoCertMgr))
+ TQString ciscoCertMgr = GlobalConfig->pathToCiscoCertMgr;
+ if (!ciscoCertMgr.isEmpty() && TQFile::exists(ciscoCertMgr))
{
CiscoCertificateEnrollment dlg ( this, i18n ( "Enroll certificate..." ).ascii(), GlobalConfig );
dlg.exec();
@@ -22086,27 +22086,27 @@ void KVpnc::executeCommandBeforeConnect()
{
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() && !GlobalConfig->currentProfile->getCommandBeforeConnect().isEmpty() )
{
- QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeConnect() );
+ TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeConnect() );
// write command after connect script
- QString CmdBeforeConnectScript = tmpPath + "cmd_before_connect_script." + GlobalConfig->currentProfile->getName();
+ TQString CmdBeforeConnectScript = tmpPath + "cmd_before_connect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "CmdBeforeConnectScript: " + CmdBeforeConnectScript + "\n", GlobalConfig->debug );
- QFile file ( CmdBeforeConnectScript );
- QTextStream stream ( &file );
+ TQFile file ( CmdBeforeConnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
+ for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
stream << *it << " ; ";
file.close();
- CmdBeforeConnectProcess = new QProcess ( this );
+ CmdBeforeConnectProcess = new TQProcess ( this );
CmdBeforeConnectProcess->addArgument ( GlobalConfig->InterpreterShell );
CmdBeforeConnectProcess->addArgument ( CmdBeforeConnectScript );
- connect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeConnect() ) );
- connect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeConnect() ) );
+ connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) );
+ connect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Executing command before connect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug );
@@ -22120,13 +22120,13 @@ void KVpnc::executeCommandBeforeConnect()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "CmdBeforeConnectScript" ), GlobalConfig->debug );
while ( CmdBeforeConnectProcess->isRunning() )
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeConnectScript" ), GlobalConfig->debug );
}
- disconnect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeConnect() ) );
- disconnect ( CmdBeforeConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeConnect() ) );
+ disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeConnect() ) );
+ disconnect ( CmdBeforeConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeConnect() ) );
delete CmdBeforeConnectProcess;
CmdBeforeConnectProcess =0L;
}
@@ -22141,30 +22141,30 @@ void KVpnc::executeCommandAfterConnect()
{
if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() && !GlobalConfig->currentProfile->getCommandAfterConnect().isEmpty() )
{
- QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterConnect() );
+ TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterConnect() );
// write command after connect script
- QString CmdAfterConnectScript = tmpPath + "cmd_after_connect_script." + GlobalConfig->currentProfile->getName();
+ TQString CmdAfterConnectScript = tmpPath + "cmd_after_connect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "CmdAfterConnectScript: " + CmdAfterConnectScript + "\n", GlobalConfig->debug );
- QFile file ( CmdAfterConnectScript );
- QTextStream stream ( &file );
+ TQFile file ( CmdAfterConnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
+ for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
stream << *it << " ; ";
file.close();
- CmdAfterConnectProcess = new QProcess ( this );
+ CmdAfterConnectProcess = new TQProcess ( this );
CmdAfterConnectProcess->addArgument ( GlobalConfig->InterpreterShell );
CmdAfterConnectProcess->addArgument ( CmdAfterConnectScript );
- connect ( CmdAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterConnect() ) );
- connect ( CmdAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterConnect() ) );
+ connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) );
+ connect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) );
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry ( i18n ( "Sleeping %1s before executing command after connect..." ).arg ( QString().setNum ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Sleeping %1s before executing command after connect..." ).arg ( TQString().setNum ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() ) ), GlobalConfig->debug );
sleep ( GlobalConfig->currentProfile->getCommandAfterConnectDelayTime() );
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -22179,13 +22179,13 @@ void KVpnc::executeCommandAfterConnect()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "CmdAfterConnectScript" ), GlobalConfig->debug );
while ( CmdAfterConnectProcess->isRunning() )
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterConnectScript" ), GlobalConfig->debug );
}
- disconnect ( CmdAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterConnect() ) );
- disconnect ( CmdAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterConnect() ) );
+ disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterConnect() ) );
+ disconnect ( CmdAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterConnect() ) );
delete CmdAfterConnectProcess;
CmdAfterConnectProcess=0L;
@@ -22202,26 +22202,26 @@ void KVpnc::executeCommandBeforeDisconnect()
{
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeDisconnect() && !GlobalConfig->currentProfile->getCommandBeforeDisconnect().isEmpty() )
{
- QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeDisconnect() );
+ TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandBeforeDisconnect() );
// write command after connect script
- QString CmdBeforeDisconnectScript = tmpPath + "cmd_before_disconnect_script." + GlobalConfig->currentProfile->getName();
+ TQString CmdBeforeDisconnectScript = tmpPath + "cmd_before_disconnect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "CmdBeforeDisconnectScript: " + CmdBeforeDisconnectScript + "\n", GlobalConfig->debug );
- QFile file ( CmdBeforeDisconnectScript );
- QTextStream stream ( &file );
+ TQFile file ( CmdBeforeDisconnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
+ for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
stream << *it << " ; ";
file.close();
- CmdBeforeDisconnectProcess = new QProcess ( this );
+ CmdBeforeDisconnectProcess = new TQProcess ( this );
CmdBeforeDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
CmdBeforeDisconnectProcess->addArgument ( CmdBeforeDisconnectScript );
- connect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) );
- connect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) );
+ connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) );
+ connect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) );
if ( !CmdBeforeDisconnectProcess->start ( env ) )
{
@@ -22236,14 +22236,14 @@ void KVpnc::executeCommandBeforeDisconnect()
while ( CmdBeforeDisconnectProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdBeforeDisconnectScript" ), GlobalConfig->debug );
}
- disconnect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) );
- disconnect ( CmdBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) );
+ disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandBeforeDisconnect() ) );
+ disconnect ( CmdBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandBeforeDisconnect() ) );
delete CmdBeforeDisconnectProcess;
CmdBeforeDisconnectProcess=0L;
@@ -22261,27 +22261,27 @@ void KVpnc::executeCommandAfterDisconnect()
{
if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() && !GlobalConfig->currentProfile->getCommandAfterDisconnect().isEmpty() )
{
- QStringList cmds = QStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterDisconnect() );
+ TQStringList cmds = TQStringList::split ( '\n',GlobalConfig->currentProfile->getCommandAfterDisconnect() );
// write command after connect script
- QString CmdAfterDisconnectScript = tmpPath + "cmd_after_disconnect_script." + GlobalConfig->currentProfile->getName();
+ TQString CmdAfterDisconnectScript = tmpPath + "cmd_after_disconnect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "CmdAfterDisconnectScript: " + CmdAfterDisconnectScript + "\n", GlobalConfig->debug );
- QFile file ( CmdAfterDisconnectScript );
- QTextStream stream ( &file );
+ TQFile file ( CmdAfterDisconnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- for ( QStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
+ for ( TQStringList::Iterator it = cmds.begin(); it != cmds.end(); ++it )
stream << *it << " ; ";
file.close();
- CmdAfterDisconnectProcess = new QProcess ( this );
+ CmdAfterDisconnectProcess = new TQProcess ( this );
CmdAfterDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
CmdAfterDisconnectProcess->addArgument ( CmdAfterDisconnectScript );
- connect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterDisconnect() ) );
- connect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterDisconnect() ) );
+ connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) );
+ connect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Executing command after disconnect:\n%1" ).arg ( cmds.join ( ";" ) ), GlobalConfig->debug );
@@ -22297,14 +22297,14 @@ void KVpnc::executeCommandAfterDisconnect()
while ( CmdAfterDisconnectProcess->isRunning() )
{
usleep ( 500 );
- // parent->QApplication::processEvents();
+ // parent->TQApplication::processEvents();
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "CmdAfterDisconnectScript" ), GlobalConfig->debug );
}
- disconnect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_executeCommandAfterDisconnect() ) );
- disconnect ( CmdAfterDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_executeCommandAfterDisconnect() ) );
+ disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_executeCommandAfterDisconnect() ) );
+ disconnect ( CmdAfterDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_executeCommandAfterDisconnect() ) );
delete CmdAfterDisconnectProcess;
CmdAfterDisconnectProcess=0L;
}
@@ -22319,11 +22319,11 @@ void KVpnc::setFirewallAfterConnect()
{
// write firewall after connect script
- QString SetFirewallAfterConnectScript = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName();
+ TQString SetFirewallAfterConnectScript = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "setFirewallAfterConnectScript: " + SetFirewallAfterConnectScript + "\n", GlobalConfig->debug );
- QFile file ( SetFirewallAfterConnectScript );
- QTextStream stream ( &file );
+ TQFile file ( SetFirewallAfterConnectScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
if ( GlobalConfig->currentProfile->getFixPathMtuDiscoveryProblem() && Utils ( GlobalConfig ).getToolInfo ( "iptables" )->found )
@@ -22338,17 +22338,17 @@ void KVpnc::setFirewallAfterConnect()
}
file.close();
- SetFirewallAfterConnectProcess = new QProcess ( this );
+ SetFirewallAfterConnectProcess = new TQProcess ( this );
SetFirewallAfterConnectProcess->addArgument ( GlobalConfig->InterpreterShell );
SetFirewallAfterConnectProcess->addArgument ( SetFirewallAfterConnectScript );
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// {
-// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) );
-// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) );
-// connect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) );
-// connect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) );
+// 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() ) );
// }
@@ -22374,8 +22374,8 @@ void KVpnc::setFirewallAfterConnect()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "SetFirewallAfterConnectScript" ), GlobalConfig->debug );
}
-// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallAfterConnect() ) );
-// disconnect ( SetFirewallAfterConnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallAfterConnect() ) );
+// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallAfterConnect() ) );
+// disconnect ( SetFirewallAfterConnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallAfterConnect() ) );
delete SetFirewallAfterConnectProcess;
SetFirewallAfterConnectProcess=0L;
@@ -22390,11 +22390,11 @@ void KVpnc::setFirewallAfterConnect()
void KVpnc::setFirewallBeforeDisconnect()
{
// write firewall after connect script
- QString SetFirewallBeforeDisconnect = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName();
+ TQString SetFirewallBeforeDisconnect = tmpPath + "firewall_after_connect_script." + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "SetFirewallBeforeDisconnect: " + SetFirewallBeforeDisconnect + "\n", GlobalConfig->debug );
- QFile file ( SetFirewallBeforeDisconnect );
- QTextStream stream ( &file );
+ TQFile file ( SetFirewallBeforeDisconnect );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
// see http://pptpclient.sourceforge.net/howto-diagnosis.phtml#connections_freeze
@@ -22409,17 +22409,17 @@ void KVpnc::setFirewallBeforeDisconnect()
}
file.close();
- SetFirewallBeforeDisconnectProcess = new QProcess ( this );
+ SetFirewallBeforeDisconnectProcess = new TQProcess ( this );
SetFirewallBeforeDisconnectProcess->addArgument ( GlobalConfig->InterpreterShell );
SetFirewallBeforeDisconnectProcess->addArgument ( SetFirewallBeforeDisconnect );
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// {
-// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) );
-// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) );
-// connect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) );
-// connect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) );
+// 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() ) );
// }
@@ -22437,14 +22437,14 @@ void KVpnc::setFirewallBeforeDisconnect()
while ( SetFirewallBeforeDisconnectProcess->isRunning() )
{
sleep ( 1 );
- parent->QApplication::processEvents();
+ parent->TQApplication::processEvents();
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" finished." ).arg ( "setFirewallBeforeDisconnect" ), GlobalConfig->debug );
}
-// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) );
-// disconnect ( SetFirewallBeforeDisconnectProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) );
+// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_setFirewallBeforeDisconnect() ) );
+// disconnect ( SetFirewallBeforeDisconnectProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_setFirewallBeforeDisconnect() ) );
delete SetFirewallBeforeDisconnectProcess;
SetFirewallBeforeDisconnectProcess=0L;
}
@@ -22461,15 +22461,15 @@ void KVpnc::doRoutePptp()
route add -net 192.168.1.0/24 eth0
*/
putenv ( ( char* ) ( "LC_ALL=C" ) );
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( "/sbin/route" );
RouteProcess->addArgument ( "add" );
RouteProcess->addArgument ( "-net" );
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
- QString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
- QString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetMask = GlobalConfig->currentProfile->getRemoteNetMask();
+ TQString RemoteNet = RemoteNetAddr + "/" + RemoteNetMask;
RouteProcess->addArgument ( RemoteNet );
- QString dev;
+ TQString dev;
if ( !GlobalConfig->currentProfile->getNetworkDevice().isEmpty() )
dev = GlobalConfig->currentProfile->getNetworkDevice();
@@ -22479,15 +22479,15 @@ void KVpnc::doRoutePptp()
if ( GlobalConfig->KvpncDebugLevel > 0 )
{
NetworkInterface iface ( GlobalConfig, parent );
- QString defaultinterface = iface.getDefaultInterface();
+ TQString defaultinterface = iface.getDefaultInterface();
GlobalConfig->appendLogEntry ( i18n ( "Default interface %1" ).arg ( defaultinterface ), GlobalConfig->debug );
}
RouteProcess->addArgument ( dev );
tmpInterface = dev;
- connect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
if ( !RouteProcess->start ( env ) )
{
@@ -22504,15 +22504,15 @@ void KVpnc::doRoutePptp()
sleep ( 1 );
}
}
- disconnect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_pptp() ) );
- disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_pptp() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
delete RouteProcess;
RouteProcess=0L;
}
void KVpnc::slotConnecting()
{
- setGuiStatus ( connecting );
+ setGuitqStatus ( connecting );
}
void KVpnc::profileAddedOrDeleted()
@@ -22574,12 +22574,12 @@ bool KVpnc::setVirtualIP()
}
setVirtualIPSuccess=true;
- SetVirtualIPProcess = new QProcess(this);
+ SetVirtualIPProcess = new TQProcess(this);
SetVirtualIPProcess->addArgument(GlobalConfig->pathToIfconfig);
- SetVirtualIPProcess->addArgument(QString(NetworkDevice+":100"));
+ SetVirtualIPProcess->addArgument(TQString(NetworkDevice+":100"));
SetVirtualIPProcess->addArgument(GlobalConfig->currentProfile->getVirtualIP());
- connect( SetVirtualIPProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_setVirtualIP() ) );
- connect( SetVirtualIPProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_setVirtualIP() ) );
+ connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_setVirtualIP() ) );
+ connect( SetVirtualIPProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_setVirtualIP() ) );
if ( !SetVirtualIPProcess->start(env) )
{
@@ -22608,7 +22608,7 @@ void KVpnc::toggleDebugConsole()
GlobalConfig->showDebugConsole = true;
DebugconsoleAction ->setChecked ( true );
mw->DebugOutput->show();
- //resize( minimumSizeHint() );
+ //resize( tqminimumSizeHint() );
}
else
{
@@ -22616,7 +22616,7 @@ void KVpnc::toggleDebugConsole()
DebugconsoleAction ->setChecked ( false );
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( minimumSizeHint() );
+ // this->resize( tqminimumSizeHint() );
}
}
@@ -22629,14 +22629,14 @@ void KVpnc::addAdditionalNetworkRoutes()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Setting additional network routes..." ), GlobalConfig->debug );
- QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
+ TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
int count=1;
- QString dev = GlobalConfig->currentProfile->getNetworkDevice();
+ TQString dev = GlobalConfig->currentProfile->getNetworkDevice();
NetworkInterface iface ( GlobalConfig, parent );
- QString defaultinterface = iface.getDefaultInterface();
+ TQString defaultinterface = iface.getDefaultInterface();
if ( dev.isEmpty() )
@@ -22654,24 +22654,24 @@ void KVpnc::addAdditionalNetworkRoutes()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Default interface: %1" ).arg ( dev ), GlobalConfig->debug );
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
- QString Route="";
- QStringList RoutesList;
- QTextStream stream ( &file );
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQFile file ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
+ TQString Route="";
+ TQStringList RoutesList;
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
- for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
+ for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
{
- Route += "\t"+QString().setNum ( count ) +": ";
+ Route += "\t"+TQString().setNum ( count ) +": ";
count++;
- QString net = ( *it ).section ( '#', 0, 0 );
+ TQString net = ( *it ).section ( '#', 0, 0 );
- QString Gateway = QString ( *it ).section ( '#', 1, 1 );
- QString GatewayString = "";
- QString Interface = QString ( *it ).section ( '#', 2, 2 );
- QString InterfaceString = "";
+ TQString Gateway = TQString ( *it ).section ( '#', 1, 1 );
+ TQString GatewayString = "";
+ TQString Interface = TQString ( *it ).section ( '#', 2, 2 );
+ TQString InterfaceString = "";
bool extended = false;
Route += net;
if ( !Gateway.isEmpty() && Gateway != "-" )
@@ -22705,13 +22705,13 @@ void KVpnc::addAdditionalNetworkRoutes()
}
file.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( tmpPath + "addAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
tmpInterface = dev;
- connect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_route() ) );
- connect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) );
+ connect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
if ( !RouteProcess->start ( env ) )
{
@@ -22724,7 +22724,7 @@ void KVpnc::addAdditionalNetworkRoutes()
if ( GlobalConfig->KvpncDebugLevel > 1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Adding the following additional network routes:" ), GlobalConfig->debug );
- for ( QStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it )
+ for ( TQStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it )
GlobalConfig->appendLogEntry ( *it , GlobalConfig->debug );
}
while ( RouteProcess->isRunning() )
@@ -22733,8 +22733,8 @@ void KVpnc::addAdditionalNetworkRoutes()
// parent->processEvents();
}
}
- disconnect ( RouteProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_route() ) );
- disconnect ( RouteProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_route() ) );
+ disconnect ( RouteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_route() ) );
delete RouteProcess;
RouteProcess=0L;
}
@@ -22745,11 +22745,11 @@ void KVpnc::removeAdditionalNetworkRoutes()
{
if ( !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() )
{
- QStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
- QString dev = GlobalConfig->currentProfile->getNetworkDevice();
+ TQStringList AdditionalNetworkRoutes = GlobalConfig->currentProfile->getAdditionalNetworkRoutes();
+ TQString dev = GlobalConfig->currentProfile->getNetworkDevice();
NetworkInterface iface ( GlobalConfig, parent );
- QString defaultinterface = iface.getDefaultInterface();
+ TQString defaultinterface = iface.getDefaultInterface();
int count=1;
if ( dev.isEmpty() )
@@ -22769,24 +22769,24 @@ void KVpnc::removeAdditionalNetworkRoutes()
GlobalConfig->appendLogEntry ( i18n ( "Default interface: %1" ).arg ( defaultinterface ), GlobalConfig->debug );
tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile file ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
- QString Route="";
- QStringList RoutesList;
- QTextStream stream ( &file );
+ TQFile file ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
+ TQString Route="";
+ TQStringList RoutesList;
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "#!"<< GlobalConfig->InterpreterShell << "\n";
- for ( QStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
+ for ( TQStringList::Iterator it = AdditionalNetworkRoutes.begin(); it != AdditionalNetworkRoutes.end();++it )
{
- Route += "\t"+QString().setNum ( count ) +": ";
+ Route += "\t"+TQString().setNum ( count ) +": ";
count++;
- QString net = ( *it ).section ( '#', 0, 0 );
+ TQString net = ( *it ).section ( '#', 0, 0 );
- QString Gateway = QString ( *it ).section ( '#', 1, 1 );
- QString GatewayString = "";
- QString Interface = QString ( *it ).section ( '#', 2, 2 );
- QString InterfaceString = "";
+ TQString Gateway = TQString ( *it ).section ( '#', 1, 1 );
+ TQString GatewayString = "";
+ TQString Interface = TQString ( *it ).section ( '#', 2, 2 );
+ TQString InterfaceString = "";
bool extended = false;
Route += net;
if ( !Gateway.isEmpty() && Gateway != "-" )
@@ -22821,7 +22821,7 @@ void KVpnc::removeAdditionalNetworkRoutes()
}
file.close();
- RouteProcess = new QProcess ( this );
+ RouteProcess = new TQProcess ( this );
RouteProcess->addArgument ( GlobalConfig->InterpreterShell );
RouteProcess->addArgument ( tmpPath + "delAdditionalNetworkRoutes." + GlobalConfig->currentProfile->getName() + ".sh" );
tmpInterface = dev;
@@ -22837,7 +22837,7 @@ void KVpnc::removeAdditionalNetworkRoutes()
if ( GlobalConfig->KvpncDebugLevel > 1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Removing the following additional network routes:" ), GlobalConfig->debug );
- for ( QStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it )
+ for ( TQStringList::Iterator it = RoutesList.begin(); it != RoutesList.end(); ++it )
GlobalConfig->appendLogEntry ( *it , GlobalConfig->debug );
}
while ( RouteProcess->isRunning() )
@@ -22863,7 +22863,7 @@ void KVpnc::showLogViewer()
void KVpnc::doQuickConnect ( int id )
{
- QString itemtext = QuickConnectMenu->text ( id );
+ TQString itemtext = QuickConnectMenu->text ( id );
if ( GlobalConfig->KvpncDebugLevel > 4 )
GlobalConfig->appendLogEntry ( i18n ( "Quick connect to \"%1\" selected. Current profile: \"%2\"" ).arg ( itemtext ).arg ( GlobalConfig->currentProfile->getName() ), GlobalConfig->info );
@@ -22874,14 +22874,14 @@ void KVpnc::doQuickConnect ( int id )
GlobalConfig->appendLogEntry ( i18n ( "Connect to \"%1\" requested but still to \"%2\" connected, current connection will be terminated." ).arg ( GlobalConfig->currentProfile->getName() ).arg ( itemtext ), GlobalConfig->info );
disconnectClicked();
}
- //KMessageBox::information(0,"item",QString("item: "+itemtext));
+ //KMessageBox::information(0,"item",TQString("item: "+itemtext));
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connect to \"%1\" requested." ).arg ( itemtext ), GlobalConfig->debug );
if ( itemtext != GlobalConfig->currentProfile->getName() )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
- GlobalConfig->appendLogEntry ( i18n ( "Switching to %1" , QString ( itemtext ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Switching to %1" , TQString ( itemtext ) ), GlobalConfig->debug );
bool profileInList = false;
for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ )
{
@@ -22919,16 +22919,16 @@ void KVpnc::saveGuiOptions()
void KVpnc::startConnectionStatusCheck()
{
KStandardDirs * dirs = KGlobal::dirs();
- QString PingCheckScript = QString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) );
- //GlobalConfig->appendLogEntry( QString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug);
- ConnectionStatusCheckProcess = new QProcess ( this );
+ TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) );
+ //GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug);
+ ConnectionStatusCheckProcess = new TQProcess ( this );
ConnectionStatusCheckProcess->addArgument ( GlobalConfig->InterpreterShell );
ConnectionStatusCheckProcess->addArgument ( PingCheckScript );
- QString PathToPing = Utils ( GlobalConfig ).getToolInfo ( "ping" ) ->PathToExec;
+ TQString PathToPing = Utils ( GlobalConfig ).getToolInfo ( "ping" ) ->PathToExec;
ConnectionStatusCheckProcess->addArgument ( PathToPing );
- QString pingDevice="default";
+ TQString pingDevice="default";
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
pingDevice = VpncDevice;
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
@@ -22970,20 +22970,20 @@ void KVpnc::startConnectionStatusCheck()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Use gateway address (%1) for connection status check." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->debug );
}
- ConnectionStatusCheckProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
- ConnectionStatusCheckProcess->addArgument ( QString().setNum ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ) );
- ConnectionStatusCheckProcess->addArgument ( QString().setNum ( 1 ) ); // verbosity
+ ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
+ ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ) );
+ ConnectionStatusCheckProcess->addArgument ( TQString().setNum ( 1 ) ); // verbosity
- connect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) );
- connect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) );
+ connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
+ connect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
if ( !ConnectionStatusCheckProcess->start ( env ) )
{
- disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_connectionStatusCheck() ) );
- disconnect ( ConnectionStatusCheckProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
+ disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
delete ConnectionStatusCheckProcess;
ConnectionStatusCheckProcess=0L;
- //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) );
+ //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "ping_check.sh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ping_check.sh" ) , GlobalConfig->error );
}
else
@@ -23008,16 +23008,16 @@ void KVpnc::preserveNetworkEnvironment()
GlobalConfig->appendLogEntry ( i18n ( "Preserving network environment" ), KVpncConfig::debug );
// resolv.conf
- QFile originalResolvConfFile ( "/etc/resolv.conf" );
- QString originalResolvConfFileContent = "";
+ TQFile originalResolvConfFile ( "/etc/resolv.conf" );
+ TQString originalResolvConfFileContent = "";
if ( originalResolvConfFile.open ( IO_ReadOnly ) )
{
- originalResolvConfFileContent = QString ( originalResolvConfFile.readAll() );
+ originalResolvConfFileContent = TQString ( originalResolvConfFile.readAll() );
originalResolvConfFile.close();
}
- QFile backupOriginalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" );
- QTextStream stream ( &backupOriginalResolvConfFile );
+ TQFile backupOriginalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" );
+ TQTextStream stream ( &backupOriginalResolvConfFile );
if ( backupOriginalResolvConfFile.open ( IO_WriteOnly ) )
{
stream << originalResolvConfFileContent;
@@ -23025,14 +23025,14 @@ void KVpnc::preserveNetworkEnvironment()
}
// defaultroute
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
- QString GetRouteScript = tmpPath + "get_route.sh";
+ TQString GetRouteScript = tmpPath + "get_route.sh";
- QString backupOriginalRoute = locateLocal ( "data", "kvpnc/" );
+ TQString backupOriginalRoute = locateLocal ( "data", "kvpnc/" );
backupOriginalRoute += "route_before_kvpnc";
- QFile file ( GetRouteScript );
+ TQFile file ( GetRouteScript );
stream.setDevice ( &file );
if ( file.open ( IO_WriteOnly ) )
{
@@ -23043,14 +23043,14 @@ void KVpnc::preserveNetworkEnvironment()
}
- QProcess *proc = new QProcess ( this );
+ TQProcess *proc = new TQProcess ( this );
proc->addArgument ( GlobalConfig->InterpreterShell );
proc->addArgument ( GetRouteScript );
- // connect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
- // connect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
- // connect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) );
+ // 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() ) );
if ( !proc->start ( env ) )
{
@@ -23063,9 +23063,9 @@ void KVpnc::preserveNetworkEnvironment()
{
parent->processEvents();
}
- // disconnect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
- // disconnect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
- // disconnect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) );
+ // 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() ) );
delete proc;
proc=0L;
}
@@ -23078,16 +23078,16 @@ void KVpnc::restoreNetworkEnvironment()
GlobalConfig->appendLogEntry ( i18n ( "Restoring network environment" ), KVpncConfig::debug );
// resolv.conf
- QFile originalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" );
- QString originalResolvConfFileContent = "";
+ TQFile originalResolvConfFile ( "/etc/resolv.conf.before.kvpnc" );
+ TQString originalResolvConfFileContent = "";
if ( originalResolvConfFile.open ( IO_ReadOnly ) )
{
- originalResolvConfFileContent = QString ( originalResolvConfFile.readAll() );
+ originalResolvConfFileContent = TQString ( originalResolvConfFile.readAll() );
if ( originalResolvConfFileContent.length() > 0 )
{
originalResolvConfFile.close();
- QFile backupOriginalResolvConfFile ( "/etc/resolv.conf" );
- QTextStream stream ( &backupOriginalResolvConfFile );
+ TQFile backupOriginalResolvConfFile ( "/etc/resolv.conf" );
+ TQTextStream stream ( &backupOriginalResolvConfFile );
if ( backupOriginalResolvConfFile.open ( IO_WriteOnly ) )
{
stream << originalResolvConfFileContent;
@@ -23103,27 +23103,27 @@ void KVpnc::restoreNetworkEnvironment()
// default route
// TODO
- QString backupOriginalRoute = locateLocal ( "data", "kvpnc/" );
+ TQString backupOriginalRoute = locateLocal ( "data", "kvpnc/" );
backupOriginalRoute += "route_before_kvpnc";
- QFile backupOriginalRouteFile ( backupOriginalRoute );
+ TQFile backupOriginalRouteFile ( backupOriginalRoute );
// FIXME make it in GlobalConfig
if ( backupOriginalRouteFile.open ( IO_ReadOnly ) )
{
- QTextStream stream ( &backupOriginalRouteFile )
+ TQTextStream stream ( &backupOriginalRouteFile )
;
- QString line;
+ TQString line;
while ( !stream.atEnd() )
{
line = stream.readLine();
if ( line.contains ( "default via", false ) ) // default via 192.168.0.5 dev eth0
{
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QString RestoreDefaultrouteKvpncExitScript = tmpPath + "restore_defaultroute_kvpnc_exit.sh";
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQString RestoreDefaultrouteKvpncExitScript = tmpPath + "restore_defaultroute_kvpnc_exit.sh";
- QFile file ( RestoreDefaultrouteKvpncExitScript );
- QTextStream stream ( &file );
+ TQFile file ( RestoreDefaultrouteKvpncExitScript );
+ TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -23132,14 +23132,14 @@ void KVpnc::restoreNetworkEnvironment()
file.close();
}
- QProcess *proc = new QProcess ( this );
+ TQProcess *proc = new TQProcess ( this );
proc->addArgument ( GlobalConfig->InterpreterShell );
proc->addArgument ( RestoreDefaultrouteKvpncExitScript );
- // connect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
- // connect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
- //connect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) );
+ // 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() ) );
if ( !proc->start ( env ) )
{
@@ -23153,9 +23153,9 @@ void KVpnc::restoreNetworkEnvironment()
// parent->processEvents();
}
}
- // disconnect( proc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
- // disconnect( proc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
- //disconnect( proc, SIGNAL( processExited () ), this, SLOT( processHasFinished() ) );
+ // 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() ) );
delete proc;
proc=0L;
break;
@@ -23168,20 +23168,20 @@ void KVpnc::restoreNetworkEnvironment()
bool KVpnc::backupResolvConf()
{
bool success=true;
- QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
+ TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Backup file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug );
- QFile ResolvConfBackupProfileFile ( ResolvConfBackupProfile + ".sh" );
- QTextStream ResolvConfBackupProfileStream ( &ResolvConfBackupProfileFile );
+ TQFile ResolvConfBackupProfileFile ( ResolvConfBackupProfile + ".sh" );
+ TQTextStream ResolvConfBackupProfileStream ( &ResolvConfBackupProfileFile );
if ( ResolvConfBackupProfileFile.open ( IO_WriteOnly ) )
{
ResolvConfBackupProfileStream << "# generated by kvpnc. Do not edit it." << "\n";
ResolvConfBackupProfileStream << "\n";
ResolvConfBackupProfileStream << "cat /etc/resolv.conf > " + ResolvConfBackupProfile + "\n";
ResolvConfBackupProfileFile.close();
- QProcess ResolvConfBackupProfileProcess ( this );
+ TQProcess ResolvConfBackupProfileProcess ( this );
ResolvConfBackupProfileProcess.addArgument ( GlobalConfig->InterpreterShell );
ResolvConfBackupProfileProcess.addArgument ( ResolvConfBackupProfile + ".sh" );
if ( !ResolvConfBackupProfileProcess.start() )
@@ -23206,13 +23206,13 @@ bool KVpnc::backupResolvConf()
bool KVpnc::restoreResolvConf()
{
bool success=true;
- QString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
+ TQString ResolvConfBackupProfile = tmpPath + "resolv.conf.before.kvpnc_" + GlobalConfig->currentProfile->getName();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Restore file of %1: %1" ).arg ( "resolv.conf" ).arg ( ResolvConfBackupProfile ), GlobalConfig->debug );
- QFile ResolvConfRestoreProfileFile ( ResolvConfBackupProfile + ".sh" );
- QTextStream ResolvConfRestoreProfileStream ( &ResolvConfRestoreProfileFile );
+ TQFile ResolvConfRestoreProfileFile ( ResolvConfBackupProfile + ".sh" );
+ TQTextStream ResolvConfRestoreProfileStream ( &ResolvConfRestoreProfileFile );
if ( ResolvConfRestoreProfileFile.open ( IO_WriteOnly ) )
{
ResolvConfRestoreProfileStream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -23220,7 +23220,7 @@ bool KVpnc::restoreResolvConf()
// ResolvConfRestoreProfileStream << "chmod u+w /etc/resolv.conf" << "\n";
ResolvConfRestoreProfileStream << "cat " + ResolvConfBackupProfile + " > /etc/resolv.conf\n";
ResolvConfRestoreProfileFile.close();
- QProcess ResolvConfRestoreProfileProcess ( this );
+ TQProcess ResolvConfRestoreProfileProcess ( this );
ResolvConfRestoreProfileProcess.addArgument ( GlobalConfig->InterpreterShell );
ResolvConfRestoreProfileProcess.addArgument ( ResolvConfBackupProfile + ".sh" );
if ( !ResolvConfRestoreProfileProcess.start() )
@@ -23251,11 +23251,11 @@ void KVpnc::backupIpsecSystemConfig()
GlobalConfig->appendLogEntry ( i18n ( "Backing up %1" ).arg ( "ipsec.conf, ipsec.secrets" ), GlobalConfig->debug );
- QString IpsecPrefix = "/etc"; // prefix where ipsec.conf and ipsec.secrets
+ TQString IpsecPrefix = "/etc"; // prefix where ipsec.conf and ipsec.secrets
// ipsec.conf
- QFile originalIpsecConfFile ( "/etc/ipsec.conf" );
- QTextStream stream ( &originalIpsecConfFile );
- QString originalIpsecConfFileContent = "";
+ TQFile originalIpsecConfFile ( "/etc/ipsec.conf" );
+ TQTextStream stream ( &originalIpsecConfFile );
+ TQString originalIpsecConfFileContent = "";
if ( !originalIpsecConfFile.exists() )
{
originalIpsecConfFile.setName ( "/etc/ipsec.d/ipsec.conf" );
@@ -23276,12 +23276,12 @@ void KVpnc::backupIpsecSystemConfig()
{
if ( originalIpsecConfFile.open ( IO_ReadOnly ) )
{
- originalIpsecConfFileContent = QString ( originalIpsecConfFile.readAll() );
+ originalIpsecConfFileContent = TQString ( originalIpsecConfFile.readAll() );
originalIpsecConfFile.close();
}
stream.unsetDevice();
}
- QFile backupOriginalIpsecConfFile ( IpsecPrefix + "/ipsec.conf.before.kvpnc" );
+ TQFile backupOriginalIpsecConfFile ( IpsecPrefix + "/ipsec.conf.before.kvpnc" );
stream.setDevice ( &backupOriginalIpsecConfFile );
if ( backupOriginalIpsecConfFile.open ( IO_WriteOnly ) )
{
@@ -23291,7 +23291,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
@@ -23301,15 +23301,15 @@ void KVpnc::backupIpsecSystemConfig()
GlobalConfig->appendLogEntry ( i18n ( "%1 found in %2, assuming %3 as prefix for %4." ).arg ( "ipsec.conf" ).arg ( IpsecPrefix ).arg ( IpsecPrefix ).arg ( IpsecType ), GlobalConfig->debug );
// ipsec.secret
- QFile originalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets" );
+ TQFile originalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets" );
stream.setDevice ( &originalIpsecSecretFile );
- QString originalIpsecSecretFileContent = "";
+ TQString originalIpsecSecretFileContent = "";
if ( originalIpsecSecretFile.open ( IO_ReadOnly ) )
{
- originalIpsecSecretFileContent = QString ( originalIpsecSecretFile.readAll() );
+ originalIpsecSecretFileContent = TQString ( originalIpsecSecretFile.readAll() );
originalIpsecSecretFile.close();
}
- QFile backupOriginalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" );
+ TQFile backupOriginalIpsecSecretFile ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" );
stream.setDevice ( &backupOriginalIpsecSecretFile );
if ( backupOriginalIpsecSecretFile.open ( IO_WriteOnly ) )
{
@@ -23319,7 +23319,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ),GlobalConfig->error );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
return;
}
stream.unsetDevice();
@@ -23328,16 +23328,16 @@ void KVpnc::backupIpsecSystemConfig()
void KVpnc::backupDefaultRoute()
{
OldDefaultroute = tmpPath + "default-route." + GlobalConfig->currentProfile->getName(); // default-route.<id>
- QString OldDefaultrouteFilePath = tmpPath + "backup_default-route." + GlobalConfig->currentProfile->getName() +".sh"; // default-route.<id>
- QFile BackupDefaultRouteFile ( OldDefaultrouteFilePath ); // warning: static
- QTextStream stream2 ( &BackupDefaultRouteFile );
+ TQString OldDefaultrouteFilePath = tmpPath + "backup_default-route." + GlobalConfig->currentProfile->getName() +".sh"; // default-route.<id>
+ TQFile BackupDefaultRouteFile ( OldDefaultrouteFilePath ); // warning: static
+ TQTextStream stream2 ( &BackupDefaultRouteFile );
if ( BackupDefaultRouteFile.open ( IO_WriteOnly ) )
{
stream2 << " #!" << GlobalConfig->InterpreterShell << "\n";
stream2 << GlobalConfig->pathToIp << " route show | grep default > " << OldDefaultroute << "\n";
BackupDefaultRouteFile.close();
- QProcess BackupDefaultRouteProcess ( this );
+ TQProcess BackupDefaultRouteProcess ( this );
BackupDefaultRouteProcess.addArgument ( GlobalConfig->InterpreterShell );
BackupDefaultRouteProcess.addArgument ( OldDefaultrouteFilePath );
@@ -23367,7 +23367,7 @@ void KVpnc::backupDefaultRoute()
void KVpnc::showNewProfileWizardClicked()
{
NewProfileWizard wizard ( GlobalConfig );
- if ( wizard.exec() == QDialog::Accepted && wizard.newProfileCreated )
+ if ( wizard.exec() == TQDialog::Accepted && wizard.newProfileCreated )
{
bool importOK = true;
@@ -23382,17 +23382,17 @@ void KVpnc::showNewProfileWizardClicked()
VpnAccountData * it;
bool nameOk = false;
bool ok = false;
- QString newName = wizard.getName();
+ TQString newName = wizard.getName();
while ( nameOk == false )
{
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
{
if ( it->getName() == account->getName() )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
- QString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( account->getName() += "_2" ), &ok );
+ TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() += "_2" ), &ok );
if ( ok == false )
{
KMessageBox::information ( 0, i18n ( "Import was canceled." ) );
@@ -23505,12 +23505,12 @@ void KVpnc::exportOpenvpnProfileClicked()
if ( !GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
return ;
- QString filename = KFileDialog::getOpenFileName ( QString ( "." ), QString ( "*.ovpn" ), 0, i18n ( "Enter filename for export profile %1:" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ TQString filename = KFileDialog::getOpenFileName ( TQString ( "." ), TQString ( "*.ovpn" ), 0, i18n ( "Enter filename for export profile %1:" ).arg ( GlobalConfig->currentProfile->getName() ) );
if ( !filename.isEmpty() )
{
// write openvpn.<profile>.conf
- QFile openvpn_file ( filename );
- QTextStream openvpn_stream ( &openvpn_file );
+ TQFile openvpn_file ( filename );
+ TQTextStream openvpn_stream ( &openvpn_file );
if ( openvpn_file.open ( IO_WriteOnly ) )
{
openvpn_stream << "# generated by kvpnc" << "\n";
@@ -23518,7 +23518,7 @@ void KVpnc::exportOpenvpnProfileClicked()
openvpn_stream << "# verbosity" << "\n";
openvpn_stream << "verb " << GlobalConfig->OpenvpnDebugLevel << "\n\n";
- QString certPath = "/etc/openvpn";
+ TQString certPath = "/etc/openvpn";
if ( !GlobalConfig->currentProfile->getCertPath().isEmpty() )
certPath = GlobalConfig->currentProfile->getCertPath();
@@ -23583,8 +23583,8 @@ void KVpnc::exportOpenvpnProfileClicked()
else
{
// write openvpn.<profile>.secret
- QFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" );
- QTextStream openvpn_secretstream ( &openvpn_secretfile );
+ TQFile openvpn_secretfile ( tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret" );
+ TQTextStream openvpn_secretstream ( &openvpn_secretfile );
if ( openvpn_secretfile.open ( IO_WriteOnly ) )
{
openvpn_secretstream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -23638,9 +23638,9 @@ void KVpnc::exportOpenvpnProfileClicked()
openvpn_stream << GlobalConfig->pathToIfconfig << " " << GlobalConfig->currentProfile->getLocalVirtualIP() << GlobalConfig->currentProfile->getRemoteVirtualIP() << "\n\n";
- QString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
+ TQString RemoteNetAddr = GlobalConfig->currentProfile->getRemoteNetAddr();
int RemoteNetMaskNum = GlobalConfig->currentProfile->getRemoteNetMask().toInt();
- QString RemoteNetMask = "255.255.255.0";
+ TQString RemoteNetMask = "255.255.255.0";
if ( RemoteNetMaskNum == 24 )
RemoteNetMask = "255.255.255.0";
else if ( RemoteNetMaskNum == 25 )
@@ -23739,7 +23739,7 @@ void KVpnc::exportOpenvpnProfileClicked()
if ( GlobalConfig->currentProfile->getUseTlsAuth() && !GlobalConfig->currentProfile->getTlsAuthFile().isEmpty() )
{
openvpn_stream << "# Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks\n";
- QString direction="";
+ TQString direction="";
if ( GlobalConfig->currentProfile->getAuthenticationDirection() != "none" )
direction= GlobalConfig->currentProfile->getAuthenticationDirection();
openvpn_stream << "tls-auth " << GlobalConfig->currentProfile->getTlsAuthFile() << " " << direction << "\n\n";
@@ -23776,22 +23776,22 @@ void KVpnc::pptpProcessExited()
// GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info );
// disconnectClicked();
-// if (QFile("/sbin/resolvconf").exists() && QFile("/etc/init.d/resolvconf").exists())
+// if (TQFile("/sbin/resolvconf").exists() && TQFile("/etc/init.d/resolvconf").exists())
// {
//
-// QFile downfile ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" );
-// QTextStream downstream ( &downfile );
+// TQFile downfile ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" );
+// TQTextStream downstream ( &downfile );
// if ( downfile.open ( IO_WriteOnly ) )
// {
// downstream << "#!"<< GlobalConfig->InterpreterShell << "\n";
// downstream << "# generated by kvpnc. Do not edit it." << "\n";
// downstream << "# profile: " + GlobalConfig->currentProfile->getName() << "\n\n";
//
-// if (QFile("/sbin/resolvconf").exists() && QFile("/etc/init.d/resolvconf").exists())
+// if (TQFile("/sbin/resolvconf").exists() && TQFile("/etc/init.d/resolvconf").exists())
// downstream << "/etc/init.d/resolvconf start\n";
// downfile.close();
//
-// QProcess *pppdDownProcess = new QProcess ( this );
+// TQProcess *pppdDownProcess = new TQProcess ( this );
// pppdDownProcess->addArgument ( GlobalConfig->InterpreterShell );
// pppdDownProcess->addArgument ( tmpPath + "pptpd." + GlobalConfig->currentProfile->getName() + ".down" );
//
@@ -23811,7 +23811,7 @@ void KVpnc::pptpProcessExited()
void KVpnc::vtun_exited()
{
-// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
+// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
// sleep(2);
// if (GlobalConfig->status == GlobalConfig->connecting || GlobalConfig->connected)
// disconnectClicked();
@@ -23819,7 +23819,7 @@ void KVpnc::vtun_exited()
void KVpnc::openvpn_exited()
{
- disconnect ( OpenvpnProcess, SIGNAL ( processExited() ), this, SLOT ( openvpn_exited() ) );
+ disconnect ( OpenvpnProcess, TQT_SIGNAL ( processExited() ), this, TQT_SLOT ( openvpn_exited() ) );
}
void KVpnc::sshExited()
@@ -23829,25 +23829,25 @@ void KVpnc::sshExited()
void KVpnc::ipsecwhack_exited()
{
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhack() ) );
- disconnect ( IpsecWhackProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhack() ) );
+ disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhack() ) );
+ disconnect ( IpsecWhackProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhack() ) );
delete ( IpsecWhackProcess );
}
void KVpnc::IpsecWhackStatusProcessExited()
{
-// disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_ipsecwhackstatus() ) );
-// disconnect ( IpsecWhackStatusProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_ipsecwhackstatus() ) );
-// disconnect ( IpsecWhackStatusProcess, SIGNAL ( processExited() ), this, SLOT ( 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() ) );
// delete(IpsecWhackStatusProcess);
// IpsecWhackStatusProcess=0;
}
void KVpnc::racoonctlExited()
{
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout_racoonctl() ) );
-// disconnect( RacoonctlProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr_racoonctl() ) );
-// disconnect ( RacoonctlProcess, SIGNAL ( processExited () ), this, SLOT ( 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() ) );
}
void KVpnc::prepareL2tpd()
@@ -23856,11 +23856,11 @@ void KVpnc::prepareL2tpd()
if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::l2tpd )
{
// bug in openswan: only 80 chars in line allowed!!!
- int pppdoptionsfilepathlen = QString ( "pppoptfile = "+tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ).length();
+ int pppdoptionsfilepathlen = TQString ( "pppoptfile = "+tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" ).length();
if ( pppdoptionsfilepathlen > 80 )
{
- KMessageBox::error ( this, i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( QString().setNum ( pppdoptionsfilepathlen ) ) );
- GlobalConfig->appendLogEntry ( i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( QString().setNum ( pppdoptionsfilepathlen ) ), GlobalConfig->error );
+ KMessageBox::error ( this, i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( TQString().setNum ( pppdoptionsfilepathlen ) ) );
+ GlobalConfig->appendLogEntry ( i18n ( "The line length for pppoptfile is too longer than 80 chars: %1. Openswan has an bug and cant handle that. Please rename profile to a shorter name." ).arg ( TQString().setNum ( pppdoptionsfilepathlen ) ), GlobalConfig->error );
stopContinue = true;
return;
}
@@ -23882,8 +23882,8 @@ void KVpnc::prepareL2tpd()
}
// write l2tpd.conf
- QFile L2tpdConfigFile ( tmpPath + "l2tpd." + GlobalConfig->currentProfile->getName() + ".conf" );
- QTextStream stream ( &L2tpdConfigFile );
+ TQFile L2tpdConfigFile ( tmpPath + "l2tpd." + GlobalConfig->currentProfile->getName() + ".conf" );
+ TQTextStream stream ( &L2tpdConfigFile );
if ( L2tpdConfigFile.open ( IO_WriteOnly ) )
{
stream << "[global]" << "\n";
@@ -23897,7 +23897,7 @@ void KVpnc::prepareL2tpd()
stream << "port = 1701" << "\n";
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
if ( GlobalConfig->enableDebugXl2tpdNetwork )
stream << "debug network = yes" << "\n";
@@ -23932,7 +23932,7 @@ void KVpnc::prepareL2tpd()
stream << "require pap = yes" << "\n";
}
- QString UsernameStr="";
+ TQString UsernameStr="";
if ( !GlobalConfig->currentProfile->getUserName().isEmpty() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
@@ -23960,7 +23960,7 @@ void KVpnc::prepareL2tpd()
// write options.l2tpd
- QFile L2tpdPppdOptionsFile ( tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" );
+ TQFile L2tpdPppdOptionsFile ( tmpPath + "options." + GlobalConfig->currentProfile->getName() + ".l2tpd" );
stream.setDevice ( &L2tpdPppdOptionsFile );
if ( L2tpdPppdOptionsFile.open ( IO_WriteOnly ) )
{
@@ -24020,8 +24020,8 @@ void KVpnc::prepareL2tpd()
stream << pppdcap.RequireAuthPapOption << "\n";
}
- QString deamon="";
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ TQString deamon="";
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
if ( GlobalConfig->enableDebugPppd )
stream << "debug" << "\n";
@@ -24073,11 +24073,11 @@ void KVpnc::prepareL2tpd()
}
// // write l2tp secrets file
-// QString L2tpSecrets = tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName();
+// TQString L2tpSecrets = tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName();
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry ( i18n ( "l2tp secrets file: %1" ).arg ( tmpPath + "l2tp-secrets." + GlobalConfig->currentProfile->getName() ), GlobalConfig->debug );
-// QFile L2tpdSecretsFile ( L2tpSecrets );
+// TQFile L2tpdSecretsFile ( L2tpSecrets );
// stream.setDevice ( &L2tpdSecretsFile );
// if ( L2tpdSecretsFile.open ( IO_WriteOnly | IO_WriteOnly ) )
// {
@@ -24087,7 +24087,7 @@ void KVpnc::prepareL2tpd()
// if ( GlobalConfig->currentProfile->getSaveUserPassword() )
// GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
//
-// QString UsernameStr;
+// TQString UsernameStr;
// if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
// UsernameStr = GlobalConfig->currentProfile->getUserName();
// else
@@ -24120,11 +24120,11 @@ void KVpnc::prepareL2tpd()
Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/pap-secrets", "go-rwx" );
// write pppd /etc/ppp/chap-secrets
- QString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets
+ TQString ChapSecrets = "/etc/ppp/chap-secrets"; // /etc/ppp/chap-secrets
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/chap-secrets" ), GlobalConfig->debug );
- QFile ChapSecretsFile ( ChapSecrets );
+ TQFile ChapSecretsFile ( ChapSecrets );
stream.setDevice ( &ChapSecretsFile );
if ( ChapSecretsFile.open ( IO_WriteOnly | IO_Append ) )
{
@@ -24134,7 +24134,7 @@ void KVpnc::prepareL2tpd()
if ( GlobalConfig->currentProfile->getSaveUserPassword() )
GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -24171,10 +24171,10 @@ void KVpnc::prepareL2tpd()
Utils ( GlobalConfig, this ).doChmod ( "/etc/ppp/chap-secrets", "go-rwx" );
// write pppd /etc/ppp/pap-secrets
- QString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets
+ TQString papSecrets = "/etc/ppp/pap-secrets"; // /etc/ppp/pap-secrets
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->debug );
- QFile papSecretsFile ( papSecrets );
+ TQFile papSecretsFile ( papSecrets );
papSecretsFile.setName ( papSecrets );
stream.setDevice ( &papSecretsFile );
if ( papSecretsFile.open ( IO_WriteOnly | IO_Append ) )
@@ -24185,7 +24185,7 @@ void KVpnc::prepareL2tpd()
if ( GlobalConfig->currentProfile->getSaveUserPassword() )
GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -24215,10 +24215,10 @@ void KVpnc::prepareL2tpd()
if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp )
{
// write openl2tp.<profilename>.conf
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf";
- QFile OpenL2tpConfigFile ( OpenL2tpContName );
- QTextStream stream ( &OpenL2tpConfigFile );
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf";
+ TQFile OpenL2tpConfigFile ( OpenL2tpContName );
+ TQTextStream stream ( &OpenL2tpConfigFile );
if ( OpenL2tpConfigFile.open ( IO_WriteOnly ) )
{
stream << "# generated by kvpnc. Do not edit it." << "\n";
@@ -24244,7 +24244,7 @@ void KVpnc::prepareL2tpd()
if ( GlobalConfig->currentProfile->getSaveUserPassword() )
GlobalConfig->TmpPassword = GlobalConfig->currentProfile->getUserPassword();
- QString UsernameStr;
+ TQString UsernameStr;
if ( !GlobalConfig->currentProfile->getDontSaveUsername() )
UsernameStr = GlobalConfig->currentProfile->getUserName();
else
@@ -24301,10 +24301,10 @@ void KVpnc::prepareL2tpd()
void KVpnc::start_l2tpd()
{
- QString daemon="";
+ TQString daemon="";
if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::l2tpd )
{
- if ( !GlobalConfig->pathToXl2tpd.isEmpty() && QFile ( GlobalConfig->pathToXl2tpd ).exists() )
+ if ( !GlobalConfig->pathToXl2tpd.isEmpty() && TQFile ( GlobalConfig->pathToXl2tpd ).exists() )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "xl2tpd" ),GlobalConfig->debug );
@@ -24319,14 +24319,14 @@ void KVpnc::start_l2tpd()
bool control_interface_success=true;
- QString L2tpdPid="";
+ TQString L2tpdPid="";
if ( daemon == "xl2tpd" )
L2tpdPid="/var/run/xl2tpd.pid";
else
L2tpdPid="/var/run/l2tpd.pid";
- QString L2tpdControl="";
+ TQString L2tpdControl="";
if ( daemon == "xl2tpd" )
L2tpdControl="/var/run/l2tp-control";
else
@@ -24334,19 +24334,19 @@ void KVpnc::start_l2tpd()
-// if (QFile(L2tpdPid).exists())
+// if (TQFile(L2tpdPid).exists())
// {
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for starting l2tp connection"),GlobalConfig->debug);
//
-// QString L2tpdControl="";
+// TQString L2tpdControl="";
// if (daemon == "xl2tpd")
// L2tpdControl="/var/run/xl2tpd/l2tp-control";
// else
// L2tpdControl="/var/run/l2tp-control";
//
-// QFile L2tpdControlFile ( L2tpdControl );
-// QTextStream stream( &L2tpdControlFile );
+// TQFile L2tpdControlFile ( L2tpdControl );
+// TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "c " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -24357,14 +24357,14 @@ void KVpnc::start_l2tpd()
// GlobalConfig->appendLogEntry(i18n("Starting l2tp connection via control interface has been failed"),GlobalConfig->error);
// }
// }
-// if (!QFile("/var/run/l2tpd.pid").exists() || control_interface_success==false)
+// if (!TQFile("/var/run/l2tpd.pid").exists() || control_interface_success==false)
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Starting l2tpd manually" ),GlobalConfig->debug );
sleep ( 2 );
// start l2tpd
- L2tpdProcess = new QProcess ( this );
+ L2tpdProcess = new TQProcess ( this );
//
if ( daemon == "xl2tpd" )
{
@@ -24394,28 +24394,28 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 2 )
{
- QString cmdline = "";
- QStringList cmdarguments = L2tpdProcess->arguments();
- for ( QStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it )
+ TQString cmdline = "";
+ TQStringList cmdarguments = L2tpdProcess->arguments();
+ for ( TQStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it )
{
- cmdline += " " + QString ( *it );
+ cmdline += " " + TQString ( *it );
}
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug );
}
- connect ( L2tpdProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_l2tpd() ) );
- connect ( L2tpdProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_l2tpd() ) );
+ connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_l2tpd() ) );
+ connect ( L2tpdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_l2tpd() ) );
- connect ( this, SIGNAL ( L2tpdStdoutRecieved() ), this, SLOT ( processStdout_l2tpd() ) );
- connect ( this, SIGNAL ( L2tpdStderrRecieved() ), this, SLOT ( processStderr_l2tpd() ) );
+ connect ( this, TQT_SIGNAL ( L2tpdStdoutRecieved() ), this, TQT_SLOT ( processStdout_l2tpd() ) );
+ connect ( this, TQT_SIGNAL ( L2tpdStderrRecieved() ), this, TQT_SLOT ( processStderr_l2tpd() ) );
if ( !L2tpdProcess->start ( env ) )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -24426,14 +24426,14 @@ void KVpnc::start_l2tpd()
// if (GlobalConfig->KvpncDebugLevel > 1)
// GlobalConfig->appendLogEntry(i18n("Using control interface for starting l2tp connection"),GlobalConfig->debug);
//
-// QString L2tpdControl="";
+// TQString L2tpdControl="";
// if (daemon == "xl2tpd")
// L2tpdControl="/var/run/xl2tpd/l2tp-control";
// else
// L2tpdControl="/var/run/l2tp-control";
//
-// QFile L2tpdControlFile ( L2tpdControl );
-// QTextStream stream( &L2tpdControlFile );
+// TQFile L2tpdControlFile ( L2tpdControl );
+// TQTextStream stream( &L2tpdControlFile );
// if ( L2tpdControlFile.open( IO_WriteOnly ) ) {
// stream << "c " << GlobalConfig->currentProfile->getName() << "\n";
// L2tpdControlFile.close();
@@ -24456,7 +24456,7 @@ void KVpnc::start_l2tpd()
// bool control_interface_success=true;
-// QString L2tpdPid="";
+// TQString L2tpdPid="";
// if (daemon == "xl2tpd")
// L2tpdPid="/var/run/xl2tpd.pid";
// else
@@ -24471,7 +24471,7 @@ void KVpnc::start_l2tpd()
// sleep ( 2 );
// start openl2tpd
- OpenL2tpProcess = new QProcess ( this );
+ OpenL2tpProcess = new TQProcess ( this );
//
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Using %1." ).arg ( "openl2tpd" ),GlobalConfig->debug );
@@ -24486,8 +24486,8 @@ void KVpnc::start_l2tpd()
OpenL2tpProcess->addArgument ( "-f" ); // foreground
OpenL2tpProcess->addArgument ( "-c" );
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf";
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQString OpenL2tpContName = tmpPath + "openl2tp." + GlobalConfig->currentProfile->getName() + ".conf";
OpenL2tpProcess->addArgument ( OpenL2tpContName );
@@ -24495,24 +24495,24 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 2 )
{
- QString cmdline = "";
- QStringList cmdarguments = OpenL2tpProcess->arguments();
- for ( QStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it )
+ TQString cmdline = "";
+ TQStringList cmdarguments = OpenL2tpProcess->arguments();
+ for ( TQStringList::Iterator it = cmdarguments.begin(); it != cmdarguments.end(); ++it )
{
- cmdline += " " + QString ( *it );
+ cmdline += " " + TQString ( *it );
}
GlobalConfig->appendLogEntry ( "\""+daemon+"\" cmd line: " + cmdline , GlobalConfig->debug );
}
- connect ( OpenL2tpProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readFromStdout_openl2tp() ) );
- connect ( OpenL2tpProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readFromStderr_openl2tp() ) );
+ connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_openl2tp() ) );
+ connect ( OpenL2tpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_openl2tp() ) );
if ( !OpenL2tpProcess->start ( env ) )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuiStatus ( disconnected );
+ setGuitqStatus ( disconnected );
}
else
{
@@ -24530,16 +24530,16 @@ void KVpnc::checkL2tpPppUp()
{
GlobalConfig->appendLogEntry ( i18n ( "Check ppp device..." ), GlobalConfig->debug );
- QString tmpPath = locateLocal ( "data", "kvpnc/" );
- QFile L2tpPppPidFile ( "/var/run/ppp-kvpnc." +GlobalConfig->currentProfile->getName() +".pid" );
+ TQString tmpPath = locateLocal ( "data", "kvpnc/" );
+ TQFile L2tpPppPidFile ( "/var/run/ppp-kvpnc." +GlobalConfig->currentProfile->getName() +".pid" );
if ( L2tpPppPidFile.exists() )
{
if ( L2tpPppPidFile.open ( IO_ReadOnly ) )
{
L2tpPppDevice="";
- QTextStream stream ( &L2tpPppPidFile );
- QString line = "";
+ TQTextStream stream ( &L2tpPppPidFile );
+ TQString line = "";
while ( !stream.atEnd() )
{
line = stream.readLine();
@@ -24596,10 +24596,10 @@ void KVpnc::checkL2tpPppUp()
GlobalConfig->status = GlobalConfig->connected;
- disconnect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
- connect ( &durationTimer, SIGNAL ( timeout() ), this, SLOT ( slotDurationEvent() ) );
+ disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
+ connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuiStatus ( connected );
+ setGuitqStatus ( connected );
setFirewallAfterConnect();
@@ -24628,22 +24628,22 @@ void KVpnc::checkL2tpPppUp()
}
-bool KVpnc::checkCiscoVpncStatus()
+bool KVpnc::checkCiscoVpnctqStatus()
{
ciscoVpncRunning = false;
- TestCiscoVpncProcess = new QProcess ( this );
- TestCiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
+ TestCiscoVpncProcess = new TQProcess ( this );
+ TestCiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
TestCiscoVpncProcess->addArgument ( GlobalConfig->InterpreterShell );
TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" );
TestCiscoVpncProcess->addArgument ( "status" );
- connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
- connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+ connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+ connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
if ( !TestCiscoVpncProcess->start ( env ) )
{
- disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
- disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+ disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+ disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
- disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+ disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+ disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
delete TestCiscoVpncProcess;
TestCiscoVpncProcess=0L;
}
@@ -24666,19 +24666,19 @@ bool KVpnc::checkCiscoVpncStatus()
void KVpnc::startCiscoVpnc()
{
- TestCiscoVpncProcess = new QProcess ( this );
- TestCiscoVpncProcess->setCommunication ( QProcess::Stdin | QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr );
+ TestCiscoVpncProcess = new TQProcess ( this );
+ TestCiscoVpncProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
TestCiscoVpncProcess->addArgument ( GlobalConfig->InterpreterShell );
TestCiscoVpncProcess->addArgument ( "/etc/init.d/vpnclient_init" );
TestCiscoVpncProcess->addArgument ( "start" );
-// connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
-// connect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+// connect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
if ( !TestCiscoVpncProcess->start ( env ) )
{
-// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
-// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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, SIGNAL ( readyReadStdout() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
-// disconnect ( TestCiscoVpncProcess, SIGNAL ( readyReadStderr() ), this, SLOT ( readCiscoVpncTestProcessOutput() ) );
+// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readCiscoVpncTestProcessOutput() ) );
+// disconnect ( TestCiscoVpncProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_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(), SIGNAL ( mailSent() ), this, SLOT ( feedbackMailSent() ) );
+ connect ( FeedbackDialog->form(), TQT_SIGNAL ( mailSent() ), this, TQT_SLOT ( feedbackMailSent() ) );
KFeedbackQuestionList * list = FeedbackDialog->form() ->questionList();
@@ -24820,7 +24820,7 @@ void KVpnc::feedbackMailSent()
}
// --- DCOP stuff ---
-QString KVpnc::getVersion()
+TQString KVpnc::getVersion()
{
return parent->aboutData() ->version();
}
@@ -24847,7 +24847,7 @@ uint KVpnc::getConnectedTime()
return 0;
}
-QString KVpnc::getStatus()
+TQString KVpnc::gettqStatus()
{
if ( GlobalConfig->status == GlobalConfig->connected )
return "connected";
@@ -24859,12 +24859,12 @@ QString KVpnc::getStatus()
return "unknown";
}
-QString KVpnc::getCurrentProfile()
+TQString KVpnc::getCurrentProfile()
{
return GlobalConfig->currentProfile->getName();
}
-void KVpnc::setProfile ( QString profilename )
+void KVpnc::setProfile ( TQString profilename )
{
for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ )
{
@@ -24908,7 +24908,7 @@ void KVpnc::doImportPcf()
importProfileClicked ( "" );
}
-void KVpnc::doImportPcf ( QString file )
+void KVpnc::doImportPcf ( TQString file )
{
importProfileClicked ( file );
}
@@ -24918,14 +24918,14 @@ void KVpnc::doImportOpenvpnConfig()
importOpenvpnProfileClicked ( "" );
}
-void KVpnc::doImportOpenvpnConfig ( QString file )
+void KVpnc::doImportOpenvpnConfig ( TQString file )
{
importOpenvpnProfileClicked ( file );
}
-QStringList KVpnc::profiles()
+TQStringList KVpnc::profiles()
{
- QStringList profiles;
+ TQStringList profiles;
VpnAccountData * it;
if ( !GlobalConfig->AccountList->isEmpty() )
{
@@ -24943,19 +24943,19 @@ void KVpnc::doQuit()
quitCalled();
}
-QStringList KVpnc::toolinfo()
+TQStringList KVpnc::toolinfo()
{
- QStringList toolinfo;
+ TQStringList toolinfo;
ToolInfo *tool = 0;
for ( tool = GlobalConfig->ToolList->first(); tool; tool = GlobalConfig->ToolList->next() )
{
- QString toolstring;
+ TQString toolstring;
std::cout << "tool: " << tool->Name.ascii() << std::endl;
// std::cout << "Version: " << tool->Version << std::endl;
// std::cout << "Path: " << tool->PathToExec << std::endl << std::endl;
- QString state = "";
- QString usability = "";
- QString comment = "";
+ TQString state = "";
+ TQString usability = "";
+ TQString comment = "";
//FIXME how it could be better?
if ( tool->Name == "vpnc" )
@@ -25202,9 +25202,9 @@ void KVpnc::doSendFeedbackMail()
sendFeedbackMail();
}
-QStringList KVpnc::getProfileTypes()
+TQStringList KVpnc::getProfileTypes()
{
- QStringList ProfileTypes;
+ TQStringList ProfileTypes;
ProfileTypes.append ( "Cisco (vpnc)" );
ProfileTypes.append ( "IPSec (racoon)" );