summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2025-03-22 14:28:03 +0900
committerMichele Calgaro <[email protected]>2025-03-22 14:28:03 +0900
commitb1606f1200c833b5a0896d6bfe08db8db8c6d81e (patch)
tree7259b359fa3dc825890f7c7a653b7628f7cf0f02
parent6af1ac6d9f3382a8f9494eae0455b2a01c91a86c (diff)
downloadkvpnc-rename/true-false.tar.gz
kvpnc-rename/true-false.zip
Replace TRUE/FALSE with boolean values true/falserename/true-false
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--src/ciscocertificateenrollment.cpp14
-rw-r--r--src/generateopenvpnkeydialog.cpp2
-rw-r--r--src/importcertificatedialog.cpp28
-rw-r--r--src/importipsecprofiledialog.cpp6
-rw-r--r--src/importprofiledialog.cpp16
-rw-r--r--src/kvpnc.cpp940
-rw-r--r--src/kvpncconfig.cpp16
-rw-r--r--src/logviewerdialog.cpp10
-rw-r--r--src/mainview.h2
-rw-r--r--src/manageciscocert.cpp2
-rw-r--r--src/networkinterface.cpp6
-rw-r--r--src/newprofiledialog.cpp330
-rw-r--r--src/newprofilewizard.cpp64
-rw-r--r--src/openvpnmanagementhandler.cpp50
-rw-r--r--src/preferencesdialog.cpp50
-rw-r--r--src/profilecertoptions.cpp4
-rw-r--r--src/profilecmdexecafterconnectoptions.cpp12
-rw-r--r--src/profilecmdexecafterdisconnectoptions.cpp4
-rw-r--r--src/profilecmdexecbeforeconnectoptions.cpp4
-rw-r--r--src/profilecmdexecbeforedisconnectoptions.cpp4
-rw-r--r--src/profilenetworknatoptions.cpp8
-rw-r--r--src/profilenetworkrouteoptions.cpp10
-rw-r--r--src/profilenetworkvirtualipoptions.cpp16
-rw-r--r--src/profilepskoptions.cpp16
-rw-r--r--src/toolinfo.cpp68
-rw-r--r--src/toolsinfodialog.cpp2
-rw-r--r--src/utils.cpp8
-rw-r--r--src/vpntypesinfodialog.cpp2
28 files changed, 847 insertions, 847 deletions
diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp
index 7487ebd..dd50654 100644
--- a/src/ciscocertificateenrollment.cpp
+++ b/src/ciscocertificateenrollment.cpp
@@ -411,7 +411,7 @@ void CiscoCertificateEnrollment::next ()
ProgressDlg->resize ( ProgressDlg->width() +100,ProgressDlg->height() );
connect ( &CheckEnrollmentTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkProgress() ) );
- CheckEnrollmentTimer.start ( 500, FALSE );
+ CheckEnrollmentTimer.start ( 500, false );
// we stupid have to send the password :(
// EnrollmentProcess->writeToStdin ( ChallengePassword + "\n" );
@@ -490,7 +490,7 @@ void CiscoCertificateEnrollment::enrollmentProcessFinished()
ProgressDlg->progressBar()->setValue ( 100 );
GlobalConfig->appPointer->restoreOverrideCursor();
finishpage->SucessTextLabel->setText ( successmsg );
- finishButton() ->setEnabled ( TRUE );
+ finishButton() ->setEnabled ( true );
finishButton() ->setFocus();
ProgressDlg->hide();
// delete ProgressDlg;
@@ -553,7 +553,7 @@ void CiscoCertificateEnrollment::readFromStdout()
GlobalConfig->appendLogEntry ( "[cisco_cert_mgr raw] "+line,GlobalConfig->debug );
- if ( line.find ( "Password:" , 0, FALSE ) > -1 )
+ if ( line.find ( "Password:" , 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate enrollment: %1 was requested, send it..." ).arg ( i18n ( " challenge password" ) ),GlobalConfig->debug );
@@ -563,19 +563,19 @@ void CiscoCertificateEnrollment::readFromStdout()
GlobalConfig->appendLogEntry ( i18n ( "Send challenge password: %1" ).arg ( ChallengePassword ), KVpncConfig::debug );
}
- if ( line.find ( "Request Pending." , 0, FALSE ) > -1 )
+ if ( line.find ( "Request Pending." , 0, false ) > -1 )
{
if ( ProgressDlg!= 0 )
ProgressDlg->progressBar()->setValue ( 66 );
GlobalConfig->appendLogEntry ( i18n ( "Certificate enrollment: request sent to CA, waiting for grant..." ) ,GlobalConfig->info );
}
- if ( line.find ( "contacting certificate authority." , 0, FALSE ) > -1 )
+ if ( line.find ( "contacting certificate authority." , 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Certificate enrollment: contacting CA..." ) ,GlobalConfig->info );
}
- if ( line.find ( "Success: certificate enrollment completed with no errors." , 0, FALSE ) > -1 )
+ if ( line.find ( "Success: certificate enrollment completed with no errors." , 0, false ) > -1 )
{
if ( ProgressDlg!= 0 )
ProgressDlg->progressBar()->setValue ( 99 );
@@ -602,7 +602,7 @@ void CiscoCertificateEnrollment::readFromStderr()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( "[cisco_cert_mgr err raw] "+line,GlobalConfig->debug );
- if ( line.find ( "certificate enrollment failed." , 0, FALSE ) > -1 )
+ if ( line.find ( "certificate enrollment failed." , 0, false ) > -1 )
{
KMessageBox::error ( 0, i18n ( "Certificate enrollment: enrollment has been failed." ), i18n ( "Enrollment failed" ) );
diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp
index e305e2b..d7cda9b 100644
--- a/src/generateopenvpnkeydialog.cpp
+++ b/src/generateopenvpnkeydialog.cpp
@@ -125,7 +125,7 @@ void GenerateOpenvpnKeyDialog::readStdErr()
if (ProcessMsg_connect.isEmpty())
ProcessMsg_connect = TQString( generateOpenvpnKeyProcess->readStdout() );
- if ( ProcessMsg_connect.find( "Permission denied", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find( "Permission denied", 0 , false ) > -1 )
{
if (GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry( "[openvpn genkey err] " + ProcessMsg_connect, GlobalConfig->error );
diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp
index a6a6cb7..91c6a9d 100644
--- a/src/importcertificatedialog.cpp
+++ b/src/importcertificatedialog.cpp
@@ -1001,7 +1001,7 @@ void ImportCertificateDialog::readFromStdout_import()
// LogOutput->append( "<font color=\"red\">[std]: hash" + line + "</font>" );
}
- if ( line.find ( "Enter Import Password" , 0, FALSE ) > -1 )
+ if ( line.find ( "Enter Import Password" , 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( " import password" ) ),GlobalConfig->debug );
@@ -1012,7 +1012,7 @@ void ImportCertificateDialog::readFromStdout_import()
ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() + "\n" );
}
- else if ( line.find ( "Enter PEM pass phrase" , 0, FALSE ) > -1 )
+ else if ( line.find ( "Enter PEM pass phrase" , 0, false ) > -1 )
{
if ( askpasscount < 10 )
@@ -1050,14 +1050,14 @@ void ImportCertificateDialog::readFromStdout_import()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ("[cisco_cert_mgr raw] "+line,GlobalConfig->debug);
- if ( line.find ( "Password:" , 0, FALSE ) > -1 || line.find ( "Confirm Password:" , 0, FALSE ) > -1 )
+ if ( line.find ( "Password:" , 0, false ) > -1 || line.find ( "Confirm Password:" , 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( "certificate password" ) ),GlobalConfig->debug );
ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" );
}
- if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 )
+ if ( line.find ( "Success: certificate imported from path:", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Certificate import was successful." ) ,GlobalConfig->info );
@@ -1079,7 +1079,7 @@ void ImportCertificateDialog::readFromStderr_import()
TQString line = TQString ( ImportProcess->readLineStderr() );
if ( GlobalConfig->KvpncDebugLevel > 3 )
{
- if ( line.find ( "Enter Import Pass", 0, FALSE ) > -1 || line.find ( "Enter PEM pass phrase", 0, FALSE ) > -1 || line.find ( "MAC verified OK", 0, FALSE ) > -1 || line.find ( "Enter pass phrase for", 0, FALSE ) > -1 || line.find ( "writing RSA key", 0, FALSE ) > -1 )
+ if ( line.find ( "Enter Import Pass", 0, false ) > -1 || line.find ( "Enter PEM pass phrase", 0, false ) > -1 || line.find ( "MAC verified OK", 0, false ) > -1 || line.find ( "Enter pass phrase for", 0, false ) > -1 || line.find ( "writing RSA key", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg ( line ),GlobalConfig->info );
}
@@ -1088,7 +1088,7 @@ void ImportCertificateDialog::readFromStderr_import()
GlobalConfig->appendLogEntry ( i18n ( "Certificate import stderr: %1" ).arg ( line ),GlobalConfig->error );
}
}
- if ( line.find ( "Error",9, FALSE ) > -1 )
+ if ( line.find ( "Error",9, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg ( line ),GlobalConfig->error );
importSuccess=false;
@@ -1097,7 +1097,7 @@ void ImportCertificateDialog::readFromStderr_import()
// error_found=true;
}
- else if ( line.find ( "invalid password" , 0, FALSE ) > -1 || line.find ( "Mac verify error: invalid password?", 0, FALSE ) > -1 )
+ else if ( line.find ( "invalid password" , 0, false ) > -1 || line.find ( "Mac verify error: invalid password?", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::sorry ( this , i18n ( "Wrong password." ), i18n ( "Password Failed" ) );
@@ -1109,7 +1109,7 @@ void ImportCertificateDialog::readFromStderr_import()
GlobalConfig->appPointer->restoreOverrideCursor();
}
- else if ( line.find ( "unable to load certificate", 0, FALSE ) > -1 )
+ else if ( line.find ( "unable to load certificate", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::error ( this, i18n ( "Unable to load certificate!" ), i18n ( "Load Failed" ) );
@@ -1129,7 +1129,7 @@ void ImportCertificateDialog::readFromStderr_import()
done=true;
return;
}
- else if ( line.find ( "unable to load Private Key", 0, FALSE ) > -1 )
+ else if ( line.find ( "unable to load Private Key", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::error ( this, i18n ( "unable to load Private Key!" ), i18n ( "Load Failed" ) );
@@ -1146,7 +1146,7 @@ void ImportCertificateDialog::readFromStderr_import()
done=true;
}
- else if ( line.find ( "Error opening output file", 0, FALSE ) > -1 )
+ else if ( line.find ( "Error opening output file", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::error ( this, i18n ( "Error opening output file." ), i18n ( "File open failed" ) );
@@ -1158,7 +1158,7 @@ void ImportCertificateDialog::readFromStderr_import()
GlobalConfig->appPointer->restoreOverrideCursor();
done=true;
}
- else if ( line.find ( "Verify failure", 0, FALSE ) > -1 )
+ else if ( line.find ( "Verify failure", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::error ( this, i18n ( "Verify failure at private key password." ), i18n ( "Verify failure" ) );
@@ -1171,7 +1171,7 @@ void ImportCertificateDialog::readFromStderr_import()
done=true;
}
- else if ( line.find ( "MAC verified OK", 0, FALSE ) > -1 )
+ else if ( line.find ( "MAC verified OK", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Import password was ok." ) ,GlobalConfig->debug );
importSuccess=true;
@@ -1183,7 +1183,7 @@ void ImportCertificateDialog::readFromStderr_import()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ("[cisco_cert_mgr raw err] "+line,GlobalConfig->debug);
- if ( line.find ( "error: unable to import certificate from path:", 0, FALSE ) > -1 )
+ if ( line.find ( "error: unable to import certificate from path:", 0, false ) > -1 )
{
if (error_found==false)
KMessageBox::error ( this, i18n ( "Unable to load certificate!" ), i18n ( "Load Failed" ) );
@@ -1200,7 +1200,7 @@ void ImportCertificateDialog::readFromStderr_import()
done=true;
}
- else if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 )
+ else if ( line.find ( "Success: certificate imported from path:", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Certificate imported from path." ) ,GlobalConfig->error );
importOk=true;
diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp
index fe46b57..9c399a2 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -130,7 +130,7 @@ void ImportIpsecProfileDialog::canAccept()
{
TQPtrList<VpnAccountData> *ImportedAccountList = new TQPtrList<VpnAccountData>();
- ImportedAccountList->setAutoDelete ( TRUE ); // the list owns the objects
+ ImportedAccountList->setAutoDelete ( true ); // the list owns the objects
TQPtrList<IpsecImportSection> *IpsecImportSectionList = new TQPtrList<IpsecImportSection>();
bool isIpsecGlobalSection=false;
@@ -718,7 +718,7 @@ void ImportIpsecProfileDialog::canAccept()
validLineFound=true;
TQString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 );
// std::cout << "left and right use certs " << std::endl;
- if ( Authby.find ( "rsasig", 0 , FALSE ) > -1 )
+ if ( Authby.find ( "rsasig", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: left and right use certs." ) ,GlobalConfig->debug );
@@ -727,7 +727,7 @@ void ImportIpsecProfileDialog::canAccept()
//profiledata->setPskIsInFile ( true );
//profiledata->setPrivateKeyFile ( "/etc/ipsec.secrets" );
}
- else if ( Authby.find ( "secret", 0 , FALSE ) > -1 )
+ else if ( Authby.find ( "secret", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "import ipsec config: left and right use psk." ) ,GlobalConfig->debug );
diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index 1b4640c..4fe5784 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -179,7 +179,7 @@ void ImportProfileDialog::canAccept()
bool useApplicationVersion = false;
acc->setUseApplicationVersion( useApplicationVersion );
- bool enableBackup = config.readBoolEntry( "EnableBackup" , FALSE );
+ bool enableBackup = config.readBoolEntry( "EnableBackup" , false );
TQString BackupServer = config.readEntry( "BackupServer", "" );
TQString GroupName = config.readEntry( "GroupName" , "" );
@@ -208,7 +208,7 @@ void ImportProfileDialog::canAccept()
acc->setNtDomainName( NtDomain );
}
- bool enableMSLogon = config.readBoolEntry( "EnableMSLogon", FALSE );
+ bool enableMSLogon = config.readBoolEntry( "EnableMSLogon", false );
bool useNtDomainName = false;
if ( enableMSLogon && !NtDomain.isEmpty() )
@@ -223,7 +223,7 @@ void ImportProfileDialog::canAccept()
TQString CertSubjectName = config.readEntry( "CertSubjectName", "" );
TQString CertSerialHash = config.readEntry( "CertSerialHash", "" );
// bool SendCertChain = config.readBoolEntry( "SendCertChain" , "" );
- // bool VerifyCertDN = config.readBoolEntry( "VerifyCertDN", FALSE );
+ // bool VerifyCertDN = config.readBoolEntry( "VerifyCertDN", false );
/*
0 = default, none
@@ -314,10 +314,10 @@ void ImportProfileDialog::canAccept()
}
- // bool ForceKeepAlives = config.readBoolEntry( "ForceKeepAlives", FALSE );
+ // bool ForceKeepAlives = config.readBoolEntry( "ForceKeepAlives", false );
- // bool EnableLocalLAN = config.readBoolEntry( "EnableLocalLAN", FALSE ); // nur auslesen aber immer aus :)
- // bool EnableSplitDNS = config.readBoolEntry( "EnableSplitDNS", FALSE );
+ // bool EnableLocalLAN = config.readBoolEntry( "EnableLocalLAN", false ); // nur auslesen aber immer aus :)
+ // bool EnableSplitDNS = config.readBoolEntry( "EnableSplitDNS", false );
if (useUdp == false)
@@ -427,10 +427,10 @@ void ImportProfileDialog::canAccept()
// std::cout << "decoded userpasswd: " << userpasswd << std::endl;
// std::cout << "decoded grouppasswd: " << grouppasswd << std::endl;
- bool saveUserPassword = config.readBoolEntry( "SaveUserPassword", FALSE );
+ bool saveUserPassword = config.readBoolEntry( "SaveUserPassword", false );
if (saveUserPassword == false)
- config.readBoolEntry( "!SaveUserPassword", FALSE );
+ config.readBoolEntry( "!SaveUserPassword", false );
if ( UserPassword.isEmpty() && userpasswd.isEmpty() )
saveUserPassword = false;
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index befc613..fa1cc4e 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -279,8 +279,8 @@ KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : TDEMainWi
}
else
{
- DeleteSessionAction->setEnabled ( FALSE );
- ConnectAction->setEnabled ( FALSE );
+ DeleteSessionAction->setEnabled ( false );
+ ConnectAction->setEnabled ( false );
GlobalConfig->currentProfile = 0;
}
}
@@ -427,7 +427,7 @@ void KVpnc::initView()
connect ( mw->SessionCombo, TQ_SIGNAL ( activated ( const TQString & ) ), this, TQ_SLOT ( sessionToggled ( const TQString& ) ) );
- mw->SessionCombo->setEnabled ( FALSE );
+ mw->SessionCombo->setEnabled ( false );
statusColorLabel = new TQLabel ( this );
disconnectedStatusPixmap = new TQPixmap ( 15, 15 );
@@ -487,9 +487,9 @@ void KVpnc::slotSettings()
if ( GlobalConfig->AccountList->isEmpty() )
{
// GlobalConfig->currentProfile = 0L;
- mw->SessionCombo->setEnabled ( FALSE );
+ mw->SessionCombo->setEnabled ( false );
ConnectAction->setEnabled ( false );
- mw->buttonConnect->setEnabled ( FALSE );
+ mw->buttonConnect->setEnabled ( false );
mw->SessionCombo->clear();
}
else
@@ -2359,7 +2359,7 @@ void KVpnc::connectClicked()
disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
- timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE );
+ timer.start ( GlobalConfig->tryConnectTimeout * 1000, false );
}
}
}
@@ -2855,7 +2855,7 @@ void KVpnc::connectClicked()
}
disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
- timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE );
+ timer.start ( GlobalConfig->tryConnectTimeout * 1000, false );
}
else
{
@@ -3732,7 +3732,7 @@ void KVpnc::connectClicked()
// iptables need the right interface (eth0:1 => eth0)
TQString tmpInterface2 = "";
- int pointPos = tmpInterface.find ( ':', 0, FALSE );
+ int pointPos = tmpInterface.find ( ':', 0, false );
if ( pointPos > 1 )
{
tmpInterface2 = tmpInterface.left ( pointPos );
@@ -4983,7 +4983,7 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
{
TQString LocalID = GlobalConfig->currentProfile->getSpecialLocalID();
-// if (!LocalID.find( "@", 0 , FALSE ) > -1)
+// if (!LocalID.find( "@", 0 , false ) > -1)
// LocalID="@"+LocalID;
if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) )
{
@@ -5059,7 +5059,7 @@ void KVpnc::connectClicked()
// iptables need the right interface (eth0:1 => eth0)
TQString tmpInterface2 = "";
- int pointPos = tmpInterface.find ( ':', 0, FALSE );
+ int pointPos = tmpInterface.find ( ':', 0, false );
if ( pointPos > 1 )
{
tmpInterface2 = tmpInterface.left ( pointPos );
@@ -6169,7 +6169,7 @@ void KVpnc::connectClicked()
//connect ( PptpProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( pppdStarted() ) );
// connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) );
- // timer.start( tryConnectTimeout * 1000, FALSE );
+ // timer.start( tryConnectTimeout * 1000, false );
//connect ( PptpProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( pptpProcessExited() ) );
@@ -6666,14 +6666,14 @@ void KVpnc::connectClicked()
int OpenvpnMinor = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",0,0 ).toInt();
TQString OpenvpnExtra="";
int OpenvpnExtraVer=0;
- if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, FALSE ) > -1 )
+ if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, false ) > -1 )
{
- if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "beta", 0, FALSE ) > -1 )
+ if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "beta", 0, false ) > -1 )
{
OpenvpnExtra = "beta";
OpenvpnExtraVer = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).section ( "beta",1,1 ).toInt();
}
- if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "rc", 0, FALSE ) > -1 )
+ if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "rc", 0, false ) > -1 )
{
OpenvpnExtra = "rc";
OpenvpnExtraVer = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).section ( "rc",1,1 ).toInt();
@@ -8781,7 +8781,7 @@ void KVpnc::disconnectClicked()
{
// iptables need the right interface (eth0:1 => eth0)
TQString tmpInterface2 = "";
- int pointPos = tmpInterface.find ( ':', 0, FALSE );
+ int pointPos = tmpInterface.find ( ':', 0, false );
if ( pointPos > 1 )
{
tmpInterface2 = tmpInterface.left ( pointPos );
@@ -9883,7 +9883,7 @@ void KVpnc::disconnectClicked()
{
// iptables need the right interface (eth0:1 => eth0)
TQString tmpInterface2 = "";
- int pointPos = tmpInterface.find ( ':', 0, FALSE );
+ int pointPos = tmpInterface.find ( ':', 0, false );
if ( pointPos > 1 )
{
tmpInterface2 = tmpInterface.left ( pointPos );
@@ -11472,7 +11472,7 @@ void KVpnc::readOutputFrom_vpnc()
/* TMP !!!! */
// requesting group password
- if ( ProcessMsg_connect.find ( "Enter IPSec secret", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Enter IPSec secret", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password requested, send it..." ), GlobalConfig->debug );
@@ -11493,7 +11493,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// requesting password
- else if ( ProcessMsg_connect.find ( "password for", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "password for", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password requested, send it..." ), GlobalConfig->debug );
@@ -11511,7 +11511,7 @@ void KVpnc::readOutputFrom_vpnc()
//"Enter Username and Password"
// requesting gatway
- else if ( ProcessMsg_connect.find ( "Enter IPSec gateway address", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Enter IPSec gateway address", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec gateway address requested, send it..." ), GlobalConfig->debug );
@@ -11523,7 +11523,7 @@ void KVpnc::readOutputFrom_vpnc()
// requesting IPSec ID
//Enter IPSec ID for
- else if ( ProcessMsg_connect.find ( "Enter IPSec ID", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "Enter IPSec ID for", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Enter IPSec ID", 0, false ) > -1 || ProcessMsg_connect.find ( "Enter IPSec ID for", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec ID requested, send it..." ), GlobalConfig->debug );
@@ -11533,7 +11533,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// requesting username
- else if ( ( ProcessMsg_connect.find ( "Enter username for", 0, FALSE ) > -1 ) && !ProcessMsg_connect.find ( "Enter Username and Password", 0, FALSE ) > -1 )
+ else if ( ( ProcessMsg_connect.find ( "Enter username for", 0, false ) > -1 ) && !ProcessMsg_connect.find ( "Enter Username and Password", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Username requested, send it..." ), GlobalConfig->debug );
@@ -11550,7 +11550,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// using interface tun0
- else if ( ProcessMsg_connect.find ( "using interface", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "using interface", 0, false ) > -1 )
{
VpncDevice = ProcessMsg_connect.section ( ' ', 2, 2 ); // using interface tun0 -> tun0
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -11558,7 +11558,7 @@ void KVpnc::readOutputFrom_vpnc()
}
//got address 194.95.192.28
- else if ( ProcessMsg_connect.find ( "got address", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "got address", 0, false ) > -1 )
{
// "got address 194.95.192.28" => "194.95.192.28"
// TunnelInterfaceIP = ProcessMsg_connect.section ( '\n', 1, 1 );
@@ -11570,13 +11570,13 @@ void KVpnc::readOutputFrom_vpnc()
}
bool connectSuccess = false;
- if ( ProcessMsg_connect.find ( "started in background", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "started in background", 0, false ) > -1 )
connectSuccess = true;
- else if ( ProcessMsg_connect.find ( "started in foreground", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "started in foreground", 0, false ) > -1 )
connectSuccess = true;
- else if ( ProcessMsg_connect.find ( "tun0", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "tun0", 0, false ) > -1 )
GlobalConfig->appendLogEntry ( i18n ( "line: %1" ).arg ( ProcessMsg_connect ), GlobalConfig->debug );
@@ -11592,7 +11592,7 @@ void KVpnc::readOutputFrom_vpnc()
disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
@@ -11624,7 +11624,7 @@ void KVpnc::readOutputFrom_vpnc()
// this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error);
- if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11638,7 +11638,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// quick mode response rejected: (ISAKMP_N_INVALID_PAYLOAD_TYPE)(1)
- if ( ProcessMsg_connect.find ( "quick mode response rejected:", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "quick mode response rejected:", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11652,7 +11652,7 @@ void KVpnc::readOutputFrom_vpnc()
connectClicked();
}
- if ( ProcessMsg_connect.find ( "authentication unsuccessful", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "authentication unsuccessful", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11668,7 +11668,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// no ip for gateway
- if ( ProcessMsg_connect.find ( "vpnc: unknown host `<Replace with your gateway IP address>' ", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "vpnc: unknown host `<Replace with your gateway IP address>' ", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11679,7 +11679,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// no answer
- if ( ProcessMsg_connect.find ( "no response from target", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "no response from target", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11690,7 +11690,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// initalizing tunnel interface failed
- if ( ProcessMsg_connect.find ( "can't initialise tunnel interface", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "can't initialise tunnel interface", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11702,7 +11702,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// /dev/net/tun doesnt exist
- if ( ProcessMsg_connect.find ( "can't open /dev/net/tun", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "can't open /dev/net/tun", 0, false ) > -1 )
{
if ( doContinue )
{
@@ -11713,7 +11713,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// host unknown
- if ( ProcessMsg_connect.find ( "unknown host" , 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "unknown host" , 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11724,7 +11724,7 @@ void KVpnc::readOutputFrom_vpnc()
}
//socket creation failed
- if ( ProcessMsg_connect.find ( "making socket", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "making socket", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11734,7 +11734,7 @@ void KVpnc::readOutputFrom_vpnc()
abort = true;
}
- if ( ProcessMsg_connect.find ( "receiving packet: Connection refused", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "receiving packet: Connection refused", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11745,7 +11745,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// binding to port failed
- if ( ProcessMsg_connect.find ( "binding to port", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Address already in use", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "binding to port", 0 , false ) > -1 || ProcessMsg_connect.find ( "Address already in use", 0 , false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11908,7 +11908,7 @@ void KVpnc::readOutputFrom_vpnc()
}
// binding to port 500: Address already in use
- // if ( ProcessMsg_connect.find( "Address already in use", 0 , FALSE ) > -1 )
+ // if ( ProcessMsg_connect.find( "Address already in use", 0 , false ) > -1 )
// {
//int PortToListen = ProcessMsg_connect.section(' ',3,3).section(':',0,0).toInt(); // binding to port 500: Address already in use -> 500
@@ -11985,7 +11985,7 @@ void KVpnc::readOutputFrom_vpnc()
// }
- if ( ProcessMsg_connect.find ( "Network is unreachable", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Network is unreachable", 0 , false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -11996,7 +11996,7 @@ void KVpnc::readOutputFrom_vpnc()
}
- if ( ProcessMsg_connect.find ( "response was invalid",0 , FALSE ) > -1 && ProcessMsg_connect.find ( "ISAKMP_N_INVALID_EXCHANGE_TYPE", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "response was invalid",0 , false ) > -1 && ProcessMsg_connect.find ( "ISAKMP_N_INVALID_EXCHANGE_TYPE", 0, false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -12007,7 +12007,7 @@ void KVpnc::readOutputFrom_vpnc()
doContinue = false;
}
- if ( ProcessMsg_connect.find ( "vpnc found running", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "vpnc found running", 0 , false ) > -1 )
{
//KMessageBox::sorry( this, i18n( "vpnc is already running, kill it manually" ) );
//terminateConnection ( VpncProcess );
@@ -12022,7 +12022,7 @@ void KVpnc::readOutputFrom_vpnc()
connectClicked();
}
- if ( ProcessMsg_connect.find ( "Passcode for VPN", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Passcode for VPN", 0, false ) > -1 )
{
if ( GlobalConfig->currentProfile->getUseXauthInteractive() )
{
@@ -12047,7 +12047,7 @@ void KVpnc::readOutputFrom_vpnc()
}
}
- if ( ProcessMsg_connect.find ( "Connect Banner", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Connect Banner", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Connect banner recieved" ), GlobalConfig->debug );
@@ -12091,17 +12091,17 @@ void KVpnc::readOutputFrom_ciscovpnc()
GlobalConfig->appendLogEntry ( TQString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug );
- if ( ProcessMsg_connect.find ( "illegal read", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "illegal read", 0 , false ) > -1 )
{ }
- else if ( ProcessMsg_connect.find ( "The profile specified could not be read.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "The profile specified could not be read.", 0 , false ) > -1 )
{
KMessageBox::error ( 0,i18n ( "Profile missing. Please contact the KVpnc author." ),i18n ( "Profile missing" ) );
GlobalConfig->appendLogEntry ( i18n ( "Profile file missing. Please contact the KVpnc author." ),GlobalConfig->error );
abort=true;
}
- else if ( ProcessMsg_connect.find ( "Secure VPN Connection terminated locally by the Client", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Secure VPN Connection terminated locally by the Client", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Secure VPN connection terminated locally by the client." ),GlobalConfig->error );
terminatedByClient=true;
@@ -12111,7 +12111,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
// binding to port failed
- if ( ProcessMsg_connect.find ( "bind: Address already in use", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "bind: Address already in use", 0 , false ) > -1 )
{
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug );
@@ -12133,7 +12133,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
abort = true;
}
- if ( ProcessMsg_connect.find ( "Reason: Failed to establish a VPN connection.", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Reason: Failed to establish a VPN connection.", 0 , false ) > -1 )
{
if ( terminatedByClient )
{
@@ -12143,19 +12143,19 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
}
- if ( ProcessMsg_connect.find ( "The VPN sub-system is busy or has failed.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "The VPN sub-system is busy or has failed.", 0, false ) > -1 )
{
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Reason: Remote peer is no longer responding.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Reason: Remote peer is no longer responding.", 0 , false ) > -1 )
{
KMessageBox::error ( 0,i18n ( "Timeout while connecting to %1." ).arg ( GlobalConfig->currentProfile->getGateway(),i18n ( "Connection terminated" ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Timeout while connecting to %1." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->error );
abort=true;
}
- if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "There is already an instance of %1 running!" ).arg ( "vpnclient" ) );
GlobalConfig->appendLogEntry ( i18n ( "There is already an instance of %1 running!" ).arg ( "vpnclient" ) , GlobalConfig->error );
@@ -12163,7 +12163,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
// requesting username
- if ( ProcessMsg_connect.find ( "Username [", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Username [", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Username requested, send it...\n" ), GlobalConfig->debug );
@@ -12179,7 +12179,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
// requesting password
- if ( ProcessMsg_connect.find ( "Password [", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Password [", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -12198,7 +12198,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
CiscoVpncProcess->writeToStdin ( UserPassStr );
CiscoVpncProcess->writeToStdin ( "\n" );
}
- if ( ProcessMsg_connect.find ( "Authenticating user.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Authenticating user.", 0, false ) > -1 )
{
if ( GlobalConfig->AuthRetryCount > 1 )
{
@@ -12218,13 +12218,13 @@ void KVpnc::readOutputFrom_ciscovpnc()
GlobalConfig->AuthRetryCount++;
}
}
- if ( ProcessMsg_connect.find ( "Save Password (Y/N)", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Save Password (Y/N)", 0, false ) > -1 )
{
CiscoVpncProcess->writeToStdin ( "Y" );
CiscoVpncProcess->writeToStdin ( "\n" );
}
- if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Reason: A connection is already in the process of being established." ) );
GlobalConfig->appendLogEntry ( i18n ( "Reason: A connection is already in the process of being established." ) , GlobalConfig->error );
@@ -12232,7 +12232,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
// requesting certificate password
- if ( ProcessMsg_connect.find ( "Enter Certificate password:",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Enter Certificate password:",0,false ) > -1 )
{
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Certificate password requested, send it...\n" ), GlobalConfig->debug );
@@ -12314,7 +12314,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
}
- if ( ProcessMsg_connect.find ( "Reason: User authentication failed.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Reason: User authentication failed.", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error );
@@ -12326,10 +12326,10 @@ void KVpnc::readOutputFrom_ciscovpnc()
connectClicked();
}
- if ( ProcessMsg_connect.find ( "Your VPN connection is secure.", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Your VPN connection is secure.", 0, false ) > -1 )
connectSuccess = true;
- if ( ProcessMsg_connect.find ( "Client address: ", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Client address: ", 0, false ) > -1 )
{
// NetworkInterface iface ( GlobalConfig, parent );
// TunnelInterfaceIP = iface.getInterfaceIP ( CiscoVpncDevice );
@@ -12341,28 +12341,28 @@ void KVpnc::readOutputFrom_ciscovpnc()
}
- if ( ProcessMsg_connect.find ( "VPN tunnel information:",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "VPN tunnel information:",0,false ) > -1 )
{
// Client address: 192.168.201.59
}
- if ( ProcessMsg_connect.find ( "Local LAN Access is disabled",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Local LAN Access is disabled",0,false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Local LAN access is disabled (forced by server). This means you cant access to your local LAN." ), KVpncConfig::info );
}
- if ( ProcessMsg_connect.find ( "Local LAN Access is enabled",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Local LAN Access is enabled",0,false ) > -1 )
{
// GlobalConfig->appendLogEntry ( i18n ( "Local LAN access is enabled." ).arg ( PrivKeyPassStr ), KVpncConfig::info );
}
- if ( ProcessMsg_connect.find ( "Encryption:",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Encryption:",0,false ) > -1 )
{
TQString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Encrypion algorithm used: %1" ).arg ( Encryption ),GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "Authentication:",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Authentication:",0,false ) > -1 )
{
TQString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace();
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -12382,7 +12382,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
GlobalConfig->AuthRetryCount=0;
@@ -12469,16 +12469,16 @@ void KVpnc::readFromStdout_racoon()
// // if ( GlobalConfig->KvpncDebugLevel > 0 )
// // mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect );
//
- // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) {
+ // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
// } else {
- // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Binding interface failed!" ) );
// GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error );
// }
- // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Destination host is unreachable!" ) );
// GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error );
// }
@@ -12493,14 +12493,14 @@ void KVpnc::readFromStdout_racoon()
-// if (ProcessMsg_connect.find ( "ERROR: ", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , FALSE ) > -1 )
+// if (ProcessMsg_connect.find ( "ERROR: ", 0 , false ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , false ) > -1 )
// {
// KMessageBox::error( this, i18n( "Algorithm mismatched, please select another one." ) );
// GlobalConfig->appendLogEntry ( i18n ( "[racoon err]: algorithm mismatched, please select another one." ) , GlobalConfig->error );
// abort = true;
// }
- if ( ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: phase1 up", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: phase1 up", 0 , false ) > -1 )
{
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon )
{
@@ -12520,7 +12520,7 @@ void KVpnc::readFromStdout_racoon()
}
doPingKickupTunnel();
}
- else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 )
{
racoon_tunnel_state++;
if ( racoon_tunnel_state== 2 )
@@ -12551,7 +12551,7 @@ void KVpnc::readFromStdout_racoon()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
doIptablesRacoon();
@@ -12572,7 +12572,7 @@ void KVpnc::readFromStdout_racoon()
}
}
- else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "Phase1 expired, shutting down tunnel..." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase1 expired, shutting down tunnel..." ) , GlobalConfig->info );
@@ -12580,16 +12580,16 @@ void KVpnc::readFromStdout_racoon()
}
// if ( pingtest ) {
// // mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect );
- // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) {
+ // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
// } else {
- // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Binding interface failed!" ) );
// GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error );
// }
- // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Destination host is unreachable!" ) );
// GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error );
// }
@@ -12597,7 +12597,7 @@ void KVpnc::readFromStdout_racoon()
// }
// binding to port failed
- if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 )
{
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
@@ -12742,7 +12742,7 @@ void KVpnc::readFromStderr_racoon()
// binding to port failed
- if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 )
{
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
@@ -12860,97 +12860,97 @@ void KVpnc::readFromStderr_racoon()
}
}
- else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Bad proposal from peer reported." ) );
GlobalConfig->appendLogEntry ( i18n ( "Bad proposal from peer reported, aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Bad proposal from peer reported." ) );
GlobalConfig->appendLogEntry ( i18n ( "Bad proposal from peer reported, aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "The pre shared key couldn't not found, check PSK settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "PSK is missing, aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "failed to process packet" ) );
GlobalConfig->appendLogEntry ( i18n ( "failed to process packet" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: reject the packet, received unexpecting payload type 0" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: unknown notify message, no phase2 handle found. " ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: unknown notify message, no phase2 handle found. " ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase2 negotiation failed due to time up waiting for phase1" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: the peer's certificate is not verified" ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: the peer's certificate is not verified" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , false ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "ERROR: fatal parse failure" ) );
KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Wrong file permission. Aborting." ) );
GlobalConfig->appendLogEntry ( i18n ( "Wrong file permission. Aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 )
{
racoon_tunnel_state++;
if ( racoon_tunnel_state== 1 )
@@ -12991,7 +12991,7 @@ void KVpnc::readFromStderr_racoon()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
doIptablesRacoon();
@@ -13012,33 +13012,33 @@ void KVpnc::readFromStderr_racoon()
}
}
- else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[racoon err] " + i18n ( "setting route failed: route still exists" ), GlobalConfig->error );
}
- else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[racoon err] " + i18n ( "deleting route failed: route dont exists" ), GlobalConfig->error );
}
- else if ( ProcessMsg_connect.find ( "fatal parse failure", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "failed to parse configuration file", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "fatal parse failure", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "fatal parse failure", 0, false ) > -1 || ProcessMsg_connect.find ( "failed to parse configuration file", 0, false ) > -1 || ProcessMsg_connect.find ( "fatal parse failure", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "racoon" ) );
GlobalConfig->appendLogEntry ( i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "racoon" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: ", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: ", 0 , false ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Algorithm mismatched, please select another one." ) );
GlobalConfig->appendLogEntry ( i18n ( "[racoon err]: algorithm mismatched, please select another one." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "racoonctl: Peer not responding" ) );
GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Peer not responding" ) , GlobalConfig->error );
@@ -13046,16 +13046,16 @@ void KVpnc::readFromStderr_racoon()
}
// if ( pingtest ) {
// // mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect );
- // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
- // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) {
+ // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) {
// GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
// } else {
- // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Binding interface failed!" ) );
// GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error );
// }
- // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) {
+ // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) {
// KMessageBox::error( this, i18n( "Destination host is unreachable!" ) );
// GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error );
// }
@@ -13094,7 +13094,7 @@ void KVpnc::readFromStderr_racoon_helper()
bool wrong_algo=false;
- if ( ProcessMsg_connect.find ( "libipsec: syntax error while parsing", 0, FALSE ) > -1 && !wrong_algo )
+ if ( ProcessMsg_connect.find ( "libipsec: syntax error while parsing", 0, false ) > -1 && !wrong_algo )
{
KMessageBox::error ( this, i18n ( "Error in generated configuration file for \%1\", please contact KVpnc team." ).arg ( "setkey" ) );
GlobalConfig->appendLogEntry ( i18n ( "libipsec has found syntax error while parsing." ) , GlobalConfig->error );
@@ -13140,18 +13140,18 @@ void KVpnc::readFromStdout_ipsec()
// if ( GlobalConfig->KvpncDebugLevel > 0 )
// mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect );
- if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
}
- else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 )
{
NormalMsg = false;
GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
}
else
{
- if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 )
{
NormalMsg = false;
KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) );
@@ -13162,7 +13162,7 @@ void KVpnc::readFromStdout_ipsec()
else
{
// FATAL ERROR:
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, false ) > -1 )
{
TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
@@ -13182,7 +13182,7 @@ void KVpnc::readFromStdout_ipsec()
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 )
+ 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." ).arg(interfacemissing) );
@@ -13191,7 +13191,7 @@ void KVpnc::readFromStdout_ipsec()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ipsec_setup: Openswan IPsec apparently already active, start aborted", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 || ProcessMsg_connect.find ( "ipsec_setup: Openswan IPsec apparently already active, start aborted", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) );
GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->info );
@@ -13203,7 +13203,7 @@ void KVpnc::readFromStdout_ipsec()
ipsecStarted();
}
- else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13252,7 +13252,7 @@ void KVpnc::readFromStderr_ipsec()
ProcessMsg_connect = IpsecStartProcess->readLineStderr();
// TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStderr() );
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, false ) > -1 )
{
TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
@@ -13271,7 +13271,7 @@ void KVpnc::readFromStderr_ipsec()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13279,31 +13279,31 @@ void KVpnc::readFromStderr_ipsec()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec err] "+i18n ( "setting route failed: route still exists" ), GlobalConfig->error );
// abort=true;
}
- else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "deleting route failed: route dont exists" ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "we only support version 2", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "we only support version 2", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "only version 2.x is supported " ), GlobalConfig->error );
abort = true;
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "error loading RSA private key file", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "error loading RSA private key file", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "RSA private key file could not be loaded." ), GlobalConfig->error );
abort = true;
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "unable to start strongSwan -- fatal errors in config", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "unable to start strongSwan -- fatal errors in config", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Unable to start strongSwan -- fatal errors in config. Please contact the KVpnc author." ) );
GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "Unable to start strongSwan -- fatal errors in config. Please contact the KVpnc author." ), GlobalConfig->error );
@@ -13311,11 +13311,11 @@ void KVpnc::readFromStderr_ipsec()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "Starting strongSwan", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Starting strongSwan", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec] " + ProcessMsg_connect, GlobalConfig->info );
}
- else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Openswan IPsec apparently already active, start aborted", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 || ProcessMsg_connect.find ( "Openswan IPsec apparently already active, start aborted", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) );
GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->error );
@@ -13329,22 +13329,22 @@ void KVpnc::readFromStderr_ipsec()
else if ( pingtest )
{
// mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect );
- if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
}
- else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
}
else
{
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Binding interface failed!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error );
}
- if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error );
@@ -13378,7 +13378,7 @@ void KVpnc::readFromStdout_ipsecwhack()
bool ErrorMsg = false;
bool abort = false;
- if ( ProcessMsg_connect.find ( "encountered fatal error in state STATE_XAUTH", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "encountered fatal error in state STATE_XAUTH", 0 , false ) > -1 )
{
// xauth failed openswan
ErrorMsg=true;
@@ -13389,7 +13389,7 @@ void KVpnc::readFromStdout_ipsecwhack()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "extended authentication failed", 0 , FALSE ) > -1 || ( GlobalConfig->WaitingForXauth==true && ProcessMsg_connect.find ( "expected ISAKMP_CFG_SET, got ISAKMP_CFG_REQUEST", 0 , FALSE ) > -1 ) )
+ else if ( ProcessMsg_connect.find ( "extended authentication failed", 0 , false ) > -1 || ( GlobalConfig->WaitingForXauth==true && ProcessMsg_connect.find ( "expected ISAKMP_CFG_SET, got ISAKMP_CFG_REQUEST", 0 , false ) > -1 ) )
{
// xauth failed strongswan
KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "XAUTH" ) ) );
@@ -13399,14 +13399,14 @@ void KVpnc::readFromStdout_ipsecwhack()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "Can't authenticate: no preshared key found", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Can't authenticate: no preshared key found", 0 , false ) > -1 )
{
ErrorMsg=true;
abort=true;
KMessageBox::error ( this, i18n ( "Preshared key not found for connection." ) );
GlobalConfig->appendLogEntry ( i18n ( "Preshared key not found for connection." ) , GlobalConfig->error );
}
- else if ( ProcessMsg_connect.find ( "prompt for Username:", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "prompt for Username:", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "XAUTH username requested, send it..." ) , GlobalConfig->debug );
@@ -13416,7 +13416,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackProcess->writeToStdin ( GlobalConfig->TmpUsername+"\n" );
}
- else if ( ProcessMsg_connect.find ( "prompt for Password:", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "prompt for Password:", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "XAUTH password requested, send it..." ) , GlobalConfig->debug );
@@ -13425,7 +13425,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackProcess->writeToStdin ( GlobalConfig->TmpPassword+"\n" );
}
- else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 )
{
// strongswan after ipsec whack --listen
/* disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) );
@@ -13460,7 +13460,7 @@ void KVpnc::readFromStdout_ipsecwhack()
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToIpsec+" whack --name "+GlobalConfig->currentProfile->getName() +" --initiate" ), GlobalConfig->debug );
}
}
- else if ( ProcessMsg_connect.find ( "added connection", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "added connection", 0 , false ) > -1 )
{
// XAUTH
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
@@ -13507,15 +13507,15 @@ void KVpnc::readFromStdout_ipsecwhack()
}
}
- else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Authentication succeded." ) , GlobalConfig->info );
}
- else if ( ProcessMsg_connect.find ( "parsing XAUTH status", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "parsing XAUTH status", 0 , false ) > -1 )
{
GlobalConfig->WaitingForXauth=true;
}
- else if ( ProcessMsg_connect.find ( "added connection", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "added connection", 0 , false ) > -1 )
{
// XAUTH
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() )
@@ -13562,7 +13562,7 @@ void KVpnc::readFromStdout_ipsecwhack()
}
}
- else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 )
{
if (IpsecPhase2Up)
@@ -13588,15 +13588,15 @@ void KVpnc::readFromStdout_ipsecwhack()
}
}
- else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 )
{
ipsecPhase2Established();
}
- else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Authentication succeded." ) , GlobalConfig->info );
}
- else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Openswan seems still running, restart it." ) );
GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->info );
@@ -13607,7 +13607,7 @@ void KVpnc::readFromStdout_ipsecwhack()
if ( !IpsecGotError)
ipsecStarted();
}
- else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13616,7 +13616,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13628,7 +13628,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13640,7 +13640,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13652,7 +13652,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13664,7 +13664,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13676,7 +13676,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Private key could not be found. Please check certificate settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "Private key could not be found. Please check certificate settings." ) , GlobalConfig->error );
@@ -13684,7 +13684,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , false ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13692,13 +13692,13 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , false ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) );
GlobalConfig->appendLogEntry ( i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , false ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , false ) > -1 )
{
TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
@@ -13724,7 +13724,7 @@ void KVpnc::readFromStdout_ipsecwhack()
}
}
}
- else if ( ProcessMsg_connect.find ( "no connection named", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no connection named", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection not found. This seems like the configuration is invalid or too fast connect/disconnect." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection not found. This seems like the configuration is invalid or too fast connect/disconnect." ) , GlobalConfig->error );
@@ -13732,7 +13732,7 @@ void KVpnc::readFromStdout_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , false ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , false ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13783,7 +13783,7 @@ void KVpnc::readFromStderr_ipsecwhack()
GlobalConfig->appendLogEntry ( "[ipsec whack err] " + ProcessMsg_connect, GlobalConfig->error );
// // binding to port failed
-// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 )
+// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 )
// {
// if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_ipsec )
@@ -13850,7 +13850,7 @@ void KVpnc::readFromStderr_ipsecwhack()
// }
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, false ) > -1 )
{
TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 );
GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug );
@@ -13868,14 +13868,14 @@ void KVpnc::readFromStderr_ipsecwhack()
abort = true;
}
- else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error );
abort = true;
ErrorMsg = true;
}
- else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13885,7 +13885,7 @@ void KVpnc::readFromStderr_ipsecwhack()
stopContinue = true;
}
}
- else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13895,7 +13895,7 @@ void KVpnc::readFromStderr_ipsecwhack()
stopContinue = true;
}
}
- else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13907,7 +13907,7 @@ void KVpnc::readFromStderr_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13919,7 +13919,7 @@ void KVpnc::readFromStderr_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , false ) > -1 )
{
if ( !stopContinue )
{
@@ -13931,7 +13931,7 @@ void KVpnc::readFromStderr_ipsecwhack()
IpsecWhackStatusTimer.stop();
}
}
- else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Private key could not be found. Please check certificate settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "Private key could not be found. Please check certificate settings." ) , GlobalConfig->error );
@@ -13939,7 +13939,7 @@ void KVpnc::readFromStderr_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , false ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) );
GlobalConfig->appendLogEntry ( i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) , GlobalConfig->error );
@@ -13947,13 +13947,13 @@ void KVpnc::readFromStderr_ipsecwhack()
IpsecGotError = true;
IpsecWhackStatusTimer.stop();
}
- else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , false ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) );
GlobalConfig->appendLogEntry ( i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , false ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , false ) > -1 )
{
TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 );
TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 );
@@ -14007,13 +14007,13 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + ProcessMsg_connect, GlobalConfig->debug );
- if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug );
start_ipsec_initiate();
}
- else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , false ) > -1 )
{
timer.stop();
@@ -14047,7 +14047,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
doPingKickupTunnel();
}
- else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 )
{
timer.stop();
IpsecWhackStatusTimer.stop();
@@ -14094,7 +14094,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -14154,7 +14154,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
// GlobalConfig->appendLogEntry ( "[ipsec whack listen err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "Pluto is not running", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Pluto is not running", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ipsec whack listen " + i18n ( "Waiting for pluto" ), GlobalConfig->debug );
if ( connectCounter > 25 )
@@ -14182,7 +14182,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
}
return;
}
- if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug );
@@ -14225,10 +14225,10 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
if ( GlobalConfig->KvpncDebugLevel > 5 )
GlobalConfig->appendLogEntry ( "[ipsec whack status] " + ProcessMsg_connect, GlobalConfig->debug );
- if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, false ) > -1 )
{
- if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , false ) > -1 )
{
timer.stop();
@@ -14264,7 +14264,7 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
doPingKickupTunnel();
}
- else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 )
{
ipsecPhase2Established();
}
@@ -14307,7 +14307,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
ProcessMsg_connect = IpsecWhackStatusProcess->readLineStderr();
// TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStderr() );
-// if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 )
+// if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, false ) > -1 )
// {
//
// }
@@ -14320,7 +14320,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
GlobalConfig->appendLogEntry ( "[ipsec whack status err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "Pluto is not running", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Pluto is not running", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "ipsec daemon is not running, restarting it..." ), GlobalConfig->info );
startStopIpsec ( true );
@@ -14335,7 +14335,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
{
GlobalConfig->appendLogEntry ( "[ipsec whack status err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "Pluto is not running", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Pluto is not running", 0, false ) > -1 )
{
if ( !IpsecStartingInProgress )
{
@@ -14423,7 +14423,7 @@ void KVpnc::readFromStdout_tail_racoon()
bool abort = false;
bool error_found = false;
- if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error );
}
@@ -14431,13 +14431,13 @@ void KVpnc::readFromStdout_tail_racoon()
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
{
- if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) == -1 )
+ if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) == -1 )
GlobalConfig->appendLogEntry ( "[racoon tail] " + ProcessMsg_connect, GlobalConfig->debug );
}
}
// // binding to port failed
-// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1)
+// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1)
// {
//
// if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
@@ -14557,117 +14557,117 @@ void KVpnc::readFromStdout_tail_racoon()
//
// }
- if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error );
abort=true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "The pre shared key couldn't not found, check PSK settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "PSK is missing, aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "failed to process packet" ) );
GlobalConfig->appendLogEntry ( i18n ( "failed to process packet" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: reject the packet, received unexpecting payload type 0" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: unknown notify message, no phase2 handle found. " ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: unknown notify message, no phase2 handle found. " ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase2 negotiation failed due to time up waiting for phase1" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: the peer's certificate is not verified" ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: the peer's certificate is not verified" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: no configuration found for", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: no configuration found for", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: no configuration found" ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: no configuration found" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: no peer's CERT payload found.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: no peer's CERT payload found.", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: no peer's CERT payload found." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: no peer's CERT payload found." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: failed to get subjectAltName", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: failed to get subjectAltName", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "ERROR: failed to get subjectAltName" ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: failed to get subjectAltName" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: such a cert type isn't supported:", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: such a cert type isn't supported:", 0 , false ) > -1 )
{
////KMessageBox::error( this, i18n( "ERROR: such a cert type isn't supported:" ) );
//GlobalConfig->appendLogEntry ( i18n ( "ERROR: such a cert type isn't supported:" ) , GlobalConfig->error );
//
//abort = true;
}
- else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , false ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "ERROR: fatal parse failure" ) );
KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Wrong file permission. Aborting." ) );
GlobalConfig->appendLogEntry ( i18n ( "Wrong file permission. Aborting." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: fatal INVALID-ID-INFORMATION", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: fatal INVALID-ID-INFORMATION", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Peer refused ID settings. Please verify the local ID in racoon and remote network in Network - General settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "Peer refused ID settings. Please verify the local ID in racoon and remote network in Network - General settings." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "STATE: phase1 up", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "STATE: phase1 up", 0 , false ) > -1 || ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Phase1 is now up." ) , GlobalConfig->debug );
@@ -14679,13 +14679,13 @@ void KVpnc::readFromStdout_tail_racoon()
doAddRemoveVirtualIp("add");
}
}
- else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) );
GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase1 negotiation failed due to time up." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , false ) > -1 )
{
racoon_tunnel_state++;
if ( racoon_tunnel_state == 1 )
@@ -14856,7 +14856,7 @@ void KVpnc::readFromStdout_tail_racoon()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -14883,32 +14883,32 @@ void KVpnc::readFromStdout_tail_racoon()
}
}
- else if ( ProcessMsg_connect.find ( "ISAKMP-SA expired", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ISAKMP-SA expired", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Phase1 expired" ) , GlobalConfig->debug );
abort = false;
}
- else if ( ProcessMsg_connect.find ( "Reading configuration from", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Reading configuration from", 0 , false ) > -1 )
{
// GlobalConfig->appendLogEntry ( i18n ( "Reading configuration from got" ) , GlobalConfig->debug );
// sleep(3);
// racoonStarted();
}
- else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) );
GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: fatal NO-PROPOSAL-CHOSEN", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: fatal NO-PROPOSAL-CHOSEN", 0 , false ) > -1 )
{
if (!error_found)
KMessageBox::error ( this, i18n ( "Wrong connection parameters used. Please verify the connection settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "Peer reported that we use wrong connection parameters." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , false ) > -1 )
{
if (!error_found)
KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) );
@@ -14938,7 +14938,7 @@ void KVpnc::readFromStderr_tail_racoon()
{
GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error );
}
- if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , false ) > -1 )
{
if (!error_found)
KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) );
@@ -14966,11 +14966,11 @@ void KVpnc::readFromStdout_racoonctl()
{
GlobalConfig->appendLogEntry ( "[racoonctl] " + ProcessMsg_connect, GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error );
}
- if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Racoon seem not running!" ) );
@@ -15007,19 +15007,19 @@ void KVpnc::readFromStdout_racoonctl()
// abort =true;
}
- else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "racoonctl: Cannot send combuf" ) );
GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Cannot send combuf" ) , GlobalConfig->error );
abort =true;
}
- else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "racoonctl: Peer not responding" ) );
GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Peer not responding" ) , GlobalConfig->error );
abort =true;
}
- if ( ProcessMsg_connect.find ( "Password:", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Password:", 0 , false ) > -1 )
{
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
@@ -15037,13 +15037,13 @@ void KVpnc::readFromStdout_racoonctl()
RacoonctlProcess->writeToStdin ( UserPassStr );
RacoonctlProcess->writeToStdin ( "\n" );
}
- else if ( ProcessMsg_connect.find ( "VPN connexion terminated", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "VPN connexion terminated", 0 , false ) > -1 )
{
//KMessageBox::error ( this, i18n ( "VPN connexion terminated" ) );
GlobalConfig->appendLogEntry ( i18n ( "VPN connexion terminated" ) , GlobalConfig->debug );
abort =false;
}
- else if ( ProcessMsg_connect.find ( "VPN connexion established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "VPN connexion established", 0 , false ) > -1 )
{
// racoonctl tells it but its only phase1 => useless
// if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
@@ -15061,7 +15061,7 @@ void KVpnc::readFromStdout_racoonctl()
// GlobalConfig->status = GlobalConfig->connected;
//
// connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
-// durationTimer.start ( 1000, FALSE );
+// durationTimer.start ( 1000, false );
// setGuiStatus ( connected );
//
// setFirewallAfterConnect();
@@ -15096,19 +15096,19 @@ void KVpnc::readFromStderr_racoonctl()
// if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Racoon seem not running!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Racoon seem not running!" ) , GlobalConfig->error );
// abort =true;
}
- else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "racoonctl: Cannot send combuf" ) );
GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Cannot send combuf" ) , GlobalConfig->error );
// abort =true;
}
- if ( ProcessMsg_connect.find ( "Password:", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Password:", 0 , false ) > -1 )
{
if ( GlobalConfig->VpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( "[racoonctl err] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
@@ -15152,39 +15152,39 @@ void KVpnc::readFromStdout_pptp()
bool allowReconnect = false;
- if ( ProcessMsg_connect.find ( "could not find module", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "could not find module", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Module not found." ) );
GlobalConfig->appendLogEntry ( i18n ( "Module not found." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Connection has been terminated." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info );
abort = true;
allowReconnect = true;
}
- else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Modem hung up", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , false ) > -1 || ProcessMsg_connect.find ( "Modem hung up", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Remote modem has hung up. Connection was terminated." ) );
GlobalConfig->appendLogEntry ( i18n ( "Remote modem has hung up. Connection was terminated." ) , GlobalConfig->error );
abort = true;
allowReconnect = true;
}
- else if ( ProcessMsg_connect.find ( "connect: Connection refused", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "connect: Connection refused", 0 , false ) > -1 )
{
KMessageBox::error(this, i18n("Connection has been refused. Terminate."));
GlobalConfig->appendLogEntry(i18n("Connection has been refused. Terminate.") , GlobalConfig->error);
abort = true;
}
- else if ( ProcessMsg_connect.find ( "No route to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "No route to host", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No route to host." ) );
GlobalConfig->appendLogEntry ( i18n ( "No route to host." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Authentication failure", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "MS-CHAP authentication failed:", 0 , FALSE ) > -1)
+ else if ( ProcessMsg_connect.find ( "Authentication failure", 0 , false ) > -1 || ProcessMsg_connect.find ( "MS-CHAP authentication failed:", 0 , false ) > -1)
{
timer.stop();
connectCounter=0;
@@ -15196,7 +15196,7 @@ void KVpnc::readFromStdout_pptp()
GlobalConfig->haveUserData = false;
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , false ) > -1 )
{
timer.stop();
connectCounter=0;
@@ -15209,26 +15209,26 @@ void KVpnc::readFromStdout_pptp()
GlobalConfig->haveUserData = false;
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "EAP: peer reports authentication failure", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "EAP: peer reports authentication failure", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "The peer refused to authenticate (it wants EAP). Please check username, password and EAP settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "The peer refused to authenticate (it wants EAP). Please check username, password and EAP settings." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Call manager exited with error", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Call manager exited with error", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Call manager exited with a error." ) );
GlobalConfig->appendLogEntry ( i18n ( "Call manager exited with error." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Input/output error", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Input/output error", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Input/output error" ) );
GlobalConfig->appendLogEntry ( i18n ( "Input/output error" ) , GlobalConfig->error );
abort = true;
allowReconnect = true;
}
- else if ( ProcessMsg_connect.find ( "Using interface", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Using interface", 0 , false ) > -1 )
{
PppdDevice = ProcessMsg_connect.right ( ProcessMsg_connect.length() - 16 );
if ( GlobalConfig->PppdDebugLevel > 0 )
@@ -15244,21 +15244,21 @@ void KVpnc::readFromStdout_pptp()
abort = false;
}
- else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Sending data has failed. Connection was terminated." ) );
GlobalConfig->appendLogEntry ( i18n ( "Sending data has failed. Connection was terminated." ) , GlobalConfig->error );
abort = true;
allowReconnect = true;
}
- else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Remote modem has hung up. Connection was terminated." ) );
GlobalConfig->appendLogEntry ( i18n ( "Remote modem has hung up. Connection was terminated." ) , GlobalConfig->error );
abort = true;
allowReconnect = true;
}
- else if ( ProcessMsg_connect.find ( "primary DNS address", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "primary DNS address", 0 , false ) > -1 )
{
// example: primary DNS address 132.210.*.2 secondary DNS address 132.210.**.2
bool got2dns = false;
@@ -15284,19 +15284,19 @@ void KVpnc::readFromStdout_pptp()
}
abort = false;
}
- else if ( ProcessMsg_connect.find ( "CHAP authentication succeeded", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "CHAP authentication succeeded", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "CHAP authentication succeeded.\n" ), GlobalConfig->debug );
abort = false;
}
- else if ( ProcessMsg_connect.find ( "MPPE 128-bit stateless compression enabled", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "MPPE 128-bit stateless compression enabled", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "MPPE 128-bit stateless compression enabled.\n" ), GlobalConfig->debug );
abort = false;
}
- else if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "local", 0 , false ) > -1 )
{
// if (GlobalConfig->KvpncDebugLevel > 0)
// GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( ProcessMsg_connect), GlobalConfig->debug);
@@ -15305,14 +15305,14 @@ void KVpnc::readFromStdout_pptp()
GlobalConfig->appendLogEntry ( i18n ( "Tunnel IP address: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug );
abort = false;
}
- else if ( ProcessMsg_connect.find ( "Loopback detected", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Loopback detected", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Loopback detected. Reconnecting." ) );
GlobalConfig->appendLogEntry ( i18n ( "Loopback detected. Reconnecting." ) , GlobalConfig->error );
abort = true;
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "remote IP address", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "remote IP address", 0, false ) > -1 )
connectSuccess = true;
// success
@@ -15325,7 +15325,7 @@ void KVpnc::readFromStdout_pptp()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
@@ -15827,19 +15827,19 @@ void KVpnc::readFromStderr_pptp()
bool allowReconnect = false;
bool error_found=false;
- if ( ProcessMsg_connect.find ( "DNS address", 0, FALSE ) || ProcessMsg_connect.find ( "Script /etc/ppp/ip-up started", 0, FALSE ) )
+ if ( ProcessMsg_connect.find ( "DNS address", 0, false ) || ProcessMsg_connect.find ( "Script /etc/ppp/ip-up started", 0, false ) )
GlobalConfig->appendLogEntry ( "[pppd] " + ProcessMsg_connect, GlobalConfig->debug );
else
GlobalConfig->appendLogEntry ( "[pppd err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "authentication failed", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "authentication failed", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Authentication has been failed." ) );
GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed." ) , GlobalConfig->error );
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "MPPE required but not available", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "MPPE required but not available", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "MPPE required but not available" ) );
@@ -15847,7 +15847,7 @@ void KVpnc::readFromStderr_pptp()
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "The peer refused to authenticate." ) );
@@ -15855,7 +15855,7 @@ void KVpnc::readFromStderr_pptp()
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "could not find module", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "could not find module", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "Module not found." ) );
@@ -15863,7 +15863,7 @@ void KVpnc::readFromStderr_pptp()
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 )
{
//if (error_found==false)
// KMessageBox::error( this, i18n( "Connection has been terminated." ) );
@@ -15872,7 +15872,7 @@ void KVpnc::readFromStderr_pptp()
allowReconnect = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "Sending data has failed. Connection was terminated." ) );
@@ -15881,7 +15881,7 @@ void KVpnc::readFromStderr_pptp()
allowReconnect = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "MPPE required, but kernel has no support", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "MPPE required, but kernel has no support", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "MPPE required, but kernel has no support. Please use a kernel with mppe support." ) );
@@ -15889,7 +15889,7 @@ void KVpnc::readFromStderr_pptp()
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "unrecognized option 'mppe'", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "unrecognized option 'mppe'", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "MPPE required, but pppd has no MPPE support. Please install a pppd with MPPE support." ) );
@@ -15897,7 +15897,7 @@ void KVpnc::readFromStderr_pptp()
abort = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "Input/output error", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Input/output error", 0 , false ) > -1 )
{
//if (error_found==false)
//KMessageBox::error( this, i18n( "Input/output error" ) );
@@ -15906,7 +15906,7 @@ void KVpnc::readFromStderr_pptp()
allowReconnect = true;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "local IP address", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "local IP address", 0 , false ) > -1 )
{
TunnelInterfaceIP = ProcessMsg_connect.simplifyWhiteSpace().section ( ' ', 3, 3 );
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -15914,7 +15914,7 @@ void KVpnc::readFromStderr_pptp()
abort = false;
error_found=true;
}
- else if ( ProcessMsg_connect.find ( "No auth is possible sent", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "No auth is possible sent", 0 , false ) > -1 )
{
if ( error_found==false )
KMessageBox::error ( this, i18n ( "No password was send. Please check if there is a password set in user settings." ) );
@@ -15981,7 +15981,7 @@ void KVpnc::readOutput_openvpn()
// }
- if ( ProcessMsg.find ( "refused", 0 , FALSE ) > -1 && !stderr )
+ if ( ProcessMsg.find ( "refused", 0 , false ) > -1 && !stderr )
GlobalConfig->appendLogEntry ( "[openvpn] " + ProcessMsg, GlobalConfig->error );
else
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -15989,19 +15989,19 @@ void KVpnc::readOutput_openvpn()
bool abort = false;
- if ( ProcessMsg.find ( "Connection timed out", 0 , FALSE ) > -1 )
+ if ( ProcessMsg.find ( "Connection timed out", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection has been timed out. Terminate." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection has been timed out. Terminate." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "[ECONNREFUSED]: Connection refused", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "[ECONNREFUSED]: Connection refused", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection has been refused. Terminate." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection has been refused. Terminate." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "AUTH: Received AUTH_FAILED", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "AUTH: Received AUTH_FAILED", 0, false ) > -1 )
{
AuthRetry = true;
GlobalConfig->haveUserData = false;
@@ -16012,7 +16012,7 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error );
// abort=true;
}
- else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, false ) > -1 )
{
;
disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) );
@@ -16022,7 +16022,7 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, false ) > -1 )
{
disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) );
// disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) );
@@ -16031,7 +16031,7 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Insufficient key material or header text not found", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Insufficient key material or header text not found", 0, false ) > -1 )
{
AuthRetry = true;
GlobalConfig->haveUserData = false;
@@ -16042,20 +16042,20 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "not found", 0, FALSE ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "not found", 0, false ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, false ) > -1 )
{
TQString hash_algo= ProcessMsg.section ( "'",1,1 );
KMessageBox::error ( this, i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) );
GlobalConfig->appendLogEntry ( i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Cannot load private key file", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Cannot load private key file", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Auth username is empty." ) );
GlobalConfig->appendLogEntry ( i18n ( "Private key file could not loaded!" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tun" ).arg( "tap" ) );
// GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tun" ).arg( "tap" ) , GlobalConfig->error );
@@ -16067,7 +16067,7 @@ void KVpnc::readOutput_openvpn()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tap" ).arg( "tun" ) );
// GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tap" ).arg( "tun" ), GlobalConfig->error );
@@ -16079,23 +16079,23 @@ void KVpnc::readOutput_openvpn()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, false ) > -1 )
{
- // else if ( ProcessMsg.find( "Connection refused", 0, FALSE ) > -1 ) {
- // if ( ProcessMsg.find( "failed", 0, FALSE ) > -1 ) {
+ // else if ( ProcessMsg.find( "Connection refused", 0, false ) > -1 ) {
+ // if ( ProcessMsg.find( "failed", 0, false ) > -1 ) {
GlobalConfig->appendLogEntry ( i18n ( "Connection to HTTP proxy (%1:%2) failed!" ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error );
KMessageBox::error ( this, i18n ( "Connection to HTTP proxy (%1:%2) failed!" ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) );
abort = true;
// }
}
- else if ( ProcessMsg.find ( "SIGTERM[soft,init_instance] received", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "SIGTERM[soft,init_instance] received", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Connection was rejected (wrong HTTP proxy auth data?)." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error );
KMessageBox::error ( this, i18n ( "Connection was rejected (wrong HTTP proxy auth data?)." ) );
abort = true;
}
- else if ( ProcessMsg.find ( "MANAGEMENT: Cannot bind TCP socket", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "MANAGEMENT: Cannot bind TCP socket", 0, false ) > -1 )
{
// GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error );
@@ -16116,7 +16116,7 @@ void KVpnc::readOutput_openvpn()
abort = true;
}
- else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, false ) > -1 )
{
// GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ) ) , GlobalConfig->error );
@@ -16140,20 +16140,20 @@ void KVpnc::readOutput_openvpn()
abort = true;
// managementhandler->closeConnection();
}
- else if ( ProcessMsg.find ( "TLS key negotiation failed to occur within 60 seconds", 0 , FALSE ) > -1 || ProcessMsg.find ( "TLS Error: TLS handshake failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "TLS key negotiation failed to occur within 60 seconds", 0 , false ) > -1 || ProcessMsg.find ( "TLS Error: TLS handshake failed", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "TLS key negotiation failed to occur within 60 seconds" ) );
GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error );
abort=true;
}
/*
- else if ( ProcessMsg.find( "authentication failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find( "authentication failed", 0 , false ) > -1 )
{
KMessageBox::error( this, i18n( "Authentication has been failed." ) );
abort = true;
}
*/
- else if ( ProcessMsg.find ( "Enter Private Key Password", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Enter Private Key Password", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -16216,7 +16216,7 @@ void KVpnc::readOutput_openvpn()
return ;
}
}
- else if ( ProcessMsg.find ( "Enter Auth Username", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Enter Auth Username", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "User name requested, send it...\n" ), GlobalConfig->debug );
@@ -16235,7 +16235,7 @@ void KVpnc::readOutput_openvpn()
return ;
}
- else if ( ProcessMsg.find ( "Enter Auth Password:", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Enter Auth Password:", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "User password requested, send it...\n" ), GlobalConfig->debug );
@@ -16253,48 +16253,48 @@ void KVpnc::readOutput_openvpn()
}
}
- else if ( ProcessMsg.find ( "Cannot resolve host address", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Cannot resolve host address", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Host could not be resolved." ) );
GlobalConfig->appendLogEntry ( i18n ( "Host could not be resolved." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "could not find module", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "could not find module", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Module not found." ) );
GlobalConfig->appendLogEntry ( i18n ( "Module not found." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Socket bind failed on local address", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Socket bind failed on local address", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Binding to socket on local address failed." ) );
GlobalConfig->appendLogEntry ( i18n ( "Binding to socket on local address failed." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "No route to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "No route to host", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "No route to host found." ) );
GlobalConfig->appendLogEntry ( i18n ( "No route to host found." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Connection terminated", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Connection terminated", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "Connection has been terminated." ) );
abort = true;
}
- else if ( ProcessMsg.find ( "Cannot open file key file", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Cannot open file key file", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Cannot open the preshared key file." ) );
GlobalConfig->appendLogEntry ( i18n ( "Cannot open the preshared key file." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Authenticate/Decrypt packet error: cipher final failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Authenticate/Decrypt packet error: cipher final failed", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Authentication has been failed because decryption failure. Please check OpenVPN settings." ) );
GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed because decryption failure. Please check OpenVPN settings." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , false ) > -1 )
{
TQString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
TQString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" );
@@ -16309,7 +16309,7 @@ void KVpnc::readOutput_openvpn()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , false ) > -1 )
{
// example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC'
TQString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" );
@@ -16325,7 +16325,7 @@ void KVpnc::readOutput_openvpn()
disconnectClicked();
connectClicked();
}
- else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]", 0 , false ) > -1 )
{
// KMessageBox::error( this, i18n( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ) );
// GlobalConfig->appendLogEntry( i18n( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ), GlobalConfig->error );
@@ -16333,81 +16333,81 @@ void KVpnc::readOutput_openvpn()
GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ), GlobalConfig->info );
abort = false;
}
- else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter" ) );
GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter" ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Options error: Parameter", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Options error: Parameter", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ) );
GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Options error: --auth-user-pass requires --pull", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Options error: --auth-user-pass requires --pull", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ) );
GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "TCP connection established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "TCP connection established", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[openvpn]: "+i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->info );
}
- else if ( ProcessMsg.find ( "UDP connection established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "UDP connection established", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[openvpn]: "+i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ),GlobalConfig->info );
}
- // else if ( ProcessMsg.find( "Options error", 0 , FALSE ) > -1 )
+ // else if ( ProcessMsg.find( "Options error", 0 , false ) > -1 )
// {
// KMessageBox::error( this, i18n( "OpenVPN configuration error." ) );
// GlobalConfig->appendLogEntry( i18n( "OpenVPN configuration error." ), GlobalConfig->error );
// GlobalConfig->currentProfile->setDoReconnectAfterConnectionLost( false );
// abort = true;
// }
- else if ( ProcessMsg.find ( "refused", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "refused", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Connection to OpenVPN server was refused." ) );
abort = false;
}
- else if ( ProcessMsg.find ( "Connection timed out", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Connection timed out", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection has been timed out. Terminate." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection has been timed out. Terminate." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Cannot load certificate file", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Cannot load certificate file", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Certificate file (%1) could not be load. Please check path of it." ).arg ( GlobalConfig->currentProfile->getX509Certificate() ) );
GlobalConfig->appendLogEntry ( i18n ( "Certificate file (%1) could not be load. Please check path of it." ).arg ( GlobalConfig->currentProfile->getX509Certificate() ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "ifconfig failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "ifconfig failed", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "ifconfig has been failed." ) );
GlobalConfig->appendLogEntry ( i18n ( "ifconfig has been failed." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Auth username is empty", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Auth username is empty", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Auth username is empty." ) );
GlobalConfig->appendLogEntry ( i18n ( "Auth username is empty." ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Cannot load private key file", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Cannot load private key file", 0 , false ) > -1 )
{
//KMessageBox::error( this, i18n( "Auth username is empty." ) );
GlobalConfig->appendLogEntry ( i18n ( "Private key file could not loaded!" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert SLOT", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert SLOT", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Need token to be insert. Please insert token in SLOT...." ) );
GlobalConfig->appendLogEntry ( i18n ( "Need token to be insert. Please insert token in SLOT...." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg.find ( "process exiting", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "process exiting", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "%1 is shutting down." ).arg ( "openvpn" ), GlobalConfig->debug );
@@ -16415,11 +16415,11 @@ void KVpnc::readOutput_openvpn()
connectionEnded();
setGuiStatus ( disconnected );
}
- else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, false ) > -1 )
{
connectSuccess = true;
}
- else if ( ProcessMsg.find ( "TUN/TAP device", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "TUN/TAP device", 0, false ) > -1 )
{
// TUN/TAP device tun0 opened
NetworkDevice = ProcessMsg.section ( ' ', -2, -2 ); // tun0
@@ -16433,7 +16433,7 @@ void KVpnc::readOutput_openvpn()
NetworkInterface iface ( GlobalConfig, parent );
TunnelInterfaceIP = iface.getInterfaceIP ( OpenvpnDevice );
}
- else if ( ProcessMsg.find ( "ifconfig ", 0, FALSE ) > -1 )
+ else if ( ProcessMsg.find ( "ifconfig ", 0, false ) > -1 )
{
TunnelInterfaceIP = ProcessMsg.section ( ' ', -4, -4 ); // ip
GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface IP: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug );
@@ -16451,7 +16451,7 @@ void KVpnc::readOutput_openvpn()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
@@ -16538,7 +16538,7 @@ void KVpnc::processStdout_l2tpd()
bool abort = false;
bool connectSuccess = false;
- if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , false ) > -1 )
{
bool kill_l2tpd=true;
@@ -16631,19 +16631,19 @@ void KVpnc::processStdout_l2tpd()
}
}
}
- else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error );
@@ -16821,7 +16821,7 @@ void KVpnc::processStdout_l2tpd()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -16883,46 +16883,46 @@ void KVpnc::processStderr_l2tpd()
// GlobalConfig->appendLogEntry ( TQString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , false ) > -1 )
{
ErrorMsg=true;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug );
// abort=true;
}
- else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , false ) > -1 )
{
NormalMsg=true;
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug );
// abort=true;
}
- else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , false ) > -1 )
{
ErrorMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) );
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , false ) > -1 )
{
ErrorMsg=true;
bool kill_l2tpd=true;
@@ -17017,13 +17017,13 @@ void KVpnc::processStderr_l2tpd()
}
}
// control_finish: Connection established to 192.168.10.222, 1701. Local: 55406, Remote: 37911.
- else if ( ProcessMsg_connect.find ( "Connection established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection established", 0 , false ) > -1 )
{
NormalMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
}
- else if ( ProcessMsg_connect.find ( "Call established", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Call established", 0 , false ) > -1 )
{
NormalMsg=true;
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info );
@@ -17037,22 +17037,22 @@ void KVpnc::processStderr_l2tpd()
disconnect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) );
connect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) );
- L2tpWaitForPppUpTimer.start ( 1000, FALSE );
+ L2tpWaitForPppUpTimer.start ( 1000, false );
}
- else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , false ) > -1 )
{
NormalMsg=true;
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "%1 is connecting to host %2..." ).arg ( "l2tpd" ).arg ( GlobalConfig->currentProfile->getGateway() ),GlobalConfig->debug );
}
- else if ( ProcessMsg_connect.find ( "Listening on IP address", 0 , FALSE ) > -1
- || ProcessMsg_connect.find ( "Calling on tunnel", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Listening on IP address", 0 , false ) > -1
+ || ProcessMsg_connect.find ( "Calling on tunnel", 0 , false ) > -1 )
{
NormalMsg=true;
abort = false;
}
- else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , FALSE ) > -1 )
+ else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , false ) > -1 )
{
NormalMsg=true;
// cid is greather than 0
@@ -17064,7 +17064,7 @@ void KVpnc::processStderr_l2tpd()
connectSuccess = true;
}
}
- else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success );
abort = false;
@@ -17085,7 +17085,7 @@ void KVpnc::processStderr_l2tpd()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -17280,16 +17280,16 @@ void KVpnc::readFromStdout_openl2tp()
}
else
{
- if ( ProcessMsg_connect.find ( "FUNC:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , FALSE ) < 0 )
+ if ( ProcessMsg_connect.find ( "FUNC:", 0 , false ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , false ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , false ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , false ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , false ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , false ) < 0 )
GlobalConfig->appendLogEntry ( "[openl2tp] " + ProcessMsg_connect, GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "address", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "address", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Got IP address" ), GlobalConfig->debug );
- if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "local", 0 , false ) > -1 )
{
TunnelInterfaceIP = ProcessMsg_connect.section ( ' ',4,4 );
if ( !TunnelInterfaceIP.isEmpty() )
@@ -17298,33 +17298,33 @@ void KVpnc::readFromStdout_openl2tp()
connectSuccess=true;
}
}
- else if ( ProcessMsg_connect.find ( "event ICRP_ACCEPT in state WAITREPLY", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "event ICRP_ACCEPT in state WAITREPLY", 0 , false ) > -1 )
{
// short before low level connection up
}
- else if ( ProcessMsg_connect.find ( "starting UNIX pppd", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "starting UNIX pppd", 0 , false ) > -1 )
{
// low level connection sure up
}
- else if ( ProcessMsg_connect.find ( "state change: WAITCTLREPLY --> ESTABLISHED", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "state change: WAITCTLREPLY --> ESTABLISHED", 0 , false ) > -1 )
{
// low level connection up
}
- else if ( ProcessMsg_connect.find ( "Using interface", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Using interface", 0 , false ) > -1 )
{
L2tpPppDevice = ProcessMsg_connect.section ( ' ',2,2 );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Tunnel device: %1\n" ).arg ( L2tpPppDevice ), GlobalConfig->debug );
}
- else if ( ProcessMsg_connect.find ( "authentication succeeded:", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "authentication succeeded:", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded." ), GlobalConfig->debug );
abort = false;
// connectSuccess=true;
}
- else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection has been terminated." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info );
@@ -17341,7 +17341,7 @@ void KVpnc::readFromStdout_openl2tp()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -17384,13 +17384,13 @@ void KVpnc::readFromStderr_openl2tp()
GlobalConfig->appendLogEntry ( "[openl2tp err] " + ProcessMsg_connect, GlobalConfig->error );
- if ( ProcessMsg_connect.find ( "parse error", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "parse error", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "openl2tpd" ) );
GlobalConfig->appendLogEntry ( i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "openl2tpd" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "File /var/run/openl2tpd.pid already exists", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "File /var/run/openl2tpd.pid already exists", 0 , false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Lock file of %1 still exists. Please remove it if %2 is not running." ).arg ( "openl2tpd" ).arg ( "openl2tpd" ) );
GlobalConfig->appendLogEntry ( i18n ( "Lock file of %1 still exists." ).arg ( "openl2tpd" ) , GlobalConfig->error );
@@ -17425,7 +17425,7 @@ void KVpnc::readFromStdout_startstopOpenl2tp()
}
else
{
- if ( ProcessMsg_connect.find ( "FUNC:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , FALSE ) < 0 )
+ if ( ProcessMsg_connect.find ( "FUNC:", 0 , false ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , false ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , false ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , false ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , false ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , false ) < 0 )
GlobalConfig->appendLogEntry ( "[openl2tp] " + ProcessMsg_connect, GlobalConfig->debug );
}
@@ -17483,19 +17483,19 @@ void KVpnc::readFromStdout_vtun()
/*
- if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 )
{
}*/
- if ( ProcessMsg_connect.find ( "Connection refused(111)",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Connection refused(111)",0,false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection refused." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection refused." ),GlobalConfig->error );
abort=true;
ErrorMsg=true;
}
- else if ( ProcessMsg_connect.find ( " Exit ",0,FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( " Exit ",0,false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "%1 has been exited." ),GlobalConfig->error );
abort=true;
@@ -17523,7 +17523,7 @@ void KVpnc::readFromStdout_vtun()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -17580,55 +17580,55 @@ void KVpnc::readFromStderr_vtun()
bool abort = false;
bool connectSuccess = false;
- if ( ProcessMsg_connect.find ( "Session ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "opened",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Session ",0,false ) > -1 && ProcessMsg_connect.find ( "opened",0,false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Session opened." ),GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "compression ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "compression ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Compression initialized." ),GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "UDP ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "UDP ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "UDP initialized." ),GlobalConfig->debug );
}
- if ( ProcessMsg_connect.find ( "encryption ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "encryption ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Encryption initialized." ),GlobalConfig->debug );
// FIXME only if encryption is activated (always!?)
- connectSuccess=TRUE;
+ connectSuccess=true;
}
- if ( ProcessMsg_connect.find ( "Connection refused(111)",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Connection refused(111)",0,false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Connection refused." ) );
GlobalConfig->appendLogEntry ( i18n ( "Connection refused." ),GlobalConfig->error );
abort=true;
ErrorMsg=true;
}
-// // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 )
+// // if ( ProcessMsg_connect.find(" Exit ",0,false) > -1 )
// // {
// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error);
// // abort=true;
// // ErrorMsg=true;
// // }
- if ( ProcessMsg_connect.find ( "Connection denied by ",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Connection denied by ",0,false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Connection denied. Password wrong?" ),GlobalConfig->error );
abort=true;
ErrorMsg=true;
}
- if ( ProcessMsg_connect.find ( "Connection closed by other side",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Connection closed by other side",0,false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "Connection was closed by the remote host. Please check your settings." ),GlobalConfig->error );
abort=true;
ErrorMsg=true;
}
- if ( ProcessMsg_connect.find ( "syntax error",0,FALSE ) > -1 || ProcessMsg_connect.find ( "No hosts defined",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "syntax error",0,false ) > -1 || ProcessMsg_connect.find ( "No hosts defined",0,false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) );
GlobalConfig->appendLogEntry ( i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ),GlobalConfig->error );
@@ -17636,7 +17636,7 @@ void KVpnc::readFromStderr_vtun()
ErrorMsg=true;
}
- if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( TQString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) );
GlobalConfig->appendLogEntry ( i18n ( "Can't allocate pseudo tty." ),GlobalConfig->error );
@@ -17644,7 +17644,7 @@ void KVpnc::readFromStderr_vtun()
ErrorMsg=true;
}
-// else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , FALSE ) > -1 )
+// else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , false ) > -1 )
// {
// NormalMsg=true;
// // cid is greather than 0
@@ -17670,7 +17670,7 @@ void KVpnc::readFromStderr_vtun()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
@@ -17738,48 +17738,48 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen )
bool abort = false;
bool connectSuccess=false;
- if ( ProcessMsg_connect.find ( "ssh_is_up", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "ssh_is_up", 0 , false ) > -1 )
{
GlobalConfig->appendLogEntry ( i18n ( "SSH tunnel is now up" ) , GlobalConfig->info );
connectSuccess=true;
}
- if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Remote host identification has changed!" ) ) ;
GlobalConfig->appendLogEntry ( i18n ( "Remote host identification has changed!" ) , GlobalConfig->error );
abort=false;
}
- else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Host key verification failed" ) );
GlobalConfig->appendLogEntry ( i18n ( "Host key verification failed" ) , GlobalConfig->error );
abort=true;
}
- else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( ": No route to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( ": No route to host", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , false ) > -1 )
{
ErrorMsg=false;
// KMessageBox::error ( this, i18n ( "Authentication succeeded" ) );
GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded" ) , GlobalConfig->info );
// abort = true;
}
- else if ( ProcessMsg_connect.find ( "Permission denied", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Permission denied", 0 , false ) > -1 )
{
ErrorMsg = true; timer.stop();
KMessageBox::error(this, i18n("Permission denied."));
@@ -17793,27 +17793,27 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen )
GlobalConfig->haveUserData = false;
connectClicked();
}
- else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Remote: Failed to open the tunnel device." ) );
GlobalConfig->appendLogEntry ( i18n ( "Remote: Failed to open the tunnel device." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Action administratively prohibited" ) );
GlobalConfig->appendLogEntry ( i18n ( "Action administratively prohibited" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Connection established.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection established.", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->info );
}
- else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "No more authentication methods to try." ) );
@@ -17839,7 +17839,7 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen )
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
connectSuccess = false;
@@ -18151,61 +18151,61 @@ void KVpnc::readFromStderr_ssh ( TDEProcess *, char *buffer, int buflen )
bool ErrorMsg = false;
bool abort = false;
- if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Remote host identification has changed!" ) ) ;
GlobalConfig->appendLogEntry ( i18n ( "Remote host identification has changed!" ) , GlobalConfig->error );
abort=false;
}
- else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Host key verification failed" ) );
GlobalConfig->appendLogEntry ( i18n ( "Host key verification failed" ) , GlobalConfig->error );
abort=true;
}
- else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( ": No route to host", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( ": No route to host", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , false ) > -1 )
{
ErrorMsg=false;
// KMessageBox::error ( this, i18n ( "Authentication succeeded" ) );
GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded" ) , GlobalConfig->info );
// abort = true;
}
- else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Remote: Failed to open the tunnel device." ) );
GlobalConfig->appendLogEntry ( i18n ( "Remote: Failed to open the tunnel device." ), GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "Action administratively prohibited" ) );
GlobalConfig->appendLogEntry ( i18n ( "Action administratively prohibited" ) , GlobalConfig->error );
abort = true;
}
- else if ( ProcessMsg_connect.find ( "Connection established.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Connection established.", 0 , false ) > -1 )
{
// KMessageBox::error ( this, i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) );
GlobalConfig->appendLogEntry ( i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->info );
}
- else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , false ) > -1 )
{
ErrorMsg=true;
KMessageBox::error ( this, i18n ( "No more authentication methods to try." ) );
@@ -18236,24 +18236,24 @@ void KVpnc::readFromStdout_ping()
//mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect );
- if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
KNotifyClient::event ( topLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
}
- else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
}
else
{
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Binding interface failed!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error );
}
- else if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Destination host is unreachable!" ) , GlobalConfig->error );
@@ -18272,22 +18272,22 @@ void KVpnc::readFromStderr_ping()
ProcessMsg_connect = TQString ( PingProcess->readStderr() );
//mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect );
- if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
}
- else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
+ else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
}
else
{
- if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Binding interface failed!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error );
}
- if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 )
+ if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 )
{
KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) );
GlobalConfig->appendLogEntry ( i18n ( "Destination host is unreachable!" ) , GlobalConfig->error );
@@ -18362,7 +18362,7 @@ void KVpnc::readFromStdout_connectionStatusCheck()
{
TQString msg = TQString ( ConnectionStatusCheckProcess->readStdout() );
- if ( msg.find ( "PING ok.", 0 , FALSE ) > -1 )
+ if ( msg.find ( "PING ok.", 0 , false ) > -1 )
{
/* Connection alive */
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -18377,7 +18377,7 @@ void KVpnc::readFromStdout_connectionStatusCheck()
}
}
}
- if ( msg.find ( "PING failed!", 0 , FALSE ) > -1 )
+ if ( msg.find ( "PING failed!", 0 , false ) > -1 )
{
/* Connection dead?! */
if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -18421,14 +18421,14 @@ void KVpnc::readFromStderr_connectionStatusCheck()
{
TQString msg = TQString ( ConnectionStatusCheckProcess->readStderr() );
- // if ( msg.find( "PING ok.", 0 , FALSE ) > -1 )
+ // if ( msg.find( "PING ok.", 0 , false ) > -1 )
// {
// /* Connection alive */
// if (GlobalConfig->KvpncDebugLevel > 0)
// GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug );
//
// }
- // if ( msg.find( "PING failed!", 0 , FALSE ) > -1 )
+ // if ( msg.find( "PING failed!", 0 , false ) > -1 )
// {
// /* Connection dead?! */
// if (GlobalConfig->KvpncDebugLevel > 0)
@@ -18543,14 +18543,14 @@ void KVpnc::readCiscoVpncTestProcessOutput()
if ( msg == "" )
return ;
- if ( msg.find ( "The VPN module is not loaded.", 0 , FALSE ) > -1 )
+ if ( msg.find ( "The VPN module is not loaded.", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Virtual interface of cisco client is not present" ), GlobalConfig->debug );
ciscoVpncRunning = false;
return;
}
- else if ( msg.find ( "cisco_ipsec", 0 , FALSE ) > -1 )
+ else if ( msg.find ( "cisco_ipsec", 0 , false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry ( i18n ( "Virtual interface of cisco client is present" ), GlobalConfig->debug );
@@ -18755,12 +18755,12 @@ void KVpnc::newSessionClicked()
profileAddedOrDeleted();
mw->SessionCombo->setCurrentText (newName );
- mw->SessionCombo->setEnabled ( TRUE );
- DeleteSessionAction->setEnabled ( TRUE );
- SaveSessionAction->setEnabled ( TRUE );
- ImportSessionAction->setEnabled ( TRUE );
- ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
+ DeleteSessionAction->setEnabled ( true );
+ SaveSessionAction->setEnabled ( true );
+ ImportSessionAction->setEnabled ( true );
+ ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
sessionToggled ( newdlg.getName() );
@@ -18783,8 +18783,8 @@ void KVpnc::newSessionClicked()
mw->SessionCombo->insertItem ( it->getName() );
}
GlobalConfig->currentProfile = GlobalConfig->AccountList->first();
- mw->SessionCombo->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
this->sessionToggled ( GlobalConfig->currentProfile->getName() );
}
@@ -18881,10 +18881,10 @@ void KVpnc::deleteSessionClicked()
if ( GlobalConfig->AccountList->isEmpty() )
{
GlobalConfig->currentProfile = 0L;
- mw->SessionCombo->setEnabled ( FALSE );
- ConnectAction->setEnabled ( FALSE );
- mw->buttonConnect->setEnabled ( FALSE );
- DeleteSessionAction->setEnabled ( FALSE );
+ mw->SessionCombo->setEnabled ( false );
+ ConnectAction->setEnabled ( false );
+ mw->buttonConnect->setEnabled ( false );
+ DeleteSessionAction->setEnabled ( false );
GlobalConfig->lastProfile = "";
}
else
@@ -18897,8 +18897,8 @@ void KVpnc::deleteSessionClicked()
}
GlobalConfig->currentProfile = GlobalConfig->AccountList->first();
GlobalConfig->lastProfile = GlobalConfig->AccountList->first()->getName();
- mw->SessionCombo->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
this->sessionToggled ( GlobalConfig->currentProfile->getName() );
}
@@ -18971,7 +18971,7 @@ void KVpnc::renameSessionClicked ()
GlobalConfig->removeEntry ( Oldname );
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
sessionToggled ( GlobalConfig->currentProfile->getName() );
@@ -18998,16 +18998,16 @@ void KVpnc::sessionToggled ( const TQString& Name )
// mw->DebugOutput->append( "sessionToggled" );
if ( Name.isEmpty() || GlobalConfig->AccountList->isEmpty() )
{
- this->DeleteSessionAction->setEnabled ( FALSE );
- // this->advancedSessionAction->setEnabled ( FALSE );
- this->SaveSessionAction->setEnabled ( FALSE );
+ this->DeleteSessionAction->setEnabled ( false );
+ // this->advancedSessionAction->setEnabled ( false );
+ this->SaveSessionAction->setEnabled ( false );
return;
}
else
{
- this->DeleteSessionAction->setEnabled ( TRUE );
- // this->advancedSessionAction->setEnabled ( TRUE );
- this->SaveSessionAction->setEnabled ( TRUE );
+ this->DeleteSessionAction->setEnabled ( true );
+ // this->advancedSessionAction->setEnabled ( true );
+ this->SaveSessionAction->setEnabled ( true );
VpnAccountData * it;
GlobalConfig->currentProfile = GlobalConfig->AccountList->first();
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
@@ -19034,7 +19034,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
TQString TunnelDeviceType=it->getTunnelDeviceType();
- this->ExportOpenvpnProfileAction->setEnabled ( FALSE );
+ this->ExportOpenvpnProfileAction->setEnabled ( false );
TQString type = ""; // visible name
TQString bin = ""; // executable name
@@ -19182,7 +19182,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
ProfileInfo += "<tr><td>"+i18n("Username:")+"</td><td>"+Username+"</td></tr>";
ProfileInfo += "<tr><td>"+i18n("Tunnel device type:")+"</td><td>"+TunnelDeviceType+"</td></tr>";
- this->ExportOpenvpnProfileAction->setEnabled ( TRUE );
+ this->ExportOpenvpnProfileAction->setEnabled ( true );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
@@ -19343,8 +19343,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
if ( !GlobalConfig->currentProfile->getUseSmartcard() )
{
// program is installed
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info );
@@ -19354,15 +19354,15 @@ void KVpnc::sessionToggled ( const TQString& Name )
{
if ( UseSmartcardOk == false )
{
- this->ConnectAction->setEnabled ( FALSE );
- mw->buttonConnect->setEnabled ( FALSE );
+ this->ConnectAction->setEnabled ( false );
+ mw->buttonConnect->setEnabled ( false );
GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info );
TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool");
@@ -19371,8 +19371,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
}
else
{
- this->ConnectAction->setEnabled ( FALSE );
- mw->buttonConnect->setEnabled ( FALSE );
+ this->ConnectAction->setEnabled ( false );
+ mw->buttonConnect->setEnabled ( false );
GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error );
TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin);
}
@@ -19402,8 +19402,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "l2tpd" ), KVpncConfig::info );
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( racoon_and_xl2tpd_available )
{
@@ -19413,8 +19413,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( racoon_and_l2tpd_available==false && racoon_and_xl2tpd_available==false )
{
@@ -19432,8 +19432,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
}
}
@@ -19474,8 +19474,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( ipsec_and_xl2tpd_available )
{
@@ -19485,8 +19485,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( ipsec_and_l2tpd_available==false && ipsec_and_xl2tpd_available==false )
{
@@ -19504,8 +19504,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( ipsec_and_openl2tp_available==false )
{
@@ -19520,15 +19520,15 @@ void KVpnc::sessionToggled ( const TQString& Name )
{
if ( UseSmartcardOk == false )
{
- this->ConnectAction->setEnabled ( FALSE );
- mw->buttonConnect->setEnabled ( FALSE );
+ this->ConnectAction->setEnabled ( false );
+ mw->buttonConnect->setEnabled ( false );
GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
}
else
{
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" );
@@ -19557,8 +19557,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::info );
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else
@@ -19586,8 +19586,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else if ( ssh_and_gnomeaskpass_available )
@@ -19598,8 +19598,8 @@ void KVpnc::sessionToggled ( const TQString& Name )
TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
}
else
@@ -20102,7 +20102,7 @@ void KVpnc::importKvpncSettingsClicked()
mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() );
}
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
mw->SessionCombo->setCurrentText ( RetName );
@@ -20189,7 +20189,7 @@ void KVpnc::importProfileClicked ( TQString file )
mw->SessionCombo->setCurrentText ( account->getName() );
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
sessionToggled ( account->getName() );
@@ -20299,7 +20299,7 @@ void KVpnc::importOpenvpnProfileClicked ( TQString file )
mw->SessionCombo->setCurrentText ( account->getName() );
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
sessionToggled ( account->getName() );
@@ -20358,7 +20358,7 @@ void KVpnc::importIpsecProfileClicked ()
mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() );
}
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
@@ -20397,7 +20397,7 @@ void KVpnc::importFritzboxProfileClicked ()
mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() );
}
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
@@ -20730,7 +20730,7 @@ void KVpnc::doRacoon()
// GlobalConfig->status = GlobalConfig->disconnected;
// timer.stop();
// connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) );
- // durationTimer.start( 1000, FALSE );
+ // durationTimer.start( 1000, false );
}
}
else
@@ -21205,7 +21205,7 @@ void KVpnc::vpncStarted()
// GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info );
//
// // connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) );
- // // timer.start( tryConnectTimeout * 1000, FALSE );
+ // // timer.start( tryConnectTimeout * 1000, false );
// //
// // mw->buttonConnect->setEnabled( false );
//
@@ -21335,7 +21335,7 @@ void KVpnc::racoonStarted()
// GlobalConfig->status = GlobalConfig->connected;
//
// connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) );
- // durationTimer.start( 1000, FALSE );
+ // durationTimer.start( 1000, false );
// setGuiStatus( connected );
//
// setFirewallAfterConnect();
@@ -21482,13 +21482,13 @@ void KVpnc::checkIpsecWhackStatus()
disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) );
// FIXME make connect timeout value in GUI available
- timer.start ( 2000 * 1000, FALSE );
+ timer.start ( 2000 * 1000, false );
}
if ( !IpsecWhackStatusTimer.isActive() )
{
disconnect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) );
connect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) );
- IpsecWhackStatusTimer.start ( 5 * 1000, FALSE );
+ IpsecWhackStatusTimer.start ( 5 * 1000, false );
}
}
}
@@ -21707,7 +21707,7 @@ void KVpnc::ipsecPhase2Established()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
@@ -22521,13 +22521,13 @@ void KVpnc::profileAddedOrDeleted()
if ( !GlobalConfig->AccountList->isEmpty() )
{
- this->DeleteSessionAction->setEnabled ( TRUE );
- // this->advancedSessionAction->setEnabled ( TRUE );
- this->SaveSessionAction->setEnabled ( TRUE );
- this->ImportSessionAction->setEnabled ( TRUE );
+ this->DeleteSessionAction->setEnabled ( true );
+ // this->advancedSessionAction->setEnabled ( true );
+ this->SaveSessionAction->setEnabled ( true );
+ this->ImportSessionAction->setEnabled ( true );
- this->ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ this->ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
mw->SessionCombo->clear();
QuickConnectMenu->clear();
@@ -22549,13 +22549,13 @@ void KVpnc::profileAddedOrDeleted()
}
else
{
- this->DeleteSessionAction->setEnabled ( FALSE );
- // this->advancedSessionAction->setEnabled ( FALSE );
- this->SaveSessionAction->setEnabled ( FALSE );
- this->ImportSessionAction->setEnabled ( TRUE );
+ this->DeleteSessionAction->setEnabled ( false );
+ // this->advancedSessionAction->setEnabled ( false );
+ this->SaveSessionAction->setEnabled ( false );
+ this->ImportSessionAction->setEnabled ( true );
- this->ConnectAction->setEnabled ( FALSE );
- mw->buttonConnect->setEnabled ( FALSE );
+ this->ConnectAction->setEnabled ( false );
+ mw->buttonConnect->setEnabled ( false );
}
}
@@ -23443,7 +23443,7 @@ void KVpnc::showNewProfileWizardClicked()
setProfile ( account->getName() );
if ( !mw->SessionCombo->isEnabled() )
- mw->SessionCombo->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
this->ConnectAction->setEnabled ( true );
mw->SessionCombo->setCurrentText ( account->getName() );
@@ -23458,12 +23458,12 @@ void KVpnc::showNewProfileWizardClicked()
// std::cout << "show profilemanager" << std::endl;
- mw->SessionCombo->setEnabled ( TRUE );
- DeleteSessionAction->setEnabled ( TRUE );
- SaveSessionAction->setEnabled ( TRUE );
- ImportSessionAction->setEnabled ( TRUE );
- ConnectAction->setEnabled ( TRUE );
- mw->buttonConnect->setEnabled ( TRUE );
+ mw->SessionCombo->setEnabled ( true );
+ DeleteSessionAction->setEnabled ( true );
+ SaveSessionAction->setEnabled ( true );
+ ImportSessionAction->setEnabled ( true );
+ ConnectAction->setEnabled ( true );
+ mw->buttonConnect->setEnabled ( true );
slotStatusMsg ( i18n ( "Profile \"%1\" added." ).arg ( mw->SessionCombo->currentText() ), ID_FLASH_MSG );
GlobalConfig->appendLogEntry ( i18n ( "Profile \"%1\" added." ).arg ( mw->SessionCombo->currentText() ) , GlobalConfig->info );
@@ -24597,7 +24597,7 @@ void KVpnc::checkL2tpPppUp()
disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) );
- durationTimer.start ( 1000, FALSE );
+ durationTimer.start ( 1000, false );
setGuiStatus ( connected );
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 3e48aa7..f075a62 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -154,10 +154,10 @@ KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar)
DebugBackgroundcolor=black;
ToolList = new TQPtrList<ToolInfo>();
- ToolList->setAutoDelete( TRUE );
+ ToolList->setAutoDelete( true );
AccountList = new TQPtrList<VpnAccountData>();
- AccountList->setAutoDelete( TRUE ); // the list owns the objects
+ AccountList->setAutoDelete( true ); // the list owns the objects
InfoLogColor=TQt::black;
ErrorLogColor=TQt::red;
@@ -459,7 +459,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
else
{
TmpAccountList = new TQPtrList<VpnAccountData>();
- TmpAccountList->setAutoDelete( TRUE ); // the list owns the objects
+ TmpAccountList->setAutoDelete( true ); // the list owns the objects
VpnAccountData *ProfileData;
for ( ProfileData = AccountList->first(); it; it = AccountList->next() )
@@ -1561,7 +1561,7 @@ bool KVpncConfig::exportKvpncConfig(TQString filename)
if( exportfile.open(IO_WriteOnly))
{
TQPtrList<VpnAccountData> *exportAccountList = new TQPtrList<VpnAccountData>();
- exportAccountList->setAutoDelete( TRUE ); // the list owns the objects
+ exportAccountList->setAutoDelete( true ); // the list owns the objects
KvpncImportProfileSelectionBase selectdlg;
VpnAccountData *it=NULL;
selectdlg.OpenProfileManagerCheckBox->hide();
@@ -2277,7 +2277,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
std::cout << "profiles tag found." << std::endl;
ImportedAccountList = new TQPtrList<VpnAccountData>();
- ImportedAccountList->setAutoDelete( TRUE ); // the list owns the objects
+ ImportedAccountList->setAutoDelete( true ); // the list owns the objects
TQDomNodeList profiles_subnodes = n.toElement().childNodes();
for (int i=0;i<=(int)profiles_subnodes.count();i++)
@@ -2788,7 +2788,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
return false;
}
TQPtrList<VpnAccountData> *ImportedAccountList = new TQPtrList<VpnAccountData>();
- ImportedAccountList->setAutoDelete( TRUE ); // the list owns the objects
+ ImportedAccountList->setAutoDelete( true ); // the list owns the objects
TQPtrList<IpsecImportSection> *IpsecImportSectionList = new TQPtrList<IpsecImportSection>();
bool isIpsecGlobalSection=false;
@@ -3382,7 +3382,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
validLineFound=true;
TQString Authby=line2.simplifyWhiteSpace().section ( "authby=",1,1 );
// std::cout << "left and right use certs " << std::endl;
- if ( Authby.find ( "rsasig", 0 , FALSE ) > -1 )
+ if ( Authby.find ( "rsasig", 0 , false ) > -1 )
{
if ( KvpncDebugLevel > 2 )
appendLogEntry ( i18n ( "import ipsec config: left and right use certs." ) ,debug );
@@ -3391,7 +3391,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool&
//profiledata->setPskIsInFile ( true );
//profiledata->setPrivateKey ( "/etc/ipsec.secrets" );
}
- else if ( Authby.find ( "secret", 0 , FALSE ) > -1 )
+ else if ( Authby.find ( "secret", 0 , false ) > -1 )
{
if ( KvpncDebugLevel > 2 )
appendLogEntry ( i18n ( "import ipsec config: left and right use psk." ) ,debug );
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index f5ab16f..8bfb17b 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -194,26 +194,26 @@ void LogViewerDialog::showLogPart(int start,int count, bool parseLogType)
{
if (parseLogType)
{
- if (line.find(i18n("Info:"),0, FALSE) > -1 )
+ if (line.find(i18n("Info:"),0, false) > -1 )
{
type = KVpncConfig::info;
}
- else if (line.find(i18n("Debug:"),0, FALSE) > -1 )
+ else if (line.find(i18n("Debug:"),0, false) > -1 )
{
type = KVpncConfig::debug;
}
// else
- // if (line.find("remote",0, FALSE) > -1 )
+ // if (line.find("remote",0, false) > -1 )
// {
// type = KVpncConfig::remote;
// }
else
- if (line.find(i18n("Error:"),0, FALSE) > -1 )
+ if (line.find(i18n("Error:"),0, false) > -1 )
{
type = KVpncConfig::error;
}
// else
- // if (line.find("success",0, FALSE) > -1 )
+ // if (line.find("success",0, false) > -1 )
// {
// type = KVpncConfig::success;
// }
diff --git a/src/mainview.h b/src/mainview.h
index d006dd9..2f71a0e 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -36,7 +36,7 @@
class MainView : public MainViewBase {
public:
- MainView( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ MainView( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
~MainView();
DebugOutputTextEdit *DebugOutput;
diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp
index 4161416..f380774 100644
--- a/src/manageciscocert.cpp
+++ b/src/manageciscocert.cpp
@@ -331,7 +331,7 @@ void ManageCiscoCert::readFromStdout_display()
CertDataList.append(line);
else
{
- if ( line.find ( "Common Name:" , 0, FALSE ) > -1)
+ if ( line.find ( "Common Name:" , 0, false ) > -1)
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp
index 8196312..e4c5e41 100644
--- a/src/networkinterface.cpp
+++ b/src/networkinterface.cpp
@@ -43,7 +43,7 @@ NetworkInterface::NetworkInterface( KVpncConfig* GlobalConfig,TQApplication *app
interfaceTest = false;
retrieveInterfaceAddress = false;
TQPtrList<TQString>*InterfaceList = new TQPtrList<TQString>();
- InterfaceList->setAutoDelete( TRUE ); // the list owns the objects
+ InterfaceList->setAutoDelete( true ); // the list owns the objects
TQString InterfaceIP = "";
TQString InterfaceAddress = "";
IPforInterface = "";
@@ -477,7 +477,7 @@ void NetworkInterface::readFromStdout()
if ( interfaceTest )
{
- if ( line.find( "proto", 0 , FALSE ) != -1 )
+ if ( line.find( "proto", 0 , false ) != -1 )
{
interfaceExists = true;
interfaceTest = false;
@@ -536,7 +536,7 @@ void NetworkInterface::readFromStdout_interfaceip()
TQString line = InterfaceIpProc->readLineStdout() ;
// TQString line = TQString(InterfaceIpProc->readStdout());
- if (line.find( "inet ", 0 , FALSE ) != -1 )
+ if (line.find( "inet ", 0 , false ) != -1 )
{
InterfaceIP = line.simplifyWhiteSpace().section(' ', 1,1).section('/',0,0); // inet 192.168.10.100/24 brd 192.168.10.255 scope global
diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp
index 9c17bf8..2f62954 100644
--- a/src/newprofiledialog.cpp
+++ b/src/newprofiledialog.cpp
@@ -61,7 +61,7 @@ NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const T
connect( main->ImportPcfProfilePushButton , TQ_SIGNAL( clicked () ), this, TQ_SLOT( importPcfFileClicked() ) );
connect( main->GroupPasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( groupPasswordContentChanged() ) );
connect( main->PasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( passwordContentChanged() ) );
- newProfileCreated = FALSE;
+ newProfileCreated = false;
Name = "";
// currently static for new profile
@@ -133,7 +133,7 @@ NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const T
{
main->NetworkDeviceComboBox->insertItem( TQString( *it ) );
}
- main->NetworkDeviceComboBox->setEnabled( TRUE );
+ main->NetworkDeviceComboBox->setEnabled( true );
main->NetworkDeviceComboBox->setCurrentText( "default" );
main->certpathURLRequester->setURL( "/etc/racoon/certs" );
@@ -157,7 +157,7 @@ NewProfileDialog::~NewProfileDialog()
void NewProfileDialog::accept()
{
- bool canSave = TRUE;
+ bool canSave = true;
if ( main->ConnectionTypeComboBox->currentItem() == 0 ) {
profileData->setConnectionType( VpnAccountData::cisco );
UdpPort=10000;
@@ -192,7 +192,7 @@ void NewProfileDialog::accept()
else
profileData->setConnectionType( VpnAccountData::other );
- bool validAddr = TRUE;
+ bool validAddr = true;
if ( profileData->getConnectionType() != VpnAccountData::cisco && profileData->getConnectionType() != VpnAccountData::openvpn )
{
@@ -200,7 +200,7 @@ void NewProfileDialog::accept()
{
KMessageBox::error ( this, i18n( "No IP address for remote network entered!" ), i18n( "No IP Address" ) );
GlobalConfig->appendLogEntry( i18n( "No IP address for remote network entered!" ),GlobalConfig->error);
- validAddr = canSave = FALSE;
+ validAddr = canSave = false;
}
else
{
@@ -210,7 +210,7 @@ void NewProfileDialog::accept()
KMessageBox::error ( this, i18n( "IP address of remote network is not valid!" ), i18n( "Invalid IP Address" ) );
GlobalConfig->appendLogEntry( i18n( "IP address of remote network not valid!" ) ,GlobalConfig->error);
- validAddr = canSave = FALSE;
+ validAddr = canSave = false;
}
if ( validAddr )
{
@@ -260,7 +260,7 @@ void NewProfileDialog::accept()
if ( canSave )
{
- bool nameOk = TRUE;
+ bool nameOk = true;
Name = main->ProfileLineEdit->text();
if (Name.contains(' '))
@@ -268,7 +268,7 @@ void NewProfileDialog::accept()
KMessageBox::error ( this, i18n( "Profile name can not contain spaces!" ), i18n( "Spaces Not Allowed" ) );
GlobalConfig->appendLogEntry( i18n( "Profile name can not contain spaces!" ) ,GlobalConfig->error);
- nameOk = FALSE;
+ nameOk = false;
}
if (Name.isEmpty())
@@ -276,7 +276,7 @@ void NewProfileDialog::accept()
KMessageBox::error ( this, i18n( "Profile name can not be empty!" ), i18n( "No Name Entered" ) );
GlobalConfig->appendLogEntry( i18n( "Profile name can not be empty!" ) ,GlobalConfig->error);
- nameOk = FALSE;
+ nameOk = false;
}
VpnAccountData * it;
@@ -287,7 +287,7 @@ void NewProfileDialog::accept()
KMessageBox::error ( this, i18n( "Profile name already exists!" ), i18n( "Name Already Exists" ) );
GlobalConfig->appendLogEntry(i18n( "Profile name already exists!" ) ,GlobalConfig->error);
- nameOk = FALSE;
+ nameOk = false;
break;
}
}
@@ -296,7 +296,7 @@ void NewProfileDialog::accept()
{
profileData->setName(Name);
GlobalConfig->AccountList->append( profileData );
- newProfileCreated = TRUE;
+ newProfileCreated = true;
TQDialog::accept();
}
@@ -317,8 +317,8 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
{
// First we should set a type
- //buttonOk->setEnabled( FALSE );
- main->AdvancedSettingsPushButton->setEnabled( FALSE );
+ //buttonOk->setEnabled( false );
+ main->AdvancedSettingsPushButton->setEnabled( false );
int item = main->ConnectionTypeComboBox->currentItem();
@@ -330,41 +330,41 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
profileData->setConnectionType( VpnAccountData::cisco );
- main->CheckGroupPass->setEnabled( TRUE );
- main->CheckUserPass->setEnabled( TRUE );
+ main->CheckGroupPass->setEnabled( true );
+ main->CheckUserPass->setEnabled( true );
- main->IDLineEdit->setEnabled( TRUE );
- main->LabelID->setEnabled( TRUE );
+ main->IDLineEdit->setEnabled( true );
+ main->LabelID->setEnabled( true );
- main->UsernameLineEdit->setEnabled( TRUE );
- main->LabelUsername->setEnabled( TRUE );
+ main->UsernameLineEdit->setEnabled( true );
+ main->LabelUsername->setEnabled( true );
- main->PasswordEdit->setEnabled( TRUE );
- main->LabelPassword->setEnabled( TRUE );
+ main->PasswordEdit->setEnabled( true );
+ main->LabelPassword->setEnabled( true );
- main->AdvancedSettingsPushButton->setEnabled( TRUE );
+ main->AdvancedSettingsPushButton->setEnabled( true );
- main->x509certURLRequester->setEnabled( FALSE );
- main->LabelCertificate->setEnabled( FALSE );
+ main->x509certURLRequester->setEnabled( false );
+ main->LabelCertificate->setEnabled( false );
- main->certpathURLRequester->setEnabled( FALSE );
- main->LabelCertificatePath->setEnabled( FALSE );
+ main->certpathURLRequester->setEnabled( false );
+ main->LabelCertificatePath->setEnabled( false );
- main->NetworkDeviceComboBox->setEnabled( FALSE );
- main->LabelNetworkDevice->setEnabled( FALSE );
- main->AuthTypeComboBox->setEnabled( FALSE );
- main->LabelAuthType->setEnabled( FALSE );
+ main->NetworkDeviceComboBox->setEnabled( false );
+ main->LabelNetworkDevice->setEnabled( false );
+ main->AuthTypeComboBox->setEnabled( false );
+ main->LabelAuthType->setEnabled( false );
- main->PSKLineEdit->setEnabled( FALSE );
- main->LabelPsk->setEnabled( FALSE );
+ main->PSKLineEdit->setEnabled( false );
+ main->LabelPsk->setEnabled( false );
- //buttonCancel->setEnabled( TRUE );
- //buttonOk->setEnabled( TRUE );
+ //buttonCancel->setEnabled( true );
+ //buttonOk->setEnabled( true );
- main->RemoteNetAddrLineEdit->setEnabled( FALSE );
- main->LabelRemoteNetwork->setEnabled( FALSE );
+ main->RemoteNetAddrLineEdit->setEnabled( false );
+ main->LabelRemoteNetwork->setEnabled( false );
- main->RemoteNetMaskComboBox->setEnabled( FALSE );
+ main->RemoteNetMaskComboBox->setEnabled( false );
} // vpnc
@@ -380,44 +380,44 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
profileData->setConnectionType( VpnAccountData::racoon );
- main->x509certURLRequester->setEnabled( TRUE );
- main->LabelCertificate->setEnabled( TRUE );
+ main->x509certURLRequester->setEnabled( true );
+ main->LabelCertificate->setEnabled( true );
- main->certpathURLRequester->setEnabled( TRUE );
- main->LabelCertificatePath->setEnabled( TRUE );
+ main->certpathURLRequester->setEnabled( true );
+ main->LabelCertificatePath->setEnabled( true );
- main->NetworkDeviceComboBox->setEnabled ( TRUE );
- main->LabelNetworkDevice->setEnabled( TRUE );
+ main->NetworkDeviceComboBox->setEnabled ( true );
+ main->LabelNetworkDevice->setEnabled( true );
- main->AuthTypeComboBox->setEnabled( TRUE );
- main->LabelAuthType->setEnabled( TRUE );
+ main->AuthTypeComboBox->setEnabled( true );
+ main->LabelAuthType->setEnabled( true );
- main->PSKLineEdit->setEnabled( TRUE );
- main->LabelPsk->setEnabled( TRUE );
+ main->PSKLineEdit->setEnabled( true );
+ main->LabelPsk->setEnabled( true );
- main->RemoteNetAddrLineEdit->setEnabled( TRUE );
- main->LabelRemoteNetwork->setEnabled( TRUE );
+ main->RemoteNetAddrLineEdit->setEnabled( true );
+ main->LabelRemoteNetwork->setEnabled( true );
- main->RemoteNetMaskComboBox->setEnabled( TRUE );
+ main->RemoteNetMaskComboBox->setEnabled( true );
- main->PasswordEdit->setEnabled( FALSE );
- main->LabelPassword->setEnabled( FALSE );
+ main->PasswordEdit->setEnabled( false );
+ main->LabelPassword->setEnabled( false );
- main->CheckGroupPass->setEnabled( FALSE );
- main->CheckUserPass->setEnabled( FALSE );
+ main->CheckGroupPass->setEnabled( false );
+ main->CheckUserPass->setEnabled( false );
- main->IDLineEdit->setEnabled( FALSE );
- main->LabelID->setEnabled( FALSE );
+ main->IDLineEdit->setEnabled( false );
+ main->LabelID->setEnabled( false );
- main->UsernameLineEdit->setEnabled( FALSE );
- main->LabelUsername->setEnabled( FALSE );
+ main->UsernameLineEdit->setEnabled( false );
+ main->LabelUsername->setEnabled( false );
- main->GroupPasswordEdit->setEnabled( FALSE );
- main->LabelGroupPassword->setEnabled( FALSE );
+ main->GroupPasswordEdit->setEnabled( false );
+ main->LabelGroupPassword->setEnabled( false );
- //buttonCancel->setEnabled( TRUE );
- //buttonOk->setEnabled( TRUE );
- main->AdvancedSettingsPushButton->setEnabled( TRUE );
+ //buttonCancel->setEnabled( true );
+ //buttonOk->setEnabled( true );
+ main->AdvancedSettingsPushButton->setEnabled( true );
} // racoon
else if ( item == VpnAccountData::ConnectionType(VpnAccountData::freeswan) )
@@ -432,44 +432,44 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
profileData->setConnectionType( VpnAccountData::freeswan );
- main->x509certURLRequester->setEnabled( TRUE );
- main->LabelCertificate->setEnabled( TRUE );
+ main->x509certURLRequester->setEnabled( true );
+ main->LabelCertificate->setEnabled( true );
- main->certpathURLRequester->setEnabled( TRUE );
- main->LabelCertificatePath->setEnabled( TRUE );
+ main->certpathURLRequester->setEnabled( true );
+ main->LabelCertificatePath->setEnabled( true );
- main->NetworkDeviceComboBox->setEnabled ( TRUE );
- main->LabelNetworkDevice->setEnabled( TRUE );
+ main->NetworkDeviceComboBox->setEnabled ( true );
+ main->LabelNetworkDevice->setEnabled( true );
- main->AuthTypeComboBox->setEnabled( TRUE );
- main->LabelAuthType->setEnabled( TRUE );
+ main->AuthTypeComboBox->setEnabled( true );
+ main->LabelAuthType->setEnabled( true );
- main->PSKLineEdit->setEnabled( TRUE );
- main->LabelPsk->setEnabled( TRUE );
+ main->PSKLineEdit->setEnabled( true );
+ main->LabelPsk->setEnabled( true );
- main->RemoteNetAddrLineEdit->setEnabled( TRUE );
- main->LabelRemoteNetwork->setEnabled( TRUE );
+ main->RemoteNetAddrLineEdit->setEnabled( true );
+ main->LabelRemoteNetwork->setEnabled( true );
- main->RemoteNetMaskComboBox->setEnabled( TRUE );
+ main->RemoteNetMaskComboBox->setEnabled( true );
- main->CheckGroupPass->setEnabled( FALSE );
- main->CheckUserPass->setEnabled( FALSE );
+ main->CheckGroupPass->setEnabled( false );
+ main->CheckUserPass->setEnabled( false );
- main->IDLineEdit->setEnabled( FALSE );
- main->LabelID->setEnabled( FALSE );
+ main->IDLineEdit->setEnabled( false );
+ main->LabelID->setEnabled( false );
- main->PasswordEdit->setEnabled( FALSE );
- main->LabelPassword->setEnabled( FALSE );
+ main->PasswordEdit->setEnabled( false );
+ main->LabelPassword->setEnabled( false );
- main->UsernameLineEdit->setEnabled( FALSE );
- main->LabelUsername->setEnabled( FALSE );
+ main->UsernameLineEdit->setEnabled( false );
+ main->LabelUsername->setEnabled( false );
- main->GroupPasswordEdit->setEnabled( FALSE );
- main->LabelGroupPassword->setEnabled( FALSE );
+ main->GroupPasswordEdit->setEnabled( false );
+ main->LabelGroupPassword->setEnabled( false );
- // buttonCancel->setEnabled( TRUE );
- // buttonOk->setEnabled( TRUE );
- main->AdvancedSettingsPushButton->setEnabled( TRUE );
+ // buttonCancel->setEnabled( true );
+ // buttonOk->setEnabled( true );
+ main->AdvancedSettingsPushButton->setEnabled( true );
} // freeswan
else if ( item == VpnAccountData::ConnectionType(VpnAccountData::pptp) )
@@ -484,44 +484,44 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
profileData->setConnectionType( VpnAccountData::pptp );
- main->x509certURLRequester->setEnabled( FALSE );
- main->LabelCertificate->setEnabled( FALSE );
+ main->x509certURLRequester->setEnabled( false );
+ main->LabelCertificate->setEnabled( false );
- main->certpathURLRequester->setEnabled( FALSE );
- main->LabelCertificatePath->setEnabled( FALSE );
+ main->certpathURLRequester->setEnabled( false );
+ main->LabelCertificatePath->setEnabled( false );
- main->NetworkDeviceComboBox->setEnabled ( FALSE );
- main->LabelNetworkDevice->setEnabled( FALSE );
+ main->NetworkDeviceComboBox->setEnabled ( false );
+ main->LabelNetworkDevice->setEnabled( false );
- main->AuthTypeComboBox->setEnabled( FALSE );
- main->LabelAuthType->setEnabled( FALSE );
+ main->AuthTypeComboBox->setEnabled( false );
+ main->LabelAuthType->setEnabled( false );
- main->PSKLineEdit->setEnabled( FALSE );
- main->LabelPsk->setEnabled( FALSE );
+ main->PSKLineEdit->setEnabled( false );
+ main->LabelPsk->setEnabled( false );
- main->RemoteNetAddrLineEdit->setEnabled( TRUE );
- main->LabelRemoteNetwork->setEnabled( TRUE );
+ main->RemoteNetAddrLineEdit->setEnabled( true );
+ main->LabelRemoteNetwork->setEnabled( true );
- main->RemoteNetMaskComboBox->setEnabled( TRUE );
+ main->RemoteNetMaskComboBox->setEnabled( true );
- main->CheckGroupPass->setEnabled( FALSE );
- main->CheckUserPass->setEnabled( TRUE );
+ main->CheckGroupPass->setEnabled( false );
+ main->CheckUserPass->setEnabled( true );
- main->IDLineEdit->setEnabled( FALSE );
- main->LabelID->setEnabled( FALSE );
+ main->IDLineEdit->setEnabled( false );
+ main->LabelID->setEnabled( false );
- main->PasswordEdit->setEnabled( TRUE );
- main->LabelPassword->setEnabled( TRUE );
+ main->PasswordEdit->setEnabled( true );
+ main->LabelPassword->setEnabled( true );
- main->UsernameLineEdit->setEnabled( TRUE );
- main->LabelUsername->setEnabled( TRUE );
+ main->UsernameLineEdit->setEnabled( true );
+ main->LabelUsername->setEnabled( true );
- main->GroupPasswordEdit->setEnabled( FALSE );
- main->LabelGroupPassword->setEnabled( FALSE );
+ main->GroupPasswordEdit->setEnabled( false );
+ main->LabelGroupPassword->setEnabled( false );
- //buttonCancel->setEnabled( TRUE );
- //buttonOk->setEnabled( TRUE );
- main->AdvancedSettingsPushButton->setEnabled( TRUE );
+ //buttonCancel->setEnabled( true );
+ //buttonOk->setEnabled( true );
+ main->AdvancedSettingsPushButton->setEnabled( true );
} // pptp
else if ( item == VpnAccountData::ConnectionType(VpnAccountData::openvpn) )
{
@@ -534,45 +534,45 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
profileData->setConnectionType( VpnAccountData::openvpn );
- main->x509certURLRequester->setEnabled( TRUE );
- main->LabelCertificate->setEnabled( TRUE );
+ main->x509certURLRequester->setEnabled( true );
+ main->LabelCertificate->setEnabled( true );
- main->certpathURLRequester->setEnabled( TRUE );
- main->LabelCertificatePath->setEnabled( TRUE );
+ main->certpathURLRequester->setEnabled( true );
+ main->LabelCertificatePath->setEnabled( true );
- main->NetworkDeviceComboBox->setEnabled ( TRUE );
- main->LabelNetworkDevice->setEnabled( TRUE );
+ main->NetworkDeviceComboBox->setEnabled ( true );
+ main->LabelNetworkDevice->setEnabled( true );
- main->AuthTypeComboBox->setEnabled( TRUE );
- main->LabelAuthType->setEnabled( TRUE );
+ main->AuthTypeComboBox->setEnabled( true );
+ main->LabelAuthType->setEnabled( true );
- main->PSKLineEdit->setEnabled( TRUE );
- main->LabelPsk->setEnabled( TRUE );
+ main->PSKLineEdit->setEnabled( true );
+ main->LabelPsk->setEnabled( true );
- main->RemoteNetAddrLineEdit->setEnabled( FALSE );
- main->LabelRemoteNetwork->setEnabled( FALSE );
+ main->RemoteNetAddrLineEdit->setEnabled( false );
+ main->LabelRemoteNetwork->setEnabled( false );
- main->RemoteNetMaskComboBox->setEnabled( TRUE );
+ main->RemoteNetMaskComboBox->setEnabled( true );
- main->PasswordEdit->setEnabled( FALSE );
- main->LabelPassword->setEnabled( FALSE );
+ main->PasswordEdit->setEnabled( false );
+ main->LabelPassword->setEnabled( false );
- main->CheckGroupPass->setEnabled( FALSE );
- main->CheckUserPass->setEnabled( FALSE );
+ main->CheckGroupPass->setEnabled( false );
+ main->CheckUserPass->setEnabled( false );
- main->IDLineEdit->setEnabled( FALSE );
- main->LabelID->setEnabled( FALSE );
+ main->IDLineEdit->setEnabled( false );
+ main->LabelID->setEnabled( false );
- main->UsernameLineEdit->setEnabled( FALSE );
- main->LabelUsername->setEnabled( FALSE );
+ main->UsernameLineEdit->setEnabled( false );
+ main->LabelUsername->setEnabled( false );
- main->GroupPasswordEdit->setEnabled( FALSE );
- main->LabelGroupPassword->setEnabled( FALSE );
+ main->GroupPasswordEdit->setEnabled( false );
+ main->LabelGroupPassword->setEnabled( false );
- //buttonCancel->setEnabled( TRUE );
- //buttonOk->setEnabled( TRUE );
- main->AdvancedSettingsPushButton->setEnabled( TRUE );
+ //buttonCancel->setEnabled( true );
+ //buttonOk->setEnabled( true );
+ main->AdvancedSettingsPushButton->setEnabled( true );
} // openvpn
// other
@@ -581,17 +581,17 @@ void NewProfileDialog::connectiontypeChanged( const TQString& )
if (GlobalConfig->KvpncDebugLevel > 0)
GlobalConfig->appendLogEntry( "new type: other",GlobalConfig->debug );
- // main->x509certURLRequester->setEnabled( FALSE );
- // main->AuthTypeComboBox->setEnabled( FALSE );
- // main->PSKLineEdit->setEnabled( FALSE );
+ // main->x509certURLRequester->setEnabled( false );
+ // main->AuthTypeComboBox->setEnabled( false );
+ // main->PSKLineEdit->setEnabled( false );
//
- // main->CheckGroupPass->setEnabled( FALSE );
- // main->CheckUserPass->setEnabled( FALSE );
- // main->IDLineEdit->setEnabled( FALSE );
- // main->UsernameLineEdit->setEnabled( FALSE );
- // main->AdvancedSettingsPushButton->setEnabled( FALSE );
- // buttonCancel->setEnabled( FALSE );
- //buttonOk->setEnabled( FALSE );
+ // main->CheckGroupPass->setEnabled( false );
+ // main->CheckUserPass->setEnabled( false );
+ // main->IDLineEdit->setEnabled( false );
+ // main->UsernameLineEdit->setEnabled( false );
+ // main->AdvancedSettingsPushButton->setEnabled( false );
+ // buttonCancel->setEnabled( false );
+ //buttonOk->setEnabled( false );
}
}
@@ -600,26 +600,26 @@ void NewProfileDialog::authTypeChanged( const TQString& )
if ( main->AuthTypeComboBox->currentItem() == VpnAccountData::AuthenticationType(VpnAccountData::cert ))
{
// certificate
- main->PSKLineEdit->setEnabled( FALSE );
- main->LabelPsk->setEnabled( FALSE );
+ main->PSKLineEdit->setEnabled( false );
+ main->LabelPsk->setEnabled( false );
- main->x509certURLRequester->setEnabled( TRUE );
- main->LabelCertificate->setEnabled( TRUE );
+ main->x509certURLRequester->setEnabled( true );
+ main->LabelCertificate->setEnabled( true );
- main->certpathURLRequester->setEnabled( TRUE );
- main->LabelCertificatePath->setEnabled( TRUE );
+ main->certpathURLRequester->setEnabled( true );
+ main->LabelCertificatePath->setEnabled( true );
}
if ( main->AuthTypeComboBox->currentItem() == VpnAccountData::AuthenticationType(VpnAccountData::psk ))
{
// psk
- main->PSKLineEdit->setEnabled( TRUE );
- main->LabelPsk->setEnabled( TRUE );
+ main->PSKLineEdit->setEnabled( true );
+ main->LabelPsk->setEnabled( true );
- main->x509certURLRequester->setEnabled( FALSE );
- main->LabelCertificate->setEnabled( FALSE );
+ main->x509certURLRequester->setEnabled( false );
+ main->LabelCertificate->setEnabled( false );
- main->certpathURLRequester->setEnabled( FALSE );
- main->LabelCertificatePath->setEnabled( FALSE );
+ main->certpathURLRequester->setEnabled( false );
+ main->LabelCertificatePath->setEnabled( false );
}
}
@@ -633,9 +633,9 @@ void NewProfileDialog::profileNameChanged( const TQString& )
{
// LogOutput->append ( "text changed!" );
// if ( main->ProfileLineEdit->text().isEmpty() )
- // buttonOk->setEnabled( FALSE );
+ // buttonOk->setEnabled( false );
// else
- // buttonOk->setEnabled( TRUE );
+ // buttonOk->setEnabled( true );
}
TQString NewProfileDialog::getName()
diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp
index 8511b7e..74bb3fb 100644
--- a/src/newprofilewizard.cpp
+++ b/src/newprofilewizard.cpp
@@ -774,7 +774,7 @@ void NewProfileWizard::next ()
KMessageBox::error ( this, i18n ( "Profile name can not contain spaces!" ), i18n ( "Spaces Not Allowed" ) );
GlobalConfig->appendLogEntry ( i18n ( "Profile name can not contain spaces!" ) , GlobalConfig->error );
msg += "- " + i18n ( "Name" ) + "\n";
- nameOk = FALSE;
+ nameOk = false;
ok = false;
}
@@ -783,7 +783,7 @@ void NewProfileWizard::next ()
KMessageBox::error ( this, i18n ( "Profile name can not be empty!" ), i18n ( "No Name Entered" ) );
GlobalConfig->appendLogEntry ( i18n ( "Profile name can not be empty!" ) , GlobalConfig->error );
msg += "- " + i18n ( "Name" ) + "\n";
- nameOk = FALSE;
+ nameOk = false;
ok = false;
}
@@ -819,7 +819,7 @@ void NewProfileWizard::next ()
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Profile name: %1" ).arg ( profileData->getName() ), KVpncConfig::debug );
- newProfileCreated = TRUE;
+ newProfileCreated = true;
}
else
{
@@ -3168,7 +3168,7 @@ void NewProfileWizard::showPage ( TQWidget* page )
if ( page == endpage )
{
- finishButton() ->setEnabled ( TRUE );
+ finishButton() ->setEnabled ( true );
finishButton() ->setFocus();
}
}
@@ -3178,9 +3178,9 @@ void NewProfileWizard::dataChanged ( const TQString & )
// if ( !firstName->text().isEmpty() &&
// !lastName->text().isEmpty() &&
// !email->text().isEmpty() )
- // nextButton()->setEnabled( TRUE );
+ // nextButton()->setEnabled( true );
// else
- // nextButton()->setEnabled( FALSE );
+ // nextButton()->setEnabled( false );
}
void NewProfileWizard::userdefinedOpenvpnPortToggeled ( bool )
@@ -3203,17 +3203,17 @@ void NewProfileWizard::pskIsInFileToggled ( bool )
{
if ( newprofilewizardpskcontent->PskInFileCheckBox->isChecked() )
{
- newprofilewizardpskcontent->LabelPskFile->setEnabled ( TRUE );
- newprofilewizardpskcontent->PSKFileURLRequester->setEnabled ( TRUE );
- newprofilewizardpskcontent->LabelPsk->setEnabled ( FALSE );
- newprofilewizardpskcontent->PSKLineEdit->setEnabled ( FALSE );
+ newprofilewizardpskcontent->LabelPskFile->setEnabled ( true );
+ newprofilewizardpskcontent->PSKFileURLRequester->setEnabled ( true );
+ newprofilewizardpskcontent->LabelPsk->setEnabled ( false );
+ newprofilewizardpskcontent->PSKLineEdit->setEnabled ( false );
}
else
{
- newprofilewizardpskcontent->LabelPskFile->setEnabled ( FALSE );
- newprofilewizardpskcontent->PSKFileURLRequester->setEnabled ( FALSE );
- newprofilewizardpskcontent->LabelPsk->setEnabled ( TRUE );
- newprofilewizardpskcontent->PSKLineEdit->setEnabled ( TRUE );
+ newprofilewizardpskcontent->LabelPskFile->setEnabled ( false );
+ newprofilewizardpskcontent->PSKFileURLRequester->setEnabled ( false );
+ newprofilewizardpskcontent->LabelPsk->setEnabled ( true );
+ newprofilewizardpskcontent->PSKLineEdit->setEnabled ( true );
}
}
@@ -3221,13 +3221,13 @@ void NewProfileWizard::useNatToggled ( bool )
{
if ( newprofilewizardnatcontent->UseNatCheckbox->isChecked() )
{
- newprofilewizardnatcontent->UdpPortCheckbox->setEnabled ( TRUE );
- newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( FALSE );
+ newprofilewizardnatcontent->UdpPortCheckbox->setEnabled ( true );
+ newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( false );
}
else
{
- newprofilewizardnatcontent->UdpPortCheckbox->setEnabled ( FALSE );
- newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( FALSE );
+ newprofilewizardnatcontent->UdpPortCheckbox->setEnabled ( false );
+ newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( false );
}
}
@@ -3235,11 +3235,11 @@ void NewProfileWizard::udpPortToggled ( bool )
{
if ( newprofilewizardnatcontent->UdpPortCheckbox->isChecked() )
{
- newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( TRUE );
+ newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( true );
}
else
{
- newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( FALSE );
+ newprofilewizardnatcontent->UdpPortSpinbox->setEnabled ( false );
}
}
@@ -3263,11 +3263,11 @@ void NewProfileWizard::useSpecialServerCertificateToggled ( bool )
{
if ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox->isChecked() )
{
- newprofilewizardcertcontent->SpecialServerCertificateURLRequester->setEnabled ( TRUE );
+ newprofilewizardcertcontent->SpecialServerCertificateURLRequester->setEnabled ( true );
}
else
{
- newprofilewizardcertcontent->SpecialServerCertificateURLRequester->setEnabled ( FALSE );
+ newprofilewizardcertcontent->SpecialServerCertificateURLRequester->setEnabled ( false );
}
}
@@ -3557,15 +3557,15 @@ void NewProfileWizard::additionalNetworkRoutesToggled ( bool )
{
if ( newprofilewizardnetworkroutecontent->UseExtraNetworkRoutesCheckbox->isChecked() )
{
- newprofilewizardnetworkroutecontent->NetworkListView->setEnabled ( TRUE );
- newprofilewizardnetworkroutecontent->DeleteNetworkRoutePushButton->setEnabled ( TRUE );
- newprofilewizardnetworkroutecontent->AddRoutePushButton->setEnabled ( TRUE );
+ newprofilewizardnetworkroutecontent->NetworkListView->setEnabled ( true );
+ newprofilewizardnetworkroutecontent->DeleteNetworkRoutePushButton->setEnabled ( true );
+ newprofilewizardnetworkroutecontent->AddRoutePushButton->setEnabled ( true );
}
else
{
- newprofilewizardnetworkroutecontent->NetworkListView->setEnabled ( FALSE );
- newprofilewizardnetworkroutecontent->DeleteNetworkRoutePushButton->setEnabled ( FALSE );
- newprofilewizardnetworkroutecontent->AddRoutePushButton->setEnabled ( FALSE );
+ newprofilewizardnetworkroutecontent->NetworkListView->setEnabled ( false );
+ newprofilewizardnetworkroutecontent->DeleteNetworkRoutePushButton->setEnabled ( false );
+ newprofilewizardnetworkroutecontent->AddRoutePushButton->setEnabled ( false );
}
}
@@ -3801,13 +3801,13 @@ void NewProfileWizard::useVirtualIpAddressToggled ( bool )
{
if ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox->isChecked() )
{
- profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->setEnabled ( TRUE );
- profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->setEnabled ( TRUE );
+ profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->setEnabled ( true );
+ profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->setEnabled ( true );
}
else
{
- profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->setEnabled ( FALSE );
- profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->setEnabled ( FALSE );
+ profilenetworkvirtualipoptionscontent->LocalVirtualIpEdit->setEnabled ( false );
+ profilenetworkvirtualipoptionscontent->RemoteVirtualIpLineEdit->setEnabled ( false );
}
}
diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp
index 88af157..3a6ce1a 100644
--- a/src/openvpnmanagementhandler.cpp
+++ b/src/openvpnmanagementhandler.cpp
@@ -166,11 +166,11 @@ void OpenvpnManagementHandler::socketReadyRead()
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler raw: " + line, GlobalConfig->debug );
- // if ( line.find( "NOOP", 0, FALSE ) > -1 )
+ // if ( line.find( "NOOP", 0, false ) > -1 )
// {
// // NOOP
// }
- // else if ( line.find( ">HOLD:", 0, FALSE ) > -1 ) {
+ // else if ( line.find( ">HOLD:", 0, false ) > -1 ) {
//
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).arg("'hold'"), GlobalConfig->debug );
@@ -191,7 +191,7 @@ void OpenvpnManagementHandler::socketReadyRead()
// }
- if ( line.find( "INFO:OpenVPN Management Interface", 0, FALSE ) > -1 )
+ if ( line.find( "INFO:OpenVPN Management Interface", 0, false ) > -1 )
{
gotGreeting=true;
disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
@@ -201,7 +201,7 @@ void OpenvpnManagementHandler::socketReadyRead()
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got greeting from management interface."), GlobalConfig->debug );
}
- else if ( line.find( "> NEED - OK:", 0, FALSE ) > -1 )
+ else if ( line.find( "> NEED - OK:", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -237,7 +237,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
if (socket)
socket->close();
- // if ( line.find( " >PASSWORD:", 0, FALSE ) > -1 ) {
+ // if ( line.find( " >PASSWORD:", 0, false ) > -1 ) {
//
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug );
@@ -260,7 +260,7 @@ void OpenvpnManagementHandler::socketReadyRead()
// }
// sendToServer( "password \"" + req + "\" \"" + pass + "\"\n" );
}
- else if ( line.find( "PASSWORD:Need 'Auth' username/password", 0, FALSE ) > -1 )
+ else if ( line.find( "PASSWORD:Need 'Auth' username/password", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -310,7 +310,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
}
- else if ( line.find( "SUCCESS: 'Auth' username entered", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: 'Auth' username entered", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -364,7 +364,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- // else if ( line.find( "SUCCESS: 'Auth' username entered", 0, FALSE ) > -1 ) {
+ // else if ( line.find( "SUCCESS: 'Auth' username entered", 0, false ) > -1 ) {
//
// if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).arg("'need username/password'"), GlobalConfig->debug );
@@ -379,7 +379,7 @@ void OpenvpnManagementHandler::socketReadyRead()
//
// }
- else if ( line.find( "PASSWORD:Need 'HTTP Proxy' username/password", 0, FALSE ) > -1 )
+ else if ( line.find( "PASSWORD:Need 'HTTP Proxy' username/password", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -398,7 +398,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "SUCCESS: 'HTTP Proxy' username entered", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: 'HTTP Proxy' username entered", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -482,7 +482,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "PASSWORD:Need 'Private Key' password", 0, FALSE ) > -1 )
+ else if ( line.find( "PASSWORD:Need 'Private Key' password", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -569,7 +569,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "PASSWORD:Verification Failed: 'Private Key'", 0, FALSE ) > -1 )
+ else if ( line.find( "PASSWORD:Verification Failed: 'Private Key'", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -628,7 +628,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "FATAL:script failed: shell command exited with error status", 0, FALSE ) > -1 )
+ else if ( line.find( "FATAL:script failed: shell command exited with error status", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -637,7 +637,7 @@ void OpenvpnManagementHandler::socketReadyRead()
abort = true;
}
- else if ( line.find( "PASSWORD:Verification Failed: 'Auth'", 0, FALSE ) > -1 )
+ else if ( line.find( "PASSWORD:Verification Failed: 'Auth'", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -648,7 +648,7 @@ void OpenvpnManagementHandler::socketReadyRead()
abort = true;
}
- else if ( line.find( "FATAL:Cannot load CA certificate file", 0, FALSE ) > -1 )
+ else if ( line.find( "FATAL:Cannot load CA certificate file", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -659,7 +659,7 @@ void OpenvpnManagementHandler::socketReadyRead()
abort = true;
}
- else if ( line.find( "FATAL:Message hash algorithm", 0, FALSE ) > -1 && line.find( "not found", 0, FALSE ) > -1 )
+ else if ( line.find( "FATAL:Message hash algorithm", 0, false ) > -1 && line.find( "not found", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 2 )
@@ -670,7 +670,7 @@ void OpenvpnManagementHandler::socketReadyRead()
abort = true;
}
- else if ( line.find( "PASSWORD:Need 'eToken token' password", 0, FALSE ) > -1)
+ else if ( line.find( "PASSWORD:Need 'eToken token' password", 0, false ) > -1)
{
GlobalConfig->TmpPassword = "";
TQCString password;
@@ -724,13 +724,13 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "SUCCESS: 'eToken token' password entered, but not yet verified", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: 'eToken token' password entered, but not yet verified", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'eToken token' password"), GlobalConfig->debug );
}
- else if ( line.find( ">PASSWORD:Need '", 0, FALSE) > -1 && line.find( "token' password", 0, FALSE ) > -1)
+ else if ( line.find( ">PASSWORD:Need '", 0, false) > -1 && line.find( "token' password", 0, false ) > -1)
{
GlobalConfig->TmpPassword = "";
TQCString password;
@@ -789,7 +789,7 @@ void OpenvpnManagementHandler::socketReadyRead()
}
}
- else if ( line.find( "SUCCESS: '", 0, FALSE ) > -1 && line.find( "token' password entered, but not yet verified", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: '", 0, false ) > -1 && line.find( "token' password entered, but not yet verified", 0, false ) > -1 )
{
TQString TokenName = line.section('\'',1,1);
if ( GlobalConfig->KvpncDebugLevel > 4 )
@@ -800,13 +800,13 @@ void OpenvpnManagementHandler::socketReadyRead()
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for '%1' password").arg(TokenName), GlobalConfig->debug );
}
- else if ( line.find( "SUCCESS: 'Auth' password entered, but not yet verified", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: 'Auth' password entered, but not yet verified", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for user password"), GlobalConfig->debug );
}
- else if ( line.find( "Need 'token-insertion-request'", 0, FALSE ) > -1 )
+ else if ( line.find( "Need 'token-insertion-request'", 0, false ) > -1 )
{
// if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("token-insertion-request"), GlobalConfig->debug );
@@ -814,13 +814,13 @@ void OpenvpnManagementHandler::socketReadyRead()
abort = true;
}
- else if ( line.find( "SUCCESS: 'Private Key' password entered, but not yet verified", 0, FALSE ) > -1 )
+ else if ( line.find( "SUCCESS: 'Private Key' password entered, but not yet verified", 0, false ) > -1 )
{
if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'Private Key' password"), GlobalConfig->debug );
}
- else if ( line.find( "external program fork failed", 0, FALSE ) > -1 )
+ else if ( line.find( "external program fork failed", 0, false ) > -1 )
{
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "External program fork failed, need security parameter." ), GlobalConfig->debug );
@@ -893,7 +893,7 @@ bool OpenvpnManagementHandler::doConnect()
socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort );
connect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
- greetingtimer.start ( 3 * 1000, TRUE );
+ greetingtimer.start ( 3 * 1000, true );
if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler " + i18n("Management greeting timer started."), GlobalConfig->debug );
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 7a7a281..cf1066e 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -1769,13 +1769,13 @@ void PreferencesDialog::connectionTypeChanged( int type )
GlobalConfig->currentProfile->setConnectionType( ( VpnAccountData::ConnectionType ) ( type ) );
- ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled ( TRUE );
- ProfileGeneralOptionsWidget->NewSessionPushButton->setEnabled ( TRUE );
- ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( TRUE );
+ ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled ( true );
+ ProfileGeneralOptionsWidget->NewSessionPushButton->setEnabled ( true );
+ ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( true );
// First we should set a type
- // parent->buttonCancel->setEnabled( FALSE );
- // parent->buttonOk->setEnabled( FALSE );
+ // parent->buttonCancel->setEnabled( false );
+ // parent->buttonOk->setEnabled( false );
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
{
@@ -1869,8 +1869,8 @@ void PreferencesDialog::connectionTypeChanged( int type )
ProfileNetworkGeneralOptionsWidget->RemoteNetMaskComboBox->setEnabled( false );
ProfileCiscoOptionsWidget->IDLineEdit->setEnabled( false );
ProfileCiscoOptionsWidget->LabelID->setEnabled( false );
- // buttonCancel->setEnabled( TRUE );
- // buttonOk->setEnabled( TRUE );
+ // buttonCancel->setEnabled( true );
+ // buttonOk->setEnabled( true );
ProfileNetworkNatOptionsWidget->UseUdpCheckbox->setEnabled( true );
ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( true );
@@ -1891,8 +1891,8 @@ void PreferencesDialog::connectionTypeChanged( int type )
ProfileNetworkGeneralOptionsWidget->RemoteNetMaskComboBox->setEnabled( false );
ProfileCiscoOptionsWidget->IDLineEdit->setEnabled( false );
ProfileCiscoOptionsWidget->LabelID->setEnabled( false );
- // buttonCancel->setEnabled( TRUE );
- // buttonOk->setEnabled( TRUE );
+ // buttonCancel->setEnabled( true );
+ // buttonOk->setEnabled( true );
// ProfileNetworkNatOptionsWidget->UseUdpCheckbox->setEnabled( true );
// ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( true );
@@ -1913,8 +1913,8 @@ void PreferencesDialog::connectionTypeChanged( int type )
ProfileNetworkGeneralOptionsWidget->RemoteNetMaskComboBox->setEnabled( false );
ProfileCiscoOptionsWidget->IDLineEdit->setEnabled( false );
ProfileCiscoOptionsWidget->LabelID->setEnabled( false );
- // buttonCancel->setEnabled( TRUE );
- // buttonOk->setEnabled( TRUE );
+ // buttonCancel->setEnabled( true );
+ // buttonOk->setEnabled( true );
// ProfileNetworkNatOptionsWidget->UseUdpCheckbox->setEnabled( true );
// ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( true );
@@ -1956,8 +1956,8 @@ void PreferencesDialog::connectionTypeChanged( int type )
ProfileCiscoOptionsWidget->IDLineEdit->setEnabled( false );
ProfileCiscoOptionsWidget->LabelID->setEnabled( false );
- // buttonCancel->setEnabled( TRUE );
- // buttonOk->setEnabled( TRUE );
+ // buttonCancel->setEnabled( true );
+ // buttonOk->setEnabled( true );
@@ -6060,9 +6060,9 @@ void PreferencesDialog::deleteSessionClicked()
{
if ( ProfileGeneralSelector->currentText().isEmpty() )
{
- // this->deleteSessionAction->setEnabled ( FALSE );
- // this->advancedSessionAction->setEnabled ( FALSE );
- // this->saveSessionAction->setEnabled ( FALSE );
+ // this->deleteSessionAction->setEnabled ( false );
+ // this->advancedSessionAction->setEnabled ( false );
+ // this->saveSessionAction->setEnabled ( false );
}
else
{
@@ -6110,9 +6110,9 @@ void PreferencesDialog::deleteSessionClicked()
}
else
{
- ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled ( FALSE );
- ProfileGeneralOptionsWidget->RenameSessionPushButton->setEnabled ( FALSE );
- ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( FALSE );
+ ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled ( false );
+ ProfileGeneralOptionsWidget->RenameSessionPushButton->setEnabled ( false );
+ ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( false );
GlobalConfig->lastProfile = "";
GlobalConfig->currentProfile = 0L;
// CiscoPptpGroupBox->setEnabled( false );
@@ -6133,7 +6133,7 @@ void PreferencesDialog::deleteSessionClicked()
//saveOptions(); // TODO save, currently after closing dialog
// sessionToggled();
//if ( ConnectOptionsWidget->ProfileGeneralOptionsWidget->ProfileComboBox->currentText().isEmpty() )
- // ConnectOptionsWidget->ProfileGeneralOptionsWidget->ProfileComboBox->setEnabled ( FALSE );
+ // ConnectOptionsWidget->ProfileGeneralOptionsWidget->ProfileComboBox->setEnabled ( false );
}
}
@@ -6220,9 +6220,9 @@ void PreferencesDialog::newSessionClicked()
}
}
- ProfileGeneralOptionsWidget->RenameSessionPushButton->setEnabled( TRUE );
- ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled( TRUE );
- ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( TRUE );
+ ProfileGeneralOptionsWidget->RenameSessionPushButton->setEnabled( true );
+ ProfileGeneralOptionsWidget->DeleteSessionPushButton->setEnabled( true );
+ ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled ( true );
// CiscoPptpGroupBox->setEnabled( true );
// // FreeswanRacoonGroupBox->setEnabled( true );
@@ -6932,11 +6932,11 @@ void PreferencesDialog::useSpecialServerSmartcardificateToggled(bool)
{
// if (ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox->isChecked())
// {
-// ProfileSmartcardOptionsWidget->SpecialServerSmartcardificateURLRequester->setEnabled(TRUE);
+// ProfileSmartcardOptionsWidget->SpecialServerSmartcardificateURLRequester->setEnabled(true);
// }
// else
// {
-// ProfileSmartcardOptionsWidget->SpecialServerSmartcardificateURLRequester->setEnabled(FALSE);
+// ProfileSmartcardOptionsWidget->SpecialServerSmartcardificateURLRequester->setEnabled(false);
// }
}
diff --git a/src/profilecertoptions.cpp b/src/profilecertoptions.cpp
index 705e998..cd2f78c 100644
--- a/src/profilecertoptions.cpp
+++ b/src/profilecertoptions.cpp
@@ -51,11 +51,11 @@ void ProfileCertOptions::useSpecialServerCertificateToggled(bool)
{
if (UseSpecialServerCertificateCheckBox->isChecked())
{
- SpecialServerCertificateURLRequester->setEnabled(TRUE);
+ SpecialServerCertificateURLRequester->setEnabled(true);
}
else
{
- SpecialServerCertificateURLRequester->setEnabled(FALSE);
+ SpecialServerCertificateURLRequester->setEnabled(false);
}
}
diff --git a/src/profilecmdexecafterconnectoptions.cpp b/src/profilecmdexecafterconnectoptions.cpp
index e2a8d94..3ff1aff 100644
--- a/src/profilecmdexecafterconnectoptions.cpp
+++ b/src/profilecmdexecafterconnectoptions.cpp
@@ -42,15 +42,15 @@ void ProfileCmdExecAfterConnectOptions::execCmdAfterConnectToggled(bool)
{
if (ExcuteCmdAfterConnectCheckBox->isChecked())
{
- CmdAfterConnectTextEdit->setEnabled( TRUE );
- CommandAfterConnectDelayTimeNumInput->setEnabled( TRUE );
- CommandAfterConnectDelayTimeNumInputLabel->setEnabled( TRUE );
+ CmdAfterConnectTextEdit->setEnabled( true );
+ CommandAfterConnectDelayTimeNumInput->setEnabled( true );
+ CommandAfterConnectDelayTimeNumInputLabel->setEnabled( true );
}
else
{
- CmdAfterConnectTextEdit->setEnabled( FALSE );
- CommandAfterConnectDelayTimeNumInput->setEnabled( FALSE );
- CommandAfterConnectDelayTimeNumInputLabel->setEnabled( FALSE );
+ CmdAfterConnectTextEdit->setEnabled( false );
+ CommandAfterConnectDelayTimeNumInput->setEnabled( false );
+ CommandAfterConnectDelayTimeNumInputLabel->setEnabled( false );
}
}
diff --git a/src/profilecmdexecafterdisconnectoptions.cpp b/src/profilecmdexecafterdisconnectoptions.cpp
index 19dc144..bf69556 100644
--- a/src/profilecmdexecafterdisconnectoptions.cpp
+++ b/src/profilecmdexecafterdisconnectoptions.cpp
@@ -41,9 +41,9 @@ ProfileCmdExecAfterDisconnectOptions::~ProfileCmdExecAfterDisconnectOptions()
void ProfileCmdExecAfterDisconnectOptions::execCmdAfterDisconnectToggled(bool)
{
if (ExcuteCmdAfterDisconnectCheckBox->isChecked())
- CmdAfterDisconnectTextEdit->setEnabled( TRUE );
+ CmdAfterDisconnectTextEdit->setEnabled( true );
else
- CmdAfterDisconnectTextEdit->setEnabled( FALSE );
+ CmdAfterDisconnectTextEdit->setEnabled( false );
}
void ProfileCmdExecAfterDisconnectOptions::dialogChanged()
diff --git a/src/profilecmdexecbeforeconnectoptions.cpp b/src/profilecmdexecbeforeconnectoptions.cpp
index e0cab96..2c5d36f 100644
--- a/src/profilecmdexecbeforeconnectoptions.cpp
+++ b/src/profilecmdexecbeforeconnectoptions.cpp
@@ -39,9 +39,9 @@ ProfileCmdExecBeforeConnectOptions::~ProfileCmdExecBeforeConnectOptions()
void ProfileCmdExecBeforeConnectOptions::execCmdBeforeConnectToggled(bool)
{
if (ExcuteCmdBeforeConnectCheckBox->isChecked())
- CmdBeforeConnectTextEdit->setEnabled( TRUE );
+ CmdBeforeConnectTextEdit->setEnabled( true );
else
- CmdBeforeConnectTextEdit->setEnabled( FALSE );
+ CmdBeforeConnectTextEdit->setEnabled( false );
}
void ProfileCmdExecBeforeConnectOptions::dialogChanged()
diff --git a/src/profilecmdexecbeforedisconnectoptions.cpp b/src/profilecmdexecbeforedisconnectoptions.cpp
index f321780..f1eeb9d 100644
--- a/src/profilecmdexecbeforedisconnectoptions.cpp
+++ b/src/profilecmdexecbeforedisconnectoptions.cpp
@@ -39,9 +39,9 @@ ProfileCmdExecBeforeDisconnectOptions::~ProfileCmdExecBeforeDisconnectOptions()
void ProfileCmdExecBeforeDisconnectOptions::execCmdBeforeDisconnectToggled(bool)
{
if (ExcuteCmdBeforeDisconnectCheckBox->isChecked())
- CmdBeforeDisconnectTextEdit->setEnabled( TRUE );
+ CmdBeforeDisconnectTextEdit->setEnabled( true );
else
- CmdBeforeDisconnectTextEdit->setEnabled( FALSE );
+ CmdBeforeDisconnectTextEdit->setEnabled( false );
}
void ProfileCmdExecBeforeDisconnectOptions::dialogChanged()
{
diff --git a/src/profilenetworknatoptions.cpp b/src/profilenetworknatoptions.cpp
index b885893..b0d48c6 100644
--- a/src/profilenetworknatoptions.cpp
+++ b/src/profilenetworknatoptions.cpp
@@ -40,11 +40,11 @@ void ProfileNetworkNatOptions::useNatToggled(bool)
{
if (UseNatCheckbox->isChecked())
{
- UdpPortCheckbox->setEnabled(TRUE);
+ UdpPortCheckbox->setEnabled(true);
}
else
{
- UdpPortCheckbox->setEnabled(FALSE);
+ UdpPortCheckbox->setEnabled(false);
}
}
@@ -53,11 +53,11 @@ void ProfileNetworkNatOptions::udpPortToggled(bool)
{
if (UdpPortCheckbox->isChecked())
{
- UdpPortSpinbox->setEnabled(TRUE);
+ UdpPortSpinbox->setEnabled(true);
}
else
{
- UdpPortSpinbox->setEnabled(FALSE);
+ UdpPortSpinbox->setEnabled(false);
}
}
diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp
index 26c5baf..aa48646 100644
--- a/src/profilenetworkrouteoptions.cpp
+++ b/src/profilenetworkrouteoptions.cpp
@@ -52,15 +52,15 @@ void ProfileNetworkRouteOptions::additionalNetworkRoutesToggled(bool)
{
if (UseExtraNetworkRoutesCheckbox->isChecked())
{
- NetworkListView->setEnabled(TRUE);
- AddRoutePushButton->setEnabled(TRUE);
+ NetworkListView->setEnabled(true);
+ AddRoutePushButton->setEnabled(true);
checkList();
}
else
{
- NetworkListView->setEnabled(FALSE);
- DeleteNetworkRoutePushButton->setEnabled(FALSE);
- AddRoutePushButton->setEnabled(FALSE);
+ NetworkListView->setEnabled(false);
+ DeleteNetworkRoutePushButton->setEnabled(false);
+ AddRoutePushButton->setEnabled(false);
}
}
diff --git a/src/profilenetworkvirtualipoptions.cpp b/src/profilenetworkvirtualipoptions.cpp
index 3b40b05..58bccdd 100644
--- a/src/profilenetworkvirtualipoptions.cpp
+++ b/src/profilenetworkvirtualipoptions.cpp
@@ -40,16 +40,16 @@ ProfileNetworkVirtualIpOptions::~ProfileNetworkVirtualIpOptions()
void ProfileNetworkVirtualIpOptions::useVirtualIpAddressToggled(bool)
{
if (UseVirtualIPCheckBox->isChecked()){
- LocalVirtualIpEdit->setEnabled( TRUE );
- LabelLocalVirtualIp->setEnabled( TRUE );
- RemoteVirtualIpLineEdit->setEnabled( TRUE );
- LabelRemoteVirtualIp->setEnabled( TRUE );
+ LocalVirtualIpEdit->setEnabled( true );
+ LabelLocalVirtualIp->setEnabled( true );
+ RemoteVirtualIpLineEdit->setEnabled( true );
+ LabelRemoteVirtualIp->setEnabled( true );
}
else {
- LocalVirtualIpEdit->setEnabled( FALSE );
- LabelLocalVirtualIp->setEnabled( FALSE );
- RemoteVirtualIpLineEdit->setEnabled( FALSE );
- LabelRemoteVirtualIp->setEnabled( FALSE );
+ LocalVirtualIpEdit->setEnabled( false );
+ LabelLocalVirtualIp->setEnabled( false );
+ RemoteVirtualIpLineEdit->setEnabled( false );
+ LabelRemoteVirtualIp->setEnabled( false );
}
}
diff --git a/src/profilepskoptions.cpp b/src/profilepskoptions.cpp
index 4778240..2a7acaf 100644
--- a/src/profilepskoptions.cpp
+++ b/src/profilepskoptions.cpp
@@ -45,17 +45,17 @@ void ProfilePskOptions::pskIsInFileToggled(bool)
{
if (PskInFileCheckBox->isChecked())
{
- LabelPskFile->setEnabled(TRUE);
- PSKFileURLRequester->setEnabled(TRUE);
- LabelPsk->setEnabled(FALSE);
- PSKLineEdit->setEnabled(FALSE);
+ LabelPskFile->setEnabled(true);
+ PSKFileURLRequester->setEnabled(true);
+ LabelPsk->setEnabled(false);
+ PSKLineEdit->setEnabled(false);
}
else
{
- LabelPskFile->setEnabled(FALSE);
- PSKFileURLRequester->setEnabled(FALSE);
- LabelPsk->setEnabled(TRUE);
- PSKLineEdit->setEnabled(TRUE);
+ LabelPskFile->setEnabled(false);
+ PSKFileURLRequester->setEnabled(false);
+ LabelPsk->setEnabled(true);
+ PSKLineEdit->setEnabled(true);
}
}
diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp
index 526649b..6b79b2b 100644
--- a/src/toolinfo.cpp
+++ b/src/toolinfo.cpp
@@ -330,32 +330,32 @@ void ToolInfo::readStdOutCollectToolInfo ()
//FIXME how it could be better?
if (Name == "vpnc")
{
- if ( msg.find( "version", 0, FALSE ) > -1 )
+ if ( msg.find( "version", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg.ascii() << std::endl;
// std::cout << "stdout collectToolInfo: 2,2 " << msg.simplifyWhiteSpace().section(' ',2,2).ascii() << std::endl;
Version = msg.simplifyWhiteSpace().section(' ',2,2);
}
- if ( msg.find( "Built without openssl (certificate) support.", 0, FALSE ) > -1 )
+ if ( msg.find( "Built without openssl (certificate) support.", 0, false ) > -1 )
{
// Capabilities+=i18n("no openssl support")+";";
}
- else if ( msg.find( "Built with openssl (certificate) support.", 0, FALSE ) > -1 )
+ else if ( msg.find( "Built with openssl (certificate) support.", 0, false ) > -1 )
{
Capabilities=i18n("openssl (certificate) support")+";";
}
}
else if (Name == "vpnclient" || Name =="cisco_cert_mgr")
{
- if ( msg.find( "Cisco Systems VPN Client", 0, FALSE ) > -1 )
+ if ( msg.find( "Cisco Systems VPN Client", 0, false ) > -1 )
Version = msg.section(' ',5,6); // "Cisco Systems VPN Client Version 4.8.00 (0490)"
}
else if (Name == "ipsec")
{
- if ( msg.find( "wan", 0, FALSE ) > -1 )
+ if ( msg.find( "wan", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
-// if ( msg.find( "openswan", 0, FALSE ) > -1 )
+// if ( msg.find( "openswan", 0, false ) > -1 )
// Version = msg.section(' ',2,2);
// else
Version = msg.section(' ',1,2); // "Openswan Ux.x.x/kx.x.x"
@@ -371,7 +371,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
// we need to do some stupid hack...
// /usr/sbin/racoon -> /usr/sbin/setkey
CollectToolInfoProcess->addArgument(TQString(PathToExec.left(PathToExec.length()-6)+"setkey"));
- if ( msg.find( "ipsec-tools", 0, FALSE ) > -1 )
+ if ( msg.find( "ipsec-tools", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',3,3);
@@ -379,7 +379,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "setkey")
{
- if ( msg.find( "ipsec-tools", 0, FALSE ) > -1 )
+ if ( msg.find( "ipsec-tools", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',3,3);
@@ -387,7 +387,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "openvpn")
{
- if ( msg.find( "built", 0, FALSE ) > -1 )
+ if ( msg.find( "built", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1);
@@ -395,7 +395,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "openssl")
{
- if ( msg.find( "OpenSSL", 0, FALSE ) > -1 )
+ if ( msg.find( "OpenSSL", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1);
@@ -403,7 +403,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "pppd")
{
- if ( msg.find( "version", 0, FALSE ) > -1 )
+ if ( msg.find( "version", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
@@ -411,7 +411,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "iptables")
{
- if ( msg.find( "iptables", 0, FALSE ) > -1 )
+ if ( msg.find( "iptables", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1);
@@ -419,7 +419,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "ping")
{
- if ( msg.find( "ping", 0, FALSE ) > -1 )
+ if ( msg.find( "ping", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
@@ -427,7 +427,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "ip")
{
- if ( msg.find( "ip", 0, FALSE ) > -1 )
+ if ( msg.find( "ip", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
@@ -435,7 +435,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "kill")
{
- if ( msg.find( "kill", 0, FALSE ) > -1 )
+ if ( msg.find( "kill", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',3,3).section(')',0,0);
@@ -443,12 +443,12 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "pkcs11-tool")
{
- if ( msg.find( "version", 0, FALSE ) > -1 )
+ if ( msg.find( "version", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
}
- else if ( msg.find( "Error: can't open /var/run/openct/status", 0, FALSE ) > -1 )
+ else if ( msg.find( "Error: can't open /var/run/openct/status", 0, false ) > -1 )
{
std::cerr << "stdout collectToolInfo (pkcs11): " << msg.ascii() << std::endl;
CollectToolInfoProcess->kill();
@@ -456,7 +456,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "xl2tpd")
{
- if ( msg.find( "version:", 0, FALSE ) > -1 )
+ if ( msg.find( "version:", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',3,3).stripWhiteSpace();
@@ -464,7 +464,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "openl2tpd")
{
- if ( msg.find( "OpenL2TP V", 0, FALSE ) > -1 )
+ if ( msg.find( "OpenL2TP V", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1).remove(',').remove('V');
@@ -474,7 +474,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "vtund")
{
- if ( msg.find( "VTun ver", 0, FALSE ) > -1 )
+ if ( msg.find( "VTun ver", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,3).stripWhiteSpace();
@@ -482,7 +482,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "tail")
{
- if ( msg.find( "tail ", 0, FALSE ) > -1 )
+ if ( msg.find( "tail ", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',3,3).stripWhiteSpace();
@@ -490,7 +490,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "ksshaskpass")
{
- if ( msg.find( "Ksshaskpass:", 0, FALSE ) > -1 )
+ if ( msg.find( "Ksshaskpass:", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1).stripWhiteSpace();
@@ -498,7 +498,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "gnome-ssh-askpass")
{
-// if ( msg.find( "askpass", 0, FALSE ) > -1 )
+// if ( msg.find( "askpass", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
// Version = msg.section(' ',3,3).stripWhiteSpace();
@@ -507,7 +507,7 @@ void ToolInfo::readStdOutCollectToolInfo ()
}
else if (Name == "netstat")
{
- if ( msg.find( "netstat ", 0, FALSE ) > -1 )
+ if ( msg.find( "netstat ", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1).stripWhiteSpace();
@@ -534,7 +534,7 @@ void ToolInfo::readStdErrCollectToolInfo()
if (Name == "pppd")
{
- if ( msg.find( "version", 0, FALSE ) > -1 )
+ if ( msg.find( "version", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
@@ -542,7 +542,7 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "killall")
{
- if ( msg.find( "killall", 0, FALSE ) > -1 )
+ if ( msg.find( "killall", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2);
@@ -551,7 +551,7 @@ void ToolInfo::readStdErrCollectToolInfo()
else if (Name == "ifconfig")
{
//KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa");
- if ( msg.find( "ifconfig", 0, FALSE ) > -1 )
+ if ( msg.find( "ifconfig", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1);
@@ -559,7 +559,7 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "route")
{
- if ( msg.find( "route", 0, FALSE ) > -1 )
+ if ( msg.find( "route", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',1,1);
@@ -567,7 +567,7 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "pptp")
{
- if ( msg.find( "pptp version", 0, FALSE ) > -1 )
+ if ( msg.find( "pptp version", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg.ascii() << std::endl;
Version = msg.section(' ',2,2).section(')',0,0);
@@ -575,7 +575,7 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "l2tpd")
{
- if ( msg.find( "l2tpd", 0, FALSE ) > -1 )
+ if ( msg.find( "l2tpd", 0, false ) > -1 )
{
//std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',2,2).section(')',0,0);
@@ -583,12 +583,12 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "pkcs11-tool")
{
- if ( msg.find( "version", 0, FALSE ) > -1 )
+ if ( msg.find( "version", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo (pkcs11): " << msg.ascii() << std::endl;
Version = msg.section(' ',2,2);
}
- else if ( msg.find( "Error: can't open /var/run/openct/status", 0, FALSE ) > -1 )
+ else if ( msg.find( "Error: can't open /var/run/openct/status", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo (pkcs11): " << msg.ascii() << std::endl;
CollectToolInfoProcess->kill();
@@ -596,7 +596,7 @@ void ToolInfo::readStdErrCollectToolInfo()
}
else if (Name == "ssh")
{
- if ( msg.find( "OpenSSH", 0, FALSE ) > -1 )
+ if ( msg.find( "OpenSSH", 0, false ) > -1 )
{
// std::cout << "stdout collectToolInfo: " << msg << std::endl;
Version = msg.section(' ',0,0).section('_',1,1).stripWhiteSpace();
@@ -616,7 +616,7 @@ void ToolInfo::readStdOutCollectOpenvpnCapabilies()
TQString msg = TQString( CollectOpenvpnCapabilitiesProcess->readLineStdout() );
// TQString msg = TQString( CollectOpenvpnCapabilitiesProcess->readStdout() );
// std::cout << "stdout collectOpenvpnCapabilities: " << msg.ascii() <<std::endl;
- if ( msg.find( "PKCS#11 Options:", 0, FALSE ) > -1 )
+ if ( msg.find( "PKCS#11 Options:", 0, false ) > -1 )
Capabilities+=i18n("pkcs11 support")+";";
}
diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index ee88aa6..60983cb 100644
--- a/src/toolsinfodialog.cpp
+++ b/src/toolsinfodialog.cpp
@@ -154,7 +154,7 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
// int subminor=tool->Version.section('.',2,2).toInt();
// if ( major >= 2 && minor >= 1)
- if (tool->Capabilities.find( i18n("pkcs11 support"), 0, FALSE ) > -1 )
+ if (tool->Capabilities.find( i18n("pkcs11 support"), 0, false ) > -1 )
{
if (!comment.isEmpty())
comment+=", ";
diff --git a/src/utils.cpp b/src/utils.cpp
index 4fc3a17..10c2717 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1415,15 +1415,15 @@ void Utils::readStdErrLoadKernelModule()
// kdDebug() << "readStdErrreadStderrLoadKernelModule" << msg << endl;
/* FATAL: Module <Name> not found. */
- if ( msg.find( "not found", 0, FALSE ) > -1 ) {
+ if ( msg.find( "not found", 0, false ) > -1 ) {
modprobeSuccess = false;
}
- if ( msg.find( "could not find module", 0 , FALSE ) > -1 ) {
+ if ( msg.find( "could not find module", 0 , false ) > -1 ) {
modprobeSuccess = false;
}
- if ( msg.find( "not permitted", 0 , FALSE ) > -1 ) {
+ if ( msg.find( "not permitted", 0 , false ) > -1 ) {
modprobeSuccess = false;
}
}
@@ -1760,7 +1760,7 @@ void Utils::readOutGetCertsFromCiscoCertStoreSlot()
// if (config->KvpncDebugLevel > 2)
// std::cout << "readOutGetCertsFromCiscoCertStoreSlot: " << msg << std::endl;
- if (msg.find("Cert #",0,FALSE) > -1)
+ if (msg.find("Cert #",0,false) > -1)
CertsFromCiscoCertPos=1;
if (CertsFromCiscoCertPos==1 || CertsFromCiscoCertPos ==2 | CertsFromCiscoCertPos ==3)
{
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index 189ea76..3039cc0 100644
--- a/src/vpntypesinfodialog.cpp
+++ b/src/vpntypesinfodialog.cpp
@@ -108,7 +108,7 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
main->InfoListView->setSorting(1);
VpnTypesInfoList = new TQPtrList<VpnTypeInfo>();
- VpnTypesInfoList->setAutoDelete( TRUE ); // the list owns the objects
+ VpnTypesInfoList->setAutoDelete( true ); // the list owns the objects
VpnTypeInfo *it;