summaryrefslogtreecommitdiffstats
path: root/src/kvpnc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvpnc.cpp')
-rw-r--r--src/kvpnc.cpp702
1 files changed, 351 insertions, 351 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 23c24e4..fc23e27 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -33,7 +33,7 @@
#include <tqcolor.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include "debugoutputtextedit.h"
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -45,7 +45,7 @@
#include <tqcombobox.h>
#include <tqfile.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqsocket.h>
#include <tqstatusbar.h>
#include <tqcolor.h>
@@ -179,7 +179,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
TQTextStream stream ( &file );
if ( file.open ( IO_WriteOnly ) )
{
- stream << "created at: " << TQDate().tqcurrentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
+ stream << "created at: " << TQDate().currentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
file.close();
}
else
@@ -215,7 +215,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
{
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( tqminimumSizeHint() );
+ // this->resize( minimumSizeHint() );
}
DebugconsoleAction ->setChecked ( GlobalConfig->showDebugConsole );
GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) );
@@ -524,13 +524,13 @@ void KVpnc::slotSettings()
if ( GlobalConfig->showDebugConsole )
{
mw->DebugOutput->show();
- //resize( tqminimumSizeHint() );
+ //resize( minimumSizeHint() );
}
else
{
mw->DebugOutput->hide();
setMinimumSize ( 0, 0 );
- this->resize ( tqminimumSizeHint() );
+ this->resize ( minimumSizeHint() );
}
if ( GlobalConfig->writeLogFile )
@@ -549,7 +549,7 @@ void KVpnc::slotSettings()
}
else
{
- GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
}
}
}
@@ -558,7 +558,7 @@ void KVpnc::slotSettings()
if ( GlobalConfig->logfile.isOpen() )
{
//TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
}
}
@@ -686,7 +686,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -713,7 +713,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -740,7 +740,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -769,7 +769,7 @@ void KVpnc:: quitCalled()
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -868,7 +868,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
if ( GlobalConfig->logfile.isOpen() )
{
// TQTextStream s( &logfile );
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
}
@@ -918,7 +918,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
{
if ( GlobalConfig->logfile.isOpen() )
{
- GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+ GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
GlobalConfig->logfile.flush();
GlobalConfig->logfile.close();
GlobalConfig->appPointer->processEvents();
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -1095,7 +1095,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
}
@@ -1905,7 +1905,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( TQString ( "VpncScript" ) ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
timer.stop();
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -2059,7 +2059,7 @@ 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -2391,10 +2391,10 @@ void KVpnc::connectClicked()
GlobalConfig->appendLogEntry ( i18n ( "vpnclient: %1" ) .arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->debug );
- if ( checkCiscoVpnctqStatus() == false )
+ if ( checkCiscoVpncStatus() == false )
{
startCiscoVpnc();
- if ( checkCiscoVpnctqStatus() == false )
+ if ( checkCiscoVpncStatus() == 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
GlobalConfig->TmpPassword= GlobalConfig->currentProfile->getUserPassword();
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -2862,14 +2862,14 @@ void KVpnc::connectClicked()
{
// file could not written
GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because profile file could not be written." ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
else
{
// ok is false
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -2881,7 +2881,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "racoon" ), GlobalConfig->debug );
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -2917,7 +2917,7 @@ void KVpnc::connectClicked()
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -2927,7 +2927,7 @@ void KVpnc::connectClicked()
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
else
@@ -3786,7 +3786,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3835,7 +3835,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file1.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3942,7 +3942,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( upfile.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -3995,7 +3995,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( downfile.name() ), GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -4031,7 +4031,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
//
@@ -4069,7 +4069,7 @@ void KVpnc::connectClicked()
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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -4106,7 +4106,7 @@ void KVpnc::connectClicked()
return;
}
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -4169,15 +4169,15 @@ void KVpnc::connectClicked()
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "esp4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "esp4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "esp4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "esp4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "esp4" ), GlobalConfig->error );
// ok = false;
// }
//
// if ( !Utils( GlobalConfig, parent ).loadKernelModule( "ah4", parent ) )
// {
- // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "ah4" ) );
- // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "ah4" ), GlobalConfig->error );
+ // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "ah4" ) );
+ // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "ah4" ), GlobalConfig->error );
// ok = false;
// }
@@ -4894,13 +4894,13 @@ void KVpnc::connectClicked()
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.").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").arg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()).tqarg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialRemoteID()).arg(resolvedIp), GlobalConfig->debug );
stream << " rightid=" + resolvedIp << "\n";
}
}
@@ -4923,13 +4923,13 @@ void KVpnc::connectClicked()
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.").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").arg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error );
}
else
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()).tqarg(resolvedIp), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialLocalID()).arg(resolvedIp), GlobalConfig->debug );
stream << " leftid=" + resolvedIp << "\n";
}
}
@@ -5050,7 +5050,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecConfigFile.name() ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -5101,7 +5101,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
stream.unsetDevice();
@@ -5138,7 +5138,7 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -5167,7 +5167,7 @@ void KVpnc::connectClicked()
// if (GlobalConfig->currentProfile->useVirtualIP()){
// if (!setVirtualIP()){
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
// }
@@ -5227,7 +5227,7 @@ void KVpnc::connectClicked()
delete IpsecStartProcess;
IpsecStartProcess = 0L;
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -5285,20 +5285,20 @@ void KVpnc::connectClicked()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecSecretsFile.name() ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
} // freeswan
/* ============ pptp ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -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)." ).tqarg("GRE"), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).arg("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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
@@ -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!" ).tqarg("\"ppp-compress-18\" (ppp_mppe)"));
+ //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg("\"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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnectClicked();
load_module_ok=false;
}
@@ -6155,7 +6155,7 @@ void KVpnc::connectClicked()
disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -6183,7 +6183,7 @@ void KVpnc::connectClicked()
{
if (AuthRetry)
disconnectClicked();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
} // pptp
@@ -6191,7 +6191,7 @@ void KVpnc::connectClicked()
/* ============ openvpn ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(connecting);
tmpPath = locateLocal ( "data", "kvpnc/" );
TQString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret";
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) );
- // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
+ // 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 );
// ok = false;
- // setGuitqStatus( disconnected );
+ // setGuiStatus( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
if ( GlobalConfig->currentProfile->getUsePkcs11Providers() && GlobalConfig->currentProfile->getPkcs11Providers().isEmpty() )
@@ -6247,7 +6247,7 @@ void KVpnc::connectClicked()
KMessageBox::error ( this, i18n ( "Pkcs11 providers cant be empty!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 providers cant be empty!" ), GlobalConfig->error );
ok = false;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -6260,10 +6260,10 @@ void KVpnc::connectClicked()
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." ).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 );
+ // 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 );
// ok = false;
- // setGuitqStatus( disconnected );
+ // setGuiStatus( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -6286,7 +6286,7 @@ 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // 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;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -7352,21 +7352,21 @@ void KVpnc::connectClicked()
// if (managementhandler->isConnectedToManagementPort())
// {
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).tqarg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).arg( "openvpn" ) , GlobalConfig->debug );
// break;
// }
// if (! GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).tqarg( "openvpn" ) , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).arg( "openvpn" ) , GlobalConfig->debug );
// }
// // managementhandler->sendToServer("help");
// // }
// if (failManagementHandlerConnectCheckCount >= maxfailManagementHandlerConnectCheckCount)
// {
- // // 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 );
+ // // 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 );
// if (OpenvpnProcess != 0)
// OpenvpnProcess->kill();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// return;
// }
@@ -7385,7 +7385,7 @@ void KVpnc::connectClicked()
} // openvpn
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -7394,7 +7394,7 @@ void KVpnc::connectClicked()
/* ============ vtun ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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!" ).tqarg(GlobalConfig->currentProfile->getGateway()) );
- // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error);
+ // 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;
// }
// else
// {
- // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info );
// }
bool askUsernamePass = false;
@@ -7718,14 +7718,14 @@ void KVpnc::connectClicked()
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
/* ============ ssh ================ */
else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh )
{
- //setGuitqStatus(connecting);
+ //setGuiStatus(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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
return ;
}
@@ -7998,7 +7998,7 @@ void KVpnc::connectClicked()
// else
// {
// GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( askpassfile.name() ), GlobalConfig->error );
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return;
// }
//
@@ -8206,7 +8206,7 @@ void KVpnc::connectClicked()
}
else
{
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -8386,7 +8386,7 @@ void KVpnc::disconnectClicked()
DisconnectProcess=0L;
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
durationTimer.stop();
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
@@ -8474,7 +8474,7 @@ void KVpnc::disconnectClicked()
delete CiscoVpncProcess;
CiscoVpncProcess=0L;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connectionEnded();
}
@@ -8496,7 +8496,7 @@ void KVpnc::disconnectClicked()
// if ( setkey.exists() )
// GlobalConfig->pathToSetkey = "/usr/bin/setkey";
// else {
- // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).tqarg("setkey") );
+ // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).arg("setkey") );
// ok = false;
// }
// }
@@ -8520,7 +8520,7 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
@@ -8753,7 +8753,7 @@ void KVpnc::disconnectClicked()
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.stop();
connectionEnded();
@@ -8768,11 +8768,11 @@ void KVpnc::disconnectClicked()
// connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeSetkey() ) );
//
// if ( !DisconnectProcess->start(env) )
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg("killall -3 racoon") );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") );
// else {
// RacoonTailProcess->tryTerminate();
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).tqarg("killall -3 racoon"), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).arg("killall -3 racoon"), GlobalConfig->debug );
// }
// }
@@ -9005,7 +9005,7 @@ void KVpnc::disconnectClicked()
delRouteIpsec();
removeIptablesFreeswan();
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
durationTimer.stop();
GlobalConfig->currentConnectRetry=0;
connectionEnded();
@@ -9039,7 +9039,7 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // 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 );
+ // 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 );
// ipsec.secret
TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
@@ -9489,7 +9489,7 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
@@ -9554,7 +9554,7 @@ void KVpnc::disconnectClicked()
// connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
// else
// {
// sleep(1);
@@ -9590,7 +9590,7 @@ void KVpnc::disconnectClicked()
// connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
// }
else
{
@@ -9713,7 +9713,7 @@ void KVpnc::disconnectClicked()
}
// ConnectingProcess = 0L;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() )
executeCommandAfterDisconnect();
@@ -9831,7 +9831,7 @@ void KVpnc::disconnectClicked()
}
//if (!restoreResolvConf())
- //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").tqarg(""),GlobalConfig->error);
+ //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").arg(""),GlobalConfig->error);
stream << GlobalConfig->pathToIp + " route flush cache\n";
@@ -9860,7 +9860,7 @@ void KVpnc::disconnectClicked()
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
timer.stop();
connectionEnded();
@@ -10099,7 +10099,7 @@ void KVpnc::disconnectClicked()
// delRouteIpsec();
removeIptablesFreeswan();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->currentConnectRetry=0;
@@ -10133,7 +10133,7 @@ void KVpnc::disconnectClicked()
stream.unsetDevice();
//if ( GlobalConfig->KvpncDebugLevel > 0 )
- // 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 );
+ // 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 );
// ipsec.secret
TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" );
@@ -10315,7 +10315,7 @@ void KVpnc::disconnectClicked()
}
else
{
- // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
@@ -10945,7 +10945,7 @@ void KVpnc::disconnectClicked()
GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
}
}
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
connectionEnded();
@@ -11000,7 +11000,7 @@ void KVpnc::disconnectClicked()
// connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) );
// }
// else
// {
@@ -11036,7 +11036,7 @@ void KVpnc::disconnectClicked()
// connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) );
//
// if ( !DisconnectProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) );
// }
else
{
@@ -11049,7 +11049,7 @@ void KVpnc::disconnectClicked()
connectionEnded();
}
//connectionEnded();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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 );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
ConnectingProcess = -1;
}
@@ -11105,14 +11105,14 @@ void KVpnc::helpClicked()
// 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!" ).tqarg(host) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host) );
// else
// mw->DebugOutput->append( TQString("first ip of "+host+": "+ip ));
//
// 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!" ).tqarg(host2) );
+ // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host2) );
// else
// mw->DebugOutput->append( TQString("first ip of "+host2+": "+ip2 ));
@@ -11282,7 +11282,7 @@ void KVpnc::helpClicked()
/*
TQString testfilename="sfsd/::::( *#v v###\\";
TQString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename);
- cTQString("testfilename: \"%1\", cleaned up: \"%2\"").tqarg(testfilename).tqarg(cleanedUpName));
+ cTQString("testfilename: \"%1\", cleaned up: \"%2\"").arg(testfilename).arg(cleanedUpName));
*/
// GlobalConfig->exportKvpncConfig("./kvpnc_export.xml");
@@ -11488,7 +11488,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).tqarg(GrpPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).arg(GrpPassStr), GlobalConfig->debug );
}
@@ -11504,7 +11504,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).tqarg(UserPassStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).arg(UserPassStr), GlobalConfig->debug );
}
@@ -11546,7 +11546,7 @@ void KVpnc::readOutputFrom_vpnc()
VpncProcess->writeToStdin ( "\n" );
if ( GlobalConfig->KvpncDebugLevel > 6 )
- GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).tqarg(UsernameStr), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).arg(UsernameStr), GlobalConfig->debug );
}
@@ -11594,7 +11594,7 @@ void KVpnc::readOutputFrom_vpnc()
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
NetworkInterface iface ( GlobalConfig, parent );
@@ -11758,7 +11758,7 @@ void KVpnc::readOutputFrom_vpnc()
// if (oldpidfile.exists())
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
// TQTextStream pidFileStream( &oldpidfile );
// TQString Vpnc_pid = "";
// if ( oldpidfile.open( IO_ReadOnly ) )
@@ -11771,7 +11771,7 @@ void KVpnc::readOutputFrom_vpnc()
// {
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( 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." ).tqarg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11800,7 +11800,7 @@ void KVpnc::readOutputFrom_vpnc()
// killvpncprocess.addArgument("vpnc");
//
// if (!killvpncprocess.start())
- // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
//
// while (killvpncprocess.isRunning())
// parent->processEvents();
@@ -11824,7 +11824,7 @@ void KVpnc::readOutputFrom_vpnc()
// OldDefaultroute = lst.first(); // default-route.<id>
//
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).tqarg(OldDefaultroute), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).arg(OldDefaultroute), GlobalConfig->debug );
//
//
// TQFile file( VpncDisconnectScript );
@@ -11876,14 +11876,14 @@ void KVpnc::readOutputFrom_vpnc()
//
// if ( !DisconnectProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc_disconnect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc_disconnect" ) );
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug );
// }
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// connectionEnded();
// }
//
@@ -11926,7 +11926,7 @@ void KVpnc::readOutputFrom_vpnc()
if (oldpidfile.exists())
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug );
TQTextStream pidFileStream( &oldpidfile );
TQString Vpnc_pid = "";
if ( oldpidfile.open( IO_ReadOnly ) )
@@ -11939,7 +11939,7 @@ void KVpnc::readOutputFrom_vpnc()
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug);
+ GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( 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." ).tqarg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -11968,7 +11968,7 @@ void KVpnc::readOutputFrom_vpnc()
killvpncprocess.addArgument("vpnc");
if (!killvpncprocess.start())
- GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error);
+ GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error);
while (killvpncprocess.isRunning())
parent->processEvents();
@@ -12384,7 +12384,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->AuthRetryCount=0;
@@ -12553,7 +12553,7 @@ void KVpnc::readFromStdout_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -12993,7 +12993,7 @@ void KVpnc::readFromStderr_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
addRouteRacoon();
@@ -13186,8 +13186,8 @@ void KVpnc::readFromStdout_ipsec()
else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 )
{
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 );
+ 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 );
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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -13801,8 +13801,8 @@ void KVpnc::readFromStderr_ipsecwhack()
//
// if (!killipsecprocess.start())
// {
- // 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 );
+ // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("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." ).arg("ipsec") ) , GlobalConfig->debug );
// abort = true;
// }
// else
@@ -13830,15 +13830,15 @@ void KVpnc::readFromStderr_ipsecwhack()
// if ( !IpsecProcess->start(env) )
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).tqarg( "l2tpd" ), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).arg( "l2tpd" ), 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 );
+ // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug );
// abort=false;
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).tqarg( "ipsec" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).arg( "ipsec" ), GlobalConfig->debug );
// }
// }
// }
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -14096,7 +14096,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -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;
-// setGuitqStatus ( disconnected );
+// setGuiStatus ( disconnected );
// return ;
// }
}
@@ -14858,7 +14858,7 @@ void KVpnc::readFromStdout_tail_racoon()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
doIptablesRacoon();
@@ -15063,7 +15063,7 @@ void KVpnc::readFromStdout_racoonctl()
//
// connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
// durationTimer.start ( 1000, FALSE );
-// setGuitqStatus ( connected );
+// setGuiStatus ( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -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:" ).tqarg(TunnelInterfaceIP) , GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).arg(TunnelInterfaceIP) , GlobalConfig->debug);
//
abort = false;
@@ -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" ).tqarg( ProcessMsg_connect), GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( 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 );
@@ -15327,7 +15327,7 @@ void KVpnc::readFromStdout_pptp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -15524,7 +15524,7 @@ 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" ).tqarg( pppdev ).tqarg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).arg( pppdev ).arg( GlobalConfig->NewDefaultGw), GlobalConfig->debug );
// pppdupstream << GlobalConfig->pathToIp + " route add 0.0.0.0 via " << GlobalConfig->NewDefaultGw << " dev " << pppdev << "\n";
// }
pppdupfile.close();
@@ -15587,14 +15587,14 @@ void KVpnc::readFromStdout_pptp()
// ReplaceDefaultRouteProcess->addArgument ( PppdReplaceDefaultRouteScript );
// if ( !ReplaceDefaultRouteProcess->start(env) )
// {
- // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
+ // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") );
// // disconnectClicked();
- // // setGuitqStatus(disconnected);
+ // // setGuiStatus(disconnected);
// }
// else
// {
// if ( GlobalConfig->KvpncDebugLevel > 1 )
- // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).arg( 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" )).tqarg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
+ // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).arg(PppdReplaceDefaultRouteScript), GlobalConfig->error );
// }
//
// }
@@ -15623,9 +15623,9 @@ void KVpnc::readFromStdout_pptp()
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
// {
@@ -15635,7 +15635,7 @@ void KVpnc::readFromStdout_pptp()
// }
// delete PptpRouteProcess;
// PptpRouteProcess=0L;
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
if ( GlobalConfig->currentProfile->getUseAdditionalNetworkRoutes() && !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() )
addAdditionalNetworkRoutes();
@@ -15655,7 +15655,7 @@ void KVpnc::readFromStdout_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
// // remove password entries
@@ -15664,7 +15664,7 @@ void KVpnc::readFromStdout_pptp()
// // remove kvpnc entries from chap-secerets
// TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
// TQTextStream stream ( &ChapSecretsFile );
// if ( ChapSecretsFile.open ( IO_ReadOnly ) )
// {
@@ -15731,7 +15731,7 @@ void KVpnc::readFromStdout_pptp()
// // remove kvpnc entries from pap-secerets
// TQFile papSecretsFile ( "/etc/ppp/pap-secrets" );
// if ( GlobalConfig->KvpncDebugLevel > 0 )
- // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug );
// TQTextStream stream ( &papSecretsFile );
// if ( papSecretsFile.open ( IO_ReadOnly ) )
// {
@@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp()
//terminateConnection ( PptpProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
{
@@ -16009,7 +16009,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // 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;
}
@@ -16019,7 +16019,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
@@ -16028,7 +16028,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
@@ -16039,7 +16039,7 @@ void KVpnc::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)!" ).tqarg(i18n("user password") ));
+ // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") ));
GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , 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." ).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 );
+ // 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 );
// 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." ).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 );
+ // 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 );
// 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 );
@@ -16299,8 +16299,8 @@ void KVpnc::readOutput_openvpn()
{
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 );
+ // 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 );
// 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 );
@@ -16315,8 +16315,8 @@ void KVpnc::readOutput_openvpn()
// example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC'
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 );
+ // 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 );
// 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();
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 )
{
@@ -16453,7 +16453,7 @@ void KVpnc::readOutput_openvpn()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -16670,7 +16670,7 @@ void KVpnc::processStdout_l2tpd()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
// remove kvpnc entries from secrets file
@@ -16823,7 +16823,7 @@ void KVpnc::processStdout_l2tpd()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -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" ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -17087,7 +17087,7 @@ void KVpnc::processStderr_l2tpd()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -17123,7 +17123,7 @@ 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
{
@@ -17343,7 +17343,7 @@ void KVpnc::readFromStdout_openl2tp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -17511,7 +17511,7 @@ void KVpnc::readFromStdout_vtun()
//terminateConnection ( L2tpdProcess );
disconnectClicked();
GlobalConfig->status = GlobalConfig->disconnected;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
// success
@@ -17525,7 +17525,7 @@ void KVpnc::readFromStdout_vtun()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -17613,7 +17613,7 @@ void KVpnc::readFromStderr_vtun()
}
// // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 )
// // {
-// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
+// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
// // abort=true;
// // ErrorMsg=true;
// // }
@@ -17672,7 +17672,7 @@ void KVpnc::readFromStderr_vtun()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( 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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
GlobalConfig->appPointer->processEvents();
@@ -17726,8 +17726,8 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// ProcessMsg_connect = SshProcess->readLineStdout();
// TQString ProcessMsg_connect = TQString( SshProcess->readStdout() );
-// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
- TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+// TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
+ TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
@@ -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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
@@ -17841,7 +17841,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -18067,7 +18067,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
{
KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "ssh replace route process" ) ).arg ( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh" ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
}
else
{
@@ -18100,13 +18100,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
// if ( !PptpRouteProcess->start(env) )
// {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) );
// disconnectClicked();
- // setGuitqStatus(disconnected);
+ // setGuiStatus(disconnected);
// }
// else
{
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info );
// while (PptpRouteProcess->isRunning())
// {
@@ -18139,9 +18139,9 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
// {
// ProcessMsg_connect = SshProcess->readLineStderr();
// TQString ProcessMsg_connect = TQString( SshProcess->readStderr() );
-// TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
+// TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
- TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+ TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++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;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return ;
}
}
@@ -18240,12 +18240,12 @@ void KVpnc::readFromStdout_ping()
if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
+ KNotifyClient::event ( topLevelWidget() ->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 ( tqtopLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
}
else
{
@@ -18386,12 +18386,12 @@ 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 ( 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() ) );
+ 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() ) );
}
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 ( 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() ) );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
}
}
disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
@@ -18426,15 +18426,15 @@ void KVpnc::readFromStderr_connectionStatusCheck()
// {
// /* Connection alive */
// if (GlobalConfig->KvpncDebugLevel > 0)
- // 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 );
+ // 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 );
//
// }
// 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.").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()) );
+ // 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()) );
// // kill connection
// disconnectClicked();
// }
@@ -18576,7 +18576,7 @@ void KVpnc::terminateConnection ( TQProcess *proc )
durationTimer.stop();
GlobalConfig->status = GlobalConfig->disconnected;
connectCounter = 0;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
@@ -18685,7 +18685,7 @@ void KVpnc::slotConnectTimedOut()
this->ConnectAction->setEnabled ( true );
this->DisconnectAction->setEnabled ( false );
//parent->statusBar() ->insertItem( i18n( "Connected" ), 2, 0, true );
- KVpncDock->settqStatus ( disconnected );
+ KVpncDock->setStatus ( disconnected );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Connection failed (timeout)." ), GlobalConfig->debug );
disconnectClicked();
@@ -18694,7 +18694,7 @@ void KVpnc::slotConnectTimedOut()
TQToolTip::remove( KVpncDock );
TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
connectCounter = 0;
- setGuitqStatus ( disconnected );
+ setGuiStatus ( 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() )
@@ -18732,7 +18732,7 @@ void KVpnc::newSessionClicked()
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( 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:" ), TQString ( Oldname + "_2" ), &ok );
@@ -18929,7 +18929,7 @@ void KVpnc::renameSessionClicked ()
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == GlobalConfig->currentProfile->getName() ) )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( 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:" ), TQString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok );
@@ -19025,7 +19025,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
TQString Gateway = it->getGateway();
TQString Username = it->getUserName();
//if ( GlobalConfig->KvpncDebugLevel > 2 )
- // GlobalConfig->appendLogEntry (i18n("Username: \"%1").tqarg(Username), KVpncConfig::debug);
+ // GlobalConfig->appendLogEntry (i18n("Username: \"%1").arg(Username), KVpncConfig::debug);
if (it->getDontSaveUsername() || (Username == ""))
Username = i18n("&lt;ask at connect&gt;");
TQString IpsecId = "";
@@ -19311,9 +19311,9 @@ void KVpnc::sessionToggled ( const TQString& Name )
AuthTypePretty += i18n(" (using password)");
else
if (it->getPskIsInFile())
- AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKeyFile());
+ AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKeyFile());
else
- AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKey());
+ AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKey());
}
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -19323,7 +19323,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
// ToolInfo *it;
// std::cout << "Tool (bin): " << bin << std::endl;
- TQString TypeRequirementtqStatus="";
+ TQString TypeRequirementStatus="";
if ( !GlobalConfig->ToolList->isEmpty() )
{
@@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) available").tqarg(bin);
+ TypeRequirementStatus = i18n ( "Daemon (%1) available").arg(bin);
}
else
{
@@ -19358,7 +19358,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
@@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool");
+ TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool");
}
}
}
@@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").tqarg(bin);
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin);
}
}
else
@@ -19401,7 +19401,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19473,7 +19473,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
}
}
}
@@ -19524,7 +19524,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
@@ -19532,7 +19532,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
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 ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" );
}
}
}
@@ -19540,7 +19540,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
}
}
if ( type == "pptp" )
@@ -19556,7 +19556,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementStatus = 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 TQString& Name )
else
{
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::error );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
}
}
if ( type == "ssh" )
@@ -19585,7 +19585,7 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
+ TypeRequirementStatus = 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 TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
+ TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
this->ConnectAction->setEnabled ( TRUE );
mw->buttonConnect->setEnabled ( TRUE );
@@ -19606,13 +19606,13 @@ void KVpnc::sessionToggled ( const TQString& 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 );
- TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
+ TypeRequirementStatus = 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>"+TypeRequirementtqStatus+"</td></tr>";
+ ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementStatus+"</td></tr>";
ProfileInfo += "</table>";
TQToolTip::add( mw->SessionCombo, ProfileInfo );
break;
@@ -19643,7 +19643,7 @@ void KVpnc::slotDurationEvent()
if ( !isHidden() )
{
TQString StatusMsg = "";
- TQString durationString(i18n("%1:%2:%3" ).tqarg( TQString().sprintf("%02u", hour)).tqarg( TQString().sprintf("%02u", min)).tqarg( TQString().sprintf("%02u", sec)));
+ TQString durationString(i18n("%1:%2:%3" ).arg( TQString().sprintf("%02u", hour)).arg( TQString().sprintf("%02u", min)).arg( TQString().sprintf("%02u", sec)));
TQString Username = "";
if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19653,15 +19653,15 @@ void KVpnc::slotDurationEvent()
if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig)
{
- StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg( Username).tqarg( PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg( GlobalConfig->currentProfile->getGateway()).arg( Username).arg( PrettyTypeString).arg(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").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").arg( GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon)
{
- StatusMsg = i18n("Connected: %1 [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1 [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()))
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString);
}
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
- StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQString(PrettyTypeString)).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1, [%2], %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQString(PrettyTypeString)).arg(durationString);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
- StatusMsg = i18n("Connected: %1@%2 [%3], %4").tqarg(TQString(Username)).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString);
+ StatusMsg = i18n("Connected: %1@%2 [%3], %4").arg(TQString(Username)).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString);
}
@@ -19761,18 +19761,18 @@ void KVpnc::showDockTooltip()
TQString ToolTipMsg = "<table>";
TQString Username = "";
- TQString ConnectiontqStatus="";
+ TQString ConnectionStatus="";
if (GlobalConfig->status == GlobalConfig->connected || GlobalConfig->status == GlobalConfig->connecting)
{
if (GlobalConfig->status == GlobalConfig->connected)
{
- ConnectiontqStatus = i18n("connected");
- durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec));
+ ConnectionStatus = i18n("connected");
+ durationString = i18n("%1:%2:%3").arg( TQString().sprintf("%02u", hour)).arg(TQString().sprintf("%02u", min)).arg(TQString().sprintf("%02u", sec));
}
else
{
- ConnectiontqStatus = i18n("connecting");
+ ConnectionStatus = i18n("connecting");
}
if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19780,7 +19780,7 @@ void KVpnc::showDockTooltip()
else
Username = GlobalConfig->currentProfile->getUserName();
- ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectiontqStatus+"</td></tr>";
+ ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectionStatus+"</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>";
@@ -19828,22 +19828,22 @@ void KVpnc::showDockTooltip()
}
else if (GlobalConfig->status == GlobalConfig->disconnected)
{
- ConnectiontqStatus = i18n("disconnected");
- ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectiontqStatus+"</td></tr>";
+ ConnectionStatus = i18n("disconnected");
+ ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectionStatus+"</td></tr>";
}
ToolTipMsg += "</table>";
TQToolTip::remove ( KVpncDock);
TQToolTip::add ( KVpncDock, ToolTipMsg );
}
-void KVpnc::setGuitqStatus ( int status )
+void KVpnc::setGuiStatus ( int status )
{
TQString durationString = "";
TQString DaemonString = "";
TQString ToolTipMsg = "";
TQString ConnectMsg = "";
TQString LogMsg = "";
- TQString ConnectiontqStatus = i18n("unknown");
+ TQString ConnectionStatus = i18n("unknown");
TQString Username = "";
if (status == GlobalConfig->connected)
{
@@ -19854,7 +19854,7 @@ void KVpnc::setGuitqStatus ( int status )
TQString LogMsg = "";
TQString ToolTipMsg = "";
TQString DeamonString = "";
- ConnectiontqStatus = i18n("connected");
+ ConnectionStatus = i18n("connected");
if ( !GlobalConfig->TmpUsername.isEmpty() )
Username=GlobalConfig->TmpUsername;
@@ -19868,7 +19868,7 @@ void KVpnc::setGuitqStatus ( int status )
ImportSessionAction->setEnabled ( false );
NewProfileWizardAction->setEnabled ( false );
- KVpncDock->settqStatus ( connected );
+ KVpncDock->setStatus ( connected );
GlobalConfig->status = GlobalConfig->connected;
statusColorLabel->setPixmap ( *connectedStatusPixmap );
mw->buttonConnect->setEnabled ( false );
@@ -19911,7 +19911,7 @@ void KVpnc::setGuitqStatus ( int status )
DeleteSessionAction->setEnabled ( false );
ImportSessionAction->setEnabled ( false );
- KVpncDock->settqStatus ( connecting );
+ KVpncDock->setStatus ( connecting );
GlobalConfig->status = GlobalConfig->connecting;
mw->SessionCombo->setEnabled ( false );
PreferencesAction->setEnabled ( false );
@@ -19919,7 +19919,7 @@ void KVpnc::setGuitqStatus ( int status )
NewProfileWizardAction->setEnabled ( false );
PrefAction ->setEnabled ( false );
- ConnectiontqStatus = i18n("connecting");
+ ConnectionStatus = i18n("connecting");
statusColorLabel->setPixmap ( *connectingStatusPixmap );
@@ -19941,7 +19941,7 @@ void KVpnc::setGuitqStatus ( int status )
RenameSessionAction->setEnabled ( true );
DeleteSessionAction->setEnabled ( true );
ImportSessionAction->setEnabled ( true );
- KVpncDock->settqStatus ( disconnected );
+ KVpncDock->setStatus ( disconnected );
mw->SessionCombo->setEnabled ( true );
PreferencesAction->setEnabled ( true );
ProfileManagerAction->setEnabled ( true );
@@ -19957,9 +19957,9 @@ void KVpnc::setGuitqStatus ( int status )
slotStatusMsg ( i18n ( "Disconnected." ), ID_FLASH_MSG );
if ( prevConnectionState == GlobalConfig->connected )
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
else if ( prevConnectionState == GlobalConfig->connecting )
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
+ KNotifyClient::event ( topLevelWidget() ->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::setGuitqStatus ( int status )
}
if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk)
{
- 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);
+ 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);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
- 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 + "]");
+ 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(TQDateTime::currentDateTime().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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ 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);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
- LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+ LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQDateTime::currentDateTime().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").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ 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);
- ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
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);
+ LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQString(TQDateTime::currentDateTime().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,76 +20009,76 @@ void KVpnc::setGuitqStatus ( int status )
{
PrettyTypeString = i18n("racoon");
DaemonString = "racoon";
- ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").tqarg(DaemonString);
+ ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").arg(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.").tqarg(DaemonString);
+ ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").arg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString).arg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus);
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
{
PrettyTypeString = IpsecType;
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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ConnectMsg = i18n("%4: %2@%1, %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg( Username).arg(durationString).arg(ConnectionStatus);
}
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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
+ ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString);
}
- 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 + "]");
+ 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(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
{
PrettyTypeString = i18n("OpenVPN");
DaemonString = "openvpn";
- ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
{
PrettyTypeString = i18n("Vtun");
DaemonString = "vtun";
- ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(TQString(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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(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").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+ ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus);
- ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
+ ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString ).arg(TQString(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 + "]");
+ LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
}
if (status == GlobalConfig->connected)
- KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg );
+ KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg );
}
}
@@ -20153,7 +20153,7 @@ void KVpnc::importProfileClicked ( TQString file )
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
nameOk = false;
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
@@ -20265,7 +20265,7 @@ void KVpnc::importOpenvpnProfileClicked ( TQString file )
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok );
@@ -20813,7 +20813,7 @@ void KVpnc::doTailRacoonLog()
else
{
// status=connected;
- // setGuitqStatus(connected);
+ // setGuiStatus(connected);
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ), GlobalConfig->debug );
@@ -20870,7 +20870,7 @@ void KVpnc::removeSetkey()
if ( !RemoveSetkeyProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "setkey (remove)" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "setkey (remove)" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error );
}
else
@@ -20983,7 +20983,7 @@ 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 " ).tqarg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
+ // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).arg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug );
while ( RouteProcess->isRunning() )
{
usleep ( 500 );
@@ -21044,7 +21044,7 @@ void KVpnc::delRouteIpsec()
if ( !RouteProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "del route ("+IpsecType+")" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "del route ("+IpsecType+")" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "del route (" + IpsecType + ")" ) , GlobalConfig->error );
}
else
@@ -21077,7 +21077,7 @@ void KVpnc::removeIptablesFreeswan()
DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" );
if ( !DisconnectProcess->start ( env ) )
{
- // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) );
+ // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "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
@@ -21201,9 +21201,9 @@ void KVpnc::vpncStarted()
// connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) );
//
// if ( !VpncProcess->start(env) ) {
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc-connect" ) );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) );
// } else {
- // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg("vpnc-connect"),GlobalConfig->info );
+ // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info );
//
// // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) );
// // timer.start( tryConnectTimeout * 1000, FALSE );
@@ -21337,7 +21337,7 @@ void KVpnc::racoonStarted()
//
// connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) );
// durationTimer.start( 1000, FALSE );
- // setGuitqStatus( connected );
+ // setGuiStatus( connected );
//
// setFirewallAfterConnect();
// if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -21401,7 +21401,7 @@ void KVpnc::ipsecStarted()
// }
IpsecStatusCheck=true;
- checkIpsecWhacktqStatus();
+ checkIpsecWhackStatus();
IpsecStatusCheck=false;
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -21442,7 +21442,7 @@ void KVpnc::ipsecStarted()
}
}
-void KVpnc::checkIpsecWhacktqStatus()
+void KVpnc::checkIpsecWhackStatus()
{
putenv ( ( char* ) ( "LC_ALL=C" ) );
@@ -21487,8 +21487,8 @@ void KVpnc::checkIpsecWhacktqStatus()
}
if ( !IpsecWhackStatusTimer.isActive() )
{
- disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
- connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
+ disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
+ connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
IpsecWhackStatusTimer.start ( 5 * 1000, FALSE );
}
}
@@ -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)
- checkIpsecWhacktqStatus();
+ checkIpsecWhackStatus();
}
@@ -21709,7 +21709,7 @@ void KVpnc::ipsecPhase2Established()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -21737,7 +21737,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction)
ActionPretty=i18n("Removing");
if ( GlobalConfig->KvpncDebugLevel > 4 )
- GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).tqarg(ActionPretty).tqarg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).arg(ActionPretty).arg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug );
// FIXME convert LeftSourceIp to Virtual IP
@@ -21807,7 +21807,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction)
}
else
{
- GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).tqarg("VirtualIpScript"), GlobalConfig->error );
+ GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).arg("VirtualIpScript"), GlobalConfig->error );
}
}
@@ -21983,7 +21983,7 @@ TQString KVpnc::getX509CertificateID ( TQString Cert, bool user )
}
else
{
- //KMessageBox::information( this, i18n( "\"%1\" started." ).tqarg("openssl") );
+ //KMessageBox::information( this, i18n( "\"%1\" started." ).arg("openssl") );
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "openssl (getCertificate)" ), GlobalConfig->debug );
X509CertificateExtractRunning = true;
@@ -22512,7 +22512,7 @@ void KVpnc::doRoutePptp()
void KVpnc::slotConnecting()
{
- setGuitqStatus ( connecting );
+ setGuiStatus ( connecting );
}
void KVpnc::profileAddedOrDeleted()
@@ -22608,7 +22608,7 @@ void KVpnc::toggleDebugConsole()
GlobalConfig->showDebugConsole = true;
DebugconsoleAction ->setChecked ( true );
mw->DebugOutput->show();
- //resize( tqminimumSizeHint() );
+ //resize( minimumSizeHint() );
}
else
{
@@ -22616,7 +22616,7 @@ void KVpnc::toggleDebugConsole()
DebugconsoleAction ->setChecked ( false );
mw->DebugOutput->hide();
// setMinimumSize(0,0);
- // this->resize( tqminimumSizeHint() );
+ // this->resize( minimumSizeHint() );
}
}
@@ -22983,7 +22983,7 @@ void KVpnc::startConnectionStatusCheck()
disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) );
delete ConnectionStatusCheckProcess;
ConnectionStatusCheckProcess=0L;
- //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "ping_check.sh" ) );
+ //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ping_check.sh" ) , GlobalConfig->error );
}
else
@@ -23291,7 +23291,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
@@ -23319,7 +23319,7 @@ void KVpnc::backupIpsecSystemConfig()
else
{
GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ),GlobalConfig->error );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
return;
}
stream.unsetDevice();
@@ -23390,7 +23390,7 @@ void KVpnc::showNewProfileWizardClicked()
if ( it->getName() == account->getName() )
{
//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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() += "_2" ), &ok );
if ( ok == false )
@@ -23811,7 +23811,7 @@ void KVpnc::pptpProcessExited()
void KVpnc::vtun_exited()
{
-// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error);
+// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
// sleep(2);
// if (GlobalConfig->status == GlobalConfig->connecting || GlobalConfig->connected)
// disconnectClicked();
@@ -24415,7 +24415,7 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -24512,7 +24512,7 @@ void KVpnc::start_l2tpd()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
- setGuitqStatus ( disconnected );
+ setGuiStatus ( disconnected );
}
else
{
@@ -24599,7 +24599,7 @@ void KVpnc::checkL2tpPppUp()
disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
durationTimer.start ( 1000, FALSE );
- setGuitqStatus ( connected );
+ setGuiStatus ( connected );
setFirewallAfterConnect();
@@ -24628,7 +24628,7 @@ void KVpnc::checkL2tpPppUp()
}
-bool KVpnc::checkCiscoVpnctqStatus()
+bool KVpnc::checkCiscoVpncStatus()
{
ciscoVpncRunning = false;
TestCiscoVpncProcess = new TQProcess ( this );
@@ -24847,7 +24847,7 @@ uint KVpnc::getConnectedTime()
return 0;
}
-TQString KVpnc::gettqStatus()
+TQString KVpnc::getStatus()
{
if ( GlobalConfig->status == GlobalConfig->connected )
return "connected";