diff options
Diffstat (limited to 'knetworkmanager-0.8/vpn-plugins')
15 files changed, 41 insertions, 41 deletions
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp index 0593a08..020df5a 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp @@ -108,9 +108,9 @@ int OpenVPNConnectionType::mapConnectionType2String(CONNECTIONTYPE connType) OpenVPNConfig::OpenVPNConfig(TQWidget* parent) : VPNConfigWidget(parent) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _openvpnWidget = new OpenVPNConfigWidget(this); - tqlayout->addWidget(_openvpnWidget); + layout->addWidget(_openvpnWidget); connect(_openvpnWidget->chkUseCipher, TQT_SIGNAL(toggled(bool)), _openvpnWidget->cboCipher, TQT_SLOT(setEnabled(bool))); connect(_openvpnWidget->chkUseTLS, TQT_SIGNAL(toggled(bool)), _openvpnWidget->cboDirection, TQT_SLOT(setEnabled(bool))); @@ -166,7 +166,7 @@ TQString OpenVPNConfig::findOpenVPNBinary() void OpenVPNConfig::receiveCipherData(KProcess*, char* buffer, int len) { // add possible cipher modes to the combobox - TQStringList cipherModes = TQStringList::split("\n", TQString::tqfromLatin1(buffer, len), false ); + TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false ); for (TQStringList::ConstIterator it = cipherModes.begin(); it != cipherModes.end(); ++it) { _openvpnWidget->cboCipher->insertItem((*it)); @@ -181,7 +181,7 @@ void OpenVPNConfig::getCipherModes() { KProcess* cipherHelper = new KProcess(); cipherHelper->setUseShell(true, "/bin/sh"); - *cipherHelper << TQString::tqfromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").tqarg(openvpn); + *cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn); connect (cipherHelper, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(KProcess*, char*, int))); kdDebug() << "starting openvpn to get cipher modes" << endl; if (!cipherHelper->start(KProcess::Block, KProcess::Stdout)) @@ -275,7 +275,7 @@ void OpenVPNConfig::setVPNData(const TQStringList& routes, const TQMap<TQString, } else { - kdDebug() << TQString("OpenVPN: Property '%1' not handled").tqarg(entry) << endl; + kdDebug() << TQString("OpenVPN: Property '%1' not handled").arg(entry) << endl; } } @@ -516,9 +516,9 @@ bool OpenVPNConfig::isValid(TQStringList& err_msg) OpenVPNAuthentication::OpenVPNAuthentication(TQWidget* parent, char* name) : VPNAuthenticationWidget(parent, name) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _openvpnAuth = new OpenVPNAuthenticationWidget(this); - tqlayout->addWidget(_openvpnAuth); + layout->addWidget(_openvpnAuth); } OpenVPNAuthentication::~OpenVPNAuthentication() diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h index c78f524..95d58d0 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kprocess.h> #include "knetworkmanager-vpnplugin.h" diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui index 4cb6578..3bea9b4 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui index c136050..a6d0945 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui @@ -44,7 +44,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -444,7 +444,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp index 091b400..452fb23 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp @@ -67,9 +67,9 @@ VPNAuthenticationWidget* PPTPPlugin::CreateAuthenticationWidget(TQWidget* parent PPTPConfig::PPTPConfig(TQWidget* parent) : VPNConfigWidget(parent) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _pptpWidget = new PPTPConfigWidget(this); - tqlayout->addWidget(_pptpWidget); + layout->addWidget(_pptpWidget); connect(_pptpWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _pptpWidget->routes, TQT_SLOT(setEnabled(bool))); @@ -201,9 +201,9 @@ bool PPTPConfig::isValid(TQStringList& err_msg) PPTPAuthentication::PPTPAuthentication(TQWidget* parent, char* name) : VPNAuthenticationWidget(parent, name) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _pptpAuth = new PPTPAuthenticationWidget(this); - tqlayout->addWidget(_pptpAuth); + layout->addWidget(_pptpAuth); } PPTPAuthentication::~PPTPAuthentication() diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h index d703743..4bce41f 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include "knetworkmanager-vpnplugin.h" #include "pptpprop.h" diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui index 5388561..4078684 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui index b57e065..c966535 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp index 37cee81..39a512c 100644 --- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp +++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp @@ -67,9 +67,9 @@ VPNAuthenticationWidget* StrongswanPlugin::CreateAuthenticationWidget(TQWidget* StrongswanConfig::StrongswanConfig(TQWidget* parent) : VPNConfigWidget(parent) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _strongswanWidget = new StrongswanConfigWidget(this); - tqlayout->addWidget(_strongswanWidget); + layout->addWidget(_strongswanWidget); /* TODO not sure if we need this here */ this->languageChange(); @@ -208,9 +208,9 @@ bool StrongswanConfig::isValid(TQStringList& err_msg) StrongswanAuthentication::StrongswanAuthentication(TQWidget* parent, char* name) : VPNAuthenticationWidget(parent, name) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _strongswanAuth = new StrongswanAuthenticationWidget(this); - tqlayout->addWidget(_strongswanAuth); + layout->addWidget(_strongswanAuth); } StrongswanAuthentication::~StrongswanAuthentication() diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h index 74f82a5..92c3aa5 100644 --- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h +++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include "knetworkmanager-vpnplugin.h" #include "strongswanprop.h" diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanauth.ui b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanauth.ui index 332d3c8..244a6ac 100644 --- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanauth.ui +++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanauth.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui index d55c066..a728a1d 100644 --- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui +++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>231</width> <height>31</height> diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp index 526d5d5..5bab84c 100644 --- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp +++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp @@ -77,9 +77,9 @@ VPNAuthenticationWidget* VPNCPlugin::CreateAuthenticationWidget(TQWidget* parent VPNCConfig::VPNCConfig(TQWidget* parent) : VPNConfigWidget(parent) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _vpncWidget = new VPNCConfigWidget(this); - tqlayout->addWidget(_vpncWidget); + layout->addWidget(_vpncWidget); connect(_vpncWidget->pcfImport, TQT_SIGNAL(clicked()), this, TQT_SLOT( pcfImport()) ); @@ -170,7 +170,7 @@ void VPNCConfig::pcfImport() if (getFileConfig("GroupPwd=", line) == 0) { if (strlen(linedata) > 0) { printf("Got configuration parameter GroupPwd with data %s\n\r", linedata); - KMessageBox::information(this, TQString("Your group password is: %1\n\r\n\rYou will need this information when you log on").tqarg(linedata)); + KMessageBox::information(this, TQString("Your group password is: %1\n\r\n\rYou will need this information when you log on").arg(linedata)); } } if (getFileConfig("enc_GroupPwd=", line) == 0) { @@ -200,7 +200,7 @@ void VPNCConfig::pcfImport() } printf("Group password decrypt result: '%s'\n\r", decrypted_result); } - KMessageBox::information(this, TQString("Your group password is: %1\n\r\n\rYou will need this information when you log on").tqarg(decrypted_result)); + KMessageBox::information(this, TQString("Your group password is: %1\n\r\n\rYou will need this information when you log on").arg(decrypted_result)); } } } @@ -344,9 +344,9 @@ bool VPNCConfig::isValid(TQStringList& err_msg) VPNCAuthentication::VPNCAuthentication(TQWidget* parent, char* name) : VPNAuthenticationWidget(parent, name) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); _vpncAuth = new VPNCAuthenticationWidget(this); - tqlayout->addWidget(_vpncAuth); + layout->addWidget(_vpncAuth); } VPNCAuthentication::~VPNCAuthentication() diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h index 429bc55..9fdcdec 100644 --- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h +++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h @@ -29,7 +29,7 @@ #include <tqmap.h> #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include "knetworkmanager-vpnplugin.h" #include "vpncprop.h" diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui index ab2b8fc..c9fbd43 100644 --- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui +++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> |