From 4c7c7b15be1d6c77d350bc9c972f68a91af1a34f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:55 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit e2cfc7c4dd819ab463f0cccaaff99e0a7bc33b29) --- .../vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp | 4 ++-- knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui | 4 ++-- knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui | 4 ++-- knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui | 2 +- knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui | 8 ++++---- knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanauth.ui | 4 ++-- knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui | 6 +++--- knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'knetworkmanager-0.8/vpn-plugins') 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..8ce99a8 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp @@ -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 }'").tqarg(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)) 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 @@ Expanding - + 40 20 @@ -57,7 +57,7 @@ Expanding - + 20 40 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 @@ Expanding - + 20 16 @@ -444,7 +444,7 @@ Expanding - + 20 30 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 30 @@ -99,7 +99,7 @@ Expanding - + 20 40 @@ -124,7 +124,7 @@ Expanding - + 220 20 @@ -141,7 +141,7 @@ Expanding - + 230 20 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 @@ Expanding - + 20 100 @@ -75,7 +75,7 @@ Expanding - + 130 20 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 @@ Expanding - + 20 16 @@ -197,7 +197,7 @@ Expanding - + 20 51 @@ -214,7 +214,7 @@ Expanding - + 231 31 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 @@ Expanding - + 20 40 @@ -253,7 +253,7 @@ Expanding - + 20 20 -- cgit v1.2.1