Rename a number of old tq methods that are no longer tq specific

4 files changed, 12 insertions, 12 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>