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

This reverts commit def182a745c9f7c9f91600c31d133389d0d59b82.

53 files changed, 175 insertions, 175 deletions

diff --git a/knetworkmanager-0.8/src/connection_editor.ui b/knetworkmanager-0.8/src/connection_editor.ui
index 27a69ba..3a68f2c 100644
--- a/knetworkmanager-0.8/src/connection_editor.ui
+++ b/knetworkmanager-0.8/src/connection_editor.ui
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>240</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_cdma.ui b/knetworkmanager-0.8/src/connection_setting_cdma.ui
index 5674468..5a81378 100644
--- a/knetworkmanager-0.8/src/connection_setting_cdma.ui
+++ b/knetworkmanager-0.8/src/connection_setting_cdma.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -94,7 +94,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>146</width>
                             <height>20</height>
@@ -113,7 +113,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_gsm.ui b/knetworkmanager-0.8/src/connection_setting_gsm.ui
index c89a749..c03e11e 100644
--- a/knetworkmanager-0.8/src/connection_setting_gsm.ui
+++ b/knetworkmanager-0.8/src/connection_setting_gsm.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -186,7 +186,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>171</width>
                             <height>20</height>
@@ -270,7 +270,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_info.ui b/knetworkmanager-0.8/src/connection_setting_info.ui
index 72a6e87..bc99ca2 100644
--- a/knetworkmanager-0.8/src/connection_setting_info.ui
+++ b/knetworkmanager-0.8/src/connection_setting_info.ui
@@ -42,7 +42,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_ppp.ui b/knetworkmanager-0.8/src/connection_setting_ppp.ui
index 7db6e5e..0b47e61 100644
--- a/knetworkmanager-0.8/src/connection_setting_ppp.ui
+++ b/knetworkmanager-0.8/src/connection_setting_ppp.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>50</height>
@@ -57,7 +57,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="4" column="2">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="2">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -103,7 +103,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="2">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -126,7 +126,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="2">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -181,7 +181,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="2">
                     <property name="name">
-                        <cstring>layout14</cstring>
+                        <cstring>tqlayout14</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -286,7 +286,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_serial.ui b/knetworkmanager-0.8/src/connection_setting_serial.ui
index 2a3b9ad..67e0586 100644
--- a/knetworkmanager-0.8/src/connection_setting_serial.ui
+++ b/knetworkmanager-0.8/src/connection_setting_serial.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout23</cstring>
+                <cstring>tqlayout23</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>141</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless.ui b/knetworkmanager-0.8/src/connection_setting_wireless.ui
index 9415ce4..49df622 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless.ui
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>282</width>
                     <height>20</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless_security_wpacipher.ui b/knetworkmanager-0.8/src/connection_setting_wireless_security_wpacipher.ui
index a402e66..430ff9c 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless_security_wpacipher.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless_security_wpacipher.ui
@@ -105,7 +105,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless_security_wpaversion.ui b/knetworkmanager-0.8/src/connection_setting_wireless_security_wpaversion.ui
index 11b1655..83729e2 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless_security_wpaversion.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless_security_wpaversion.ui
@@ -65,7 +65,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
diff --git a/knetworkmanager-0.8/src/connection_settings.ui b/knetworkmanager-0.8/src/connection_settings.ui
index c7994de..794c0e3 100644
--- a/knetworkmanager-0.8/src/connection_settings.ui
+++ b/knetworkmanager-0.8/src/connection_settings.ui
@@ -82,7 +82,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>180</width>
                     <height>20</height>
diff --git a/knetworkmanager-0.8/src/devicetraycomponent.cpp b/knetworkmanager-0.8/src/devicetraycomponent.cpp
index d42db60..9b63cc4 100644
--- a/knetworkmanager-0.8/src/devicetraycomponent.cpp
+++ b/knetworkmanager-0.8/src/devicetraycomponent.cpp
@@ -70,8 +70,8 @@ TQStringList DeviceTrayComponent::getToolTipText()
 	TQStringList list;
 	NMDeviceState state = m_device->getState();
 	if (m_tooltips.contains(state)) {
-		list.append(i18n("Device: %1").arg(m_device->getInterface()));
-		list.append(i18n("State: %1").arg(m_tooltips[state]));
+		list.append(i18n("Device: %1").tqarg(m_device->getInterface()));
+		list.append(i18n("State: %1").tqarg(m_tooltips[state]));
 	}
 	return list;
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
index ea88749..8dab95a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
@@ -124,7 +124,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
 			{
 				TQString title = info->getName();
 				if (ip)
-					title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
+					title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
 
 				NetworkMenuItem* item = new NetworkMenuItem(d->dev, cellularconn, TQT_TQOBJECT(menu));
 
@@ -148,7 +148,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
 			{
 				TQString title = info->getName();
 				if (ip)
-					title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
+					title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
 
 				NetworkMenuItem* item = new NetworkMenuItem(d->dev, cellularconn, TQT_TQOBJECT(menu));
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
index 84217cc..b637b70 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
@@ -26,7 +26,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqiconset.h>
 #include <kiconloader.h>
@@ -48,9 +48,9 @@ CDMAWidgetImpl::CDMAWidgetImpl(Connection* conn, TQWidget* parent, const char* n
 {
 	_cdmasetting = dynamic_cast<ConnectionSettings::CDMA*> (conn->getSetting(NM_SETTING_CDMA_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingCdmaWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
index dfdae6d..c43f4ad 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
@@ -26,7 +26,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqiconset.h>
@@ -49,9 +49,9 @@ GSMWidgetImpl::GSMWidgetImpl(Connection* conn, TQWidget* parent, const char* nam
 {
 	_gsmsetting = dynamic_cast<ConnectionSettings::GSM*> (conn->getSetting(NM_SETTING_GSM_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingGsmWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
index 347d409..a97e0c0 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // knm headers
 #include "knetworkmanager-connection.h"
@@ -43,9 +43,9 @@ InfoWidgetImpl::InfoWidgetImpl(Connection* conn, TQWidget* parent, const char* n
 	_infosetting = dynamic_cast<ConnectionSettings::Info*> (conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
 
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingInfoWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
index 32a86a4..e43d646 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
@@ -26,7 +26,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhostaddress.h>
 
 #include "knetworkmanager-connection_setting_ipv4_widget.h"
@@ -41,9 +41,9 @@ IPv4WidgetImpl::IPv4WidgetImpl(Connection* conn, TQWidget* parent, const char* n
 {
 	_ipv4_setting = dynamic_cast<ConnectionSettings::IPv4*> (conn->getSetting(NM_SETTING_IP4_CONFIG_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingIPv4Widget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
index 98bcf38..4dff5ce 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqiconset.h>
@@ -51,9 +51,9 @@ PPPWidgetImpl::PPPWidgetImpl(Connection* conn, TQWidget* parent, const char* nam
 {
 	_pppsetting = dynamic_cast<ConnectionSettings::PPP*> (conn->getSetting(NM_SETTING_PPP_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingPppWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
index db40c9b..bdb2f82 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqiconset.h>
@@ -50,9 +50,9 @@ SerialWidgetImpl::SerialWidgetImpl(Connection* conn, TQWidget* parent, const cha
 {
 	_serialsetting = dynamic_cast<ConnectionSettings::Serial*> (conn->getSetting(NM_SETTING_SERIAL_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingSerialWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
     _mainWid->mBaudRate->setMaxValue(INT_MAX);
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
index 089a2f4..913996a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqiconset.h>
 #include <kiconloader.h>
@@ -50,9 +50,9 @@ VPNWidgetImpl::VPNWidgetImpl(Connection* conn, bool new_conn, TQWidget* parent,
 {
 	_vpnsetting = dynamic_cast<ConnectionSettings::VPN*> (conn->getSetting(NM_SETTING_VPN_SETTING_NAME));
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingVPNWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	Init();
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
index 11aeb0b..5f508fc 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
@@ -31,7 +31,7 @@
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 /* kde headers */
@@ -664,9 +664,9 @@ WirelessSecurityWidgetImpl::WirelessSecurityWidgetImpl(Connection* conn, bool ne
 	_ieee8021x_setting = dynamic_cast<IEEE8021x*> (conn->getSetting(NM_SETTING_802_1X_SETTING_NAME));
 	_new_conn = new_conn;
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingWirelessSecurityWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	TQTimer::singleShot(0, this, TQT_SLOT(slotInit()));	
 }
@@ -918,13 +918,13 @@ WirelessSecurityWidgetImpl::configureWidgets(SecurityMethods method)
 		{
 			for (TQValueList<TQWidget*>::iterator it = _widgets[i].begin(); it != _widgets[i].end(); ++it)
 			{
-				_mainWid->groupUseEncryption->layout()->remove(*it);
+				_mainWid->groupUseEncryption->tqlayout()->remove(*it);
 				(*it)->hide();
 			}
 			// remove extra widgets too
 			for (TQValueList<TQWidget*>::iterator it = _extra_widgets[i].begin(); it != _extra_widgets[i].end(); ++it)
 			{
-				_mainWid->groupUseEncryption->layout()->remove(*it);
+				_mainWid->groupUseEncryption->tqlayout()->remove(*it);
 				(*it)->hide();
 			}
 		}
@@ -933,14 +933,14 @@ WirelessSecurityWidgetImpl::configureWidgets(SecurityMethods method)
 	// show all widgets widgets for the selected security method
 	for (TQValueList<TQWidget*>::iterator it = _widgets[method].begin(); it != _widgets[method].end(); ++it)
 	{
-		_mainWid->groupUseEncryption->layout()->add(*it);
+		_mainWid->groupUseEncryption->tqlayout()->add(*it);
 		(*it)->show();
 	}
 
 	if (_mainWid->pbExtra->isOn())
 		for (TQValueList<TQWidget*>::iterator it = _extra_widgets[method].begin(); it != _extra_widgets[method].end(); ++it)
 		{
-			_mainWid->groupUseEncryption->layout()->add(*it);
+			_mainWid->groupUseEncryption->tqlayout()->add(*it);
 			(*it)->show();
 		}
 
@@ -954,13 +954,13 @@ WirelessSecurityWidgetImpl::slotExtraSettingsToggled(bool on)
 	if (on)
 		for (TQValueList<TQWidget*>::iterator it = _extra_widgets[_currentMethod].begin(); it != _extra_widgets[_currentMethod].end(); ++it)
 		{
-			_mainWid->groupUseEncryption->layout()->add(*it);
+			_mainWid->groupUseEncryption->tqlayout()->add(*it);
 			(*it)->show();
 		}
 	else
 		for (TQValueList<TQWidget*>::iterator it = _extra_widgets[_currentMethod].begin(); it != _extra_widgets[_currentMethod].end(); ++it)
 		{
-			_mainWid->groupUseEncryption->layout()->remove(*it);
+			_mainWid->groupUseEncryption->tqlayout()->remove(*it);
 			(*it)->hide();
 		}
 }
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
index 888e169..3cf6a9f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
@@ -25,7 +25,7 @@
 
 #include <tqwidget.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 
 #include <klistview.h>
@@ -51,7 +51,7 @@ class NetworkListViewItem : public KListViewItem
 	public:
 
 	NetworkListViewItem(TQListView* parent, WirelessNetwork& net)
-		: KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").arg(net.getStrength()))
+		: KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").tqarg(net.getStrength()))
 		, _net(net)
 	{
 		TQ_UINT8 strength = net.getStrength();
@@ -82,9 +82,9 @@ WirelessWidgetImpl::WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget
 	_hasName = !_info_setting->getName().isEmpty();
 	_new_conn = new_conn;
 
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingWirelessWidget(this);
-	layout->addWidget(_mainWid);
+	tqlayout->addWidget(_mainWid);
 
 	// FIXME hide this button until it is implemented
 	_mainWid->pbExpert->hide();
@@ -95,9 +95,9 @@ WirelessWidgetImpl::WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget
 void
 WirelessWidgetImpl::Init()
 {
-	TQVBoxLayout* layout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1);
 	_searchLine = new KListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder);
-	layout->addWidget(_searchLine);
+	tqlayout->addWidget(_searchLine);
 
 	connect(_mainWid->txtEssid, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEssidChanged(const TQString&)));
 	connect(_mainWid->lvEssids, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotEssidDoubleClicked(TQListViewItem*, const TQPoint&, int)) );
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
index d6431b6..219508f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
@@ -27,7 +27,7 @@ class WirelessDialog;
 // TQt includes
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqbitmap.h>
 #include <tqimage.h>
@@ -102,7 +102,7 @@ TQString DeviceTray::getTooltipText()
 	TQString tooltip = TQString();
 
 	if (!d->tooltips[state].isEmpty())
-		tooltip += i18n("State: %1").arg(d->tooltips[state]);
+		tooltip += i18n("State: %1").tqarg(d->tooltips[state]);
 
 	return tooltip;
 }
@@ -266,7 +266,7 @@ void DeviceTray::updateActiveConnection(NMDeviceState state)
 	{
 		Info* info = dynamic_cast<Info*>(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
 		if (info)
-			info->setTimestamp(TQDateTime::currentDateTime());
+			info->setTimestamp(TQDateTime::tqcurrentDateTime());
 	}
 }
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.h b/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
index 5291044..c172b7b 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
@@ -36,7 +36,7 @@
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqprogressbar.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
index ec6bf89..5a69cd5 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
@@ -29,7 +29,7 @@ class WirelessDialog;
 
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <tqpixmapcache.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
index 7d68c50..8891fc4 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
@@ -38,7 +38,7 @@
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqprogressbar.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
index 2f22613..b13563e 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
@@ -30,7 +30,7 @@
 #include <tqevent.h>
 #include <tqguardedptr.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <tqpixmapcache.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
index 7654ccd..8bd3f85 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
@@ -42,11 +42,11 @@ PluginManager::PluginManager(TQObject* parent, const char* name)
 	: TQObject(parent, name)
 {
 	// get list of available plugins
-	this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KNetworkManager/Plugin" )));
+	this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KNetworkManager/Plugin" )));
 
 	// a bit debug output
 	for(TQValueList<KPluginInfo*>::ConstIterator it = _plugins.begin(); it != _plugins.end(); ++it)
-		kdDebug() << k_funcinfo << TQString("Found Plugin '%1'").arg((*it)->pluginName()) << endl;
+		kdDebug() << k_funcinfo << TQString("Found Plugin '%1'").tqarg((*it)->pluginName()) << endl;
 }
 
 PluginManager::~PluginManager()
@@ -125,13 +125,13 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID)
 	// try to load Plugin
 	int error = 0;
 	KPluginInfo* info = infoForPluginID(pluginID);
-	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ),
-	                 TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error );
+	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::tqfromLatin1( "KNetworkManager/Plugin" ),
+	                 TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error );
 
 	// plugin loaded?
 	if (plugin)
 	{
-		kdDebug() << k_funcinfo << TQString(i18n("successfully loaded plugin '%1'")).arg(info->pluginName()) << endl;
+		kdDebug() << k_funcinfo << TQString(i18n("successfully loaded plugin '%1'")).tqarg(info->pluginName()) << endl;
 		_loadedPlugins.insert(info, plugin);
 	}
 	else
diff --git a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
index b4ce93b..553bd1f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
@@ -364,7 +364,7 @@ Storage::saveConnection(Connection* conn)
 		return false;
 
 	// let's get the config group for this connection
-	KConfigGroup grp(config, TQString("Connection_%1").arg(id));
+	KConfigGroup grp(config, TQString("Connection_%1").tqarg(id));
 	TQStringList settings_grps;
 	TQStringList secrets_grps;
 
@@ -427,7 +427,7 @@ Storage::saveConnectionSetting(Connection* conn, ConnectionSetting* setting, TQS
 		return false;
 
 	// get a group for this setting
-	setting_grp = TQString("ConnectionSetting_%1_%2").arg(id).arg(type);
+	setting_grp = TQString("ConnectionSetting_%1_%2").tqarg(id).tqarg(type);
 	KConfigGroup grp(config, setting_grp);
 
 	// write the type
@@ -437,8 +437,8 @@ Storage::saveConnectionSetting(Connection* conn, ConnectionSetting* setting, TQS
 	SettingsMap map = setting->toMap();
 	for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it)
 	{
-		kdDebug() << k_funcinfo << "  " << TQString("Value_%1").arg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl;
-		grp.writeEntry(TQString("Value_%1").arg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() ));
+		kdDebug() << k_funcinfo << "  " << TQString("Value_%1").tqarg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl;
+		grp.writeEntry(TQString("Value_%1").tqarg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() ));
 	}
 	return true;
 }
@@ -474,7 +474,7 @@ Storage::saveConnectionSecrets(Connection* conn, ConnectionSetting* setting, TQS
 	printf("Secrets storage requested: %d\n\r", storage_requested);
 
 	// get a group for this setting
-	setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
+	setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type);
 	KConfigGroup grp(config, setting_grp);
 
 	// write the type
@@ -484,12 +484,12 @@ Storage::saveConnectionSecrets(Connection* conn, ConnectionSetting* setting, TQS
 	SettingsMap map = setting->toSecretsMap(false);
 	for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it)
 	{
-		kdDebug() << k_funcinfo << "  " << TQString("Value_%1").arg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl;
+		kdDebug() << k_funcinfo << "  " << TQString("Value_%1").tqarg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl;
 		if (storage_requested == true) {
-			grp.writeEntry(TQString("Value_%1").arg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() ));
+			grp.writeEntry(TQString("Value_%1").tqarg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() ));
 		}
 		else {
-			grp.writeEntry(TQString("Value_%1").arg(it.key()), TQString("") );
+			grp.writeEntry(TQString("Value_%1").tqarg(it.key()), TQString("") );
 		}
 	}
 	return true;
@@ -527,7 +527,7 @@ Storage::hasSecretsStored(Connection* connection, ConnectionSetting* setting)
 		return false;
 
 	// get a group for this setting
-	TQString setting_grp_name = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
+	TQString setting_grp_name = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type);
 
 	TQMap<TQString, TQString> config_map = KGlobal::config()->entryMap(setting_grp_name);
 
@@ -565,7 +565,7 @@ Storage::restoreSecrets(Connection* connection, ConnectionSetting* setting)
 		return false;
 
 	// get a group for this setting
-	TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
+	TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type);
 
 	// restore the setting
 	return restoreSecrets(connection, setting_grp);
@@ -584,7 +584,7 @@ Storage::restoreVPNSecrets(Connection* connection, ConnectionSetting* setting)
 		return false;
 
 	// get a group for this setting
-	TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
+	TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type);
 
 	// restore the setting
 	return restoreVPNSecrets(connection, setting_grp);
@@ -605,7 +605,7 @@ Storage::deleteConnection(Connection* conn)
 		return false;
 
 	// let's get the config group for this connection
-	KConfigGroup grp(config, TQString("Connection_%1").arg(id));
+	KConfigGroup grp(config, TQString("Connection_%1").tqarg(id));
 
 
 	// delete all associated settings
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
index d3e5524..24a91a9 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
@@ -32,7 +32,7 @@ class WirelessDialog;
 #include <tqsignalmapper.h>
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <tqpixmapcache.h>
@@ -54,7 +54,7 @@ class WirelessDialog;
 #include <kmessagebox.h>
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 #include <tqdialog.h>
@@ -139,7 +139,7 @@ void NewSecretsDialog::init()
 	// show a message to the user that the connection failed
 	// and allow edit or cancel
 
-	TQLabel* label = new TQLabel(tqtr("    The connection %1 could not be established    ").arg(conn->getInfoSetting()->getName()), this);
+	TQLabel* label = new TQLabel(tqtr("    The connection %1 could not be established    ").tqarg(conn->getInfoSetting()->getName()), this);
 	TQPushButton* buttonEdit = new TQPushButton(tr("&Edit"), this);
 	TQPushButton* buttonCancel = new TQPushButton(tr("&Cancel"), this);
 	
@@ -277,8 +277,8 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 				KAction * deviceNewConnAction = 0;
 				if (dev_comp)
 				{
-					TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface());
-					TQString menuCaption = TQString("%1").arg(dev_comp->device()->getInterface());
+					TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface());
+					TQString menuCaption = TQString("%1").tqarg(dev_comp->device()->getInterface());
 					if (menuCaption.contains("eth", FALSE) > 0) {
 						menuCaption = menuCaption.insert(0, "Wired Connection (");
 					}
@@ -303,7 +303,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 			++it;
 			KAction * deviceNewConnAction = 0;
 			TQString menuCaption = "VPN Connection";
-			TQString actionName = TQString("new_connection_%1").arg("vpn");
+			TQString actionName = TQString("new_connection_%1").tqarg("vpn");
 			deviceNewConnAction = new KAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName);
 			newConnActionMenu->insert(deviceNewConnAction);
  		} else if ( devices == 1 ) {
@@ -331,11 +331,11 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 				if (!conn)
 					continue;
 
-				TQString actionName = TQString("disable_connection_%1_%2").arg(conn->getID()).arg(dev ? dev->getInterface() : "");
+				TQString actionName = TQString("disable_connection_%1_%2").tqarg(conn->getID()).tqarg(dev ? dev->getInterface() : "");
 				KAction * deviceNewConnAction = actionCollection ()->action (actionName);
 				TQString actionText = conn->getInfoSetting()->getName();
 				if (dev)
-					actionText += TQString(" (%1)").arg(dev->getInterface());
+					actionText += TQString(" (%1)").tqarg(dev->getInterface());
 
 				if (!deviceNewConnAction) {
 					deviceNewConnAction = new KAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName);
@@ -470,7 +470,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 			}
 			else {
 				// Get a group for this setting
-				TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
+				TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type);
 			
 				// Restore the settings
 				printf("Restoring VPN secret: %s\n\r", setting_grp.ascii());
@@ -629,7 +629,7 @@ void Tray::slotRemoveDeviceTrayComponent(Device* dev)
 			}
 
 			// remove the appropriate action
-			TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface());
+			TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface());
 			KAction * deviceNewConnAction = actionCollection ()->action (actionName);
 			
 			if (!deviceNewConnAction)
@@ -991,7 +991,7 @@ void Tray::updateActiveConnection(NMDeviceState state)
 		{
 			Info* info = dynamic_cast<Info*>(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
 			if (info)
-				info->setTimestamp(TQDateTime::currentDateTime());
+				info->setTimestamp(TQDateTime::tqcurrentDateTime());
 		}
 	}
 }
@@ -999,13 +999,13 @@ void Tray::updateActiveConnection(NMDeviceState state)
 void Tray::slotDeviceAddedNotify(Device* dev)
 {
 	kdDebug() << "Tray::slotDeviceAddedNotify" << endl;
-	KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->getInterface()) );
+	KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").tqarg(dev->getInterface()) );
 }
 
 void Tray::slotDeviceRemovedNotify(Device* dev)
 {
 	kdDebug() << "Tray::slotDeviceRemovedNotify" << endl;
-	KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->getInterface()) );
+	KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").tqarg(dev->getInterface()) );
 }
 
 void Tray::slotVPNBannerShow(const TQString& vpnbanner)
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.h b/knetworkmanager-0.8/src/knetworkmanager-tray.h
index 8de08b3..d301386 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.h
@@ -43,7 +43,7 @@
 #include <tqdialog.h>
 #include <tqwidget.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqprogressbar.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
index ffeb933..45ea830 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
@@ -63,7 +63,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(VPNConnection* conn, TQWidget*
 	, _conn(conn)
 {
 	this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic));
-	this->setCaption(i18n("VPN Authentication for %1").arg(conn->getInfoSetting()->getName()));
+	this->setCaption(i18n("VPN Authentication for %1").tqarg(conn->getInfoSetting()->getName()));
 	labelPixmap->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32));
 
 	// nice icons
@@ -109,7 +109,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(VPNConnection* conn, TQWidget*
 		widget->setFocus();
 
 	// resize
-	this->resize(minimumSizeHint());
+	this->resize(tqminimumSizeHint());
 }
 
 VPNAuthenticationDialog::~VPNAuthenticationDialog()
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
index 84daa0c..b81a3db 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
@@ -63,7 +63,7 @@ VPNService::VPNService(const TQString& serviceName, const TQString& service, TQO
 			VPNPlugin* vpnPlugin = dynamic_cast<VPNPlugin*>( plugMan->getPlugin(list.first()) );
 			if (vpnPlugin)
 			{
-				kdDebug() << k_funcinfo << i18n("Using VPN plugin '%1' for service '%2'").arg(list.first()).arg(serviceName) << endl;
+				kdDebug() << k_funcinfo << i18n("Using VPN plugin '%1' for service '%2'").tqarg(list.first()).tqarg(serviceName) << endl;
 				_vpnPlugin = vpnPlugin;
 			}
 		}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
index 575a963..328b01d 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
@@ -25,7 +25,7 @@
 // TQt includes
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqbitmap.h>
 #include <tqimage.h>
@@ -85,7 +85,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
 	ConnectionStore* connectionStore = ConnectionStore::getInstance();
 
 	// device title
-	Subhead* subhead = new Subhead (menu, "subhead", TQString("Wired Connection (%1)").arg(d->dev->getInterface()), SmallIcon("wired", TQIconSet::Automatic));
+	Subhead* subhead = new Subhead (menu, "subhead", TQString("Wired Connection (%1)").tqarg(d->dev->getInterface()), SmallIcon("wired", TQIconSet::Automatic));
 	menu->insertItem (subhead, -1, -1);
 
     // bolding subhead instead
@@ -121,7 +121,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
 				{
 					TQString title = info->getName();
 					if (ip)
-						title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
+						title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config"));
 	
 					NetworkMenuItem* item = new NetworkMenuItem(d->dev, wiredconn, TQT_TQOBJECT(menu));
 					connectionItems += 1;
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
index 1b13f8d..9bf44ed 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
@@ -25,7 +25,7 @@
 // TQt includes
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqbitmap.h>
 #include <tqimage.h>
@@ -83,7 +83,7 @@ TQStringList WirelessDeviceTray::getToolTipText()
 
 	AccessPoint * ap = d->dev->getActiveAccessPoint();
 	if (ap)
-		tooltip.append(i18n("Network: %1").arg(ap->getDisplaySsid()));
+		tooltip.append(i18n("Network: %1").tqarg(ap->getDisplaySsid()));
 
 	return tooltip;
 }
@@ -250,7 +250,7 @@ void WirelessDeviceTray::addMenuItems(KPopupMenu* menu)
 	TQT_DBusError err;
 
 	// device title
-	Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").arg(d->dev->getInterface()), SmallIcon("wireless", TQIconSet::Automatic));
+	Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").tqarg(d->dev->getInterface()), SmallIcon("wireless", TQIconSet::Automatic));
 	menu->insertItem (subhead, -1, -1);
 
     // bolding subhead instead
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index 47110a5..387d052 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -27,7 +27,7 @@
 
 #include <tqevent.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <tqpixmapcache.h>
@@ -94,20 +94,20 @@ TQString WirelessNetworkItem::getDisplayText()
 {
 	TQString security = "";
 	if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE && _net.getRsnFlags() != NM_802_11_AP_SEC_NONE)
-		security = TQString("(%1/%2)").arg(i18n("WPA")).arg(i18n("RSN"));
+		security = TQString("(%1/%2)").tqarg(i18n("WPA")).tqarg(i18n("RSN"));
 	else if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE)
-		security = TQString("(%1)").arg(i18n("WPA"));
+		security = TQString("(%1)").tqarg(i18n("WPA"));
 	else if (_net.getRsnFlags() != NM_802_11_AP_SEC_NONE)
-		security = TQString("(%2)").arg(i18n("RSN"));
+		security = TQString("(%2)").tqarg(i18n("RSN"));
 
 	Info* info = NULL;
 	if (_conn)
 		info = _conn->getInfoSetting();
 
 	if (info && info->getName() != _net.getDisplaySsid())
-		return TQString("%2/%1 %3").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(info->getName()).arg(security);
+		return TQString("%2/%1 %3").tqarg(TQString::fromUtf8(_net.getDisplaySsid())).tqarg(info->getName()).tqarg(security);
 	else
-		return TQString("%1 %2").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(security);
+		return TQString("%1 %2").tqarg(TQString::fromUtf8(_net.getDisplaySsid())).tqarg(security);
 }
 
 void
@@ -115,35 +115,35 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
 {
 	int spacer = 0;
 	pbarStrength->setTotalSteps (100);
-	pbarStrength->setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
+	pbarStrength->tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
 	pbarStrength->setFixedHeight (_height - 2);
 	pbarStrength->setProgress (_net.getStrength());
 	pbarStrength->setPercentageVisible (false);
 
 	if (highlighted) {
-		p->setPen(parent->palette ().active ().highlightedText ());
+		p->setPen(parent->tqpalette ().active ().highlightedText ());
 		pbarStrength->setBackgroundMode( TQt::PaletteHighlight, TQt::PaletteHighlight );
 	} else {
-		p->setPen(parent->palette ().active ().text ());
+		p->setPen(parent->tqpalette ().active ().text ());
 	}
 	p->drawText   (x, y, w, h, AlignLeft | AlignVCenter | DontClip | ShowPrefix, getDisplayText());
 
 	if (_net.isEncrypted()) {
 		TQPixmap pmLock = SmallIcon ("lock", TQIconSet::Automatic);
-		p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
+		p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
 		spacer = pmLock.size ().width () + 4;
 	}
 
 	if (_adhoc) {
 		TQPixmap pmAdHoc = SmallIcon ("system", TQIconSet::Automatic);
-		p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
+		p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
 	} 
 	
-	p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
+	p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
 }
 
 TQSize
-WirelessNetworkItem::sizeHint ()
+WirelessNetworkItem::tqsizeHint ()
 {
 	return TQSize (_width, _height);
 }
@@ -169,7 +169,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
 	// figure out the height of the text
 	_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
 	// the item is height of the text plus the default frame width
-	_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
+	_height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
 	/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
 	if (_height < _widgetHeight) {
 		_height = _widgetHeight + 2;
@@ -177,8 +177,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
 
 	/* border required for pmLock and pbarStrength */
 	_border = 1;
-	if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
-		_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
+	if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
+		_border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
 	if (_border == 0)
 		_border ++;
 
@@ -209,7 +209,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
 	// figure out the height of the text
 	_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
 	// the item is height of the text plus the default frame width
-	_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
+	_height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
 	/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
 	if (_height < _widgetHeight) {
 		_height = _widgetHeight + 2;
@@ -217,8 +217,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
 
 	/* border required for pmLock and pbarStrength */
 	_border = 1;
-	if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
-		_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
+	if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
+		_border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
 	if (_border == 0)
 		_border ++;
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
index 9f1b74a..c66c694 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
@@ -38,7 +38,7 @@
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqprogressbar.h>
@@ -60,7 +60,7 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
 	  TQProgressBar* pbarStrength;
 
 	  void  paint    (TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
-	  TQSize sizeHint ();
+	  TQSize tqsizeHint ();
 
 	public slots:
 		void slotActivate();
diff --git a/knetworkmanager-0.8/src/sha1.cpp b/knetworkmanager-0.8/src/sha1.cpp
index 74f4df9..8525ed2 100644
--- a/knetworkmanager-0.8/src/sha1.cpp
+++ b/knetworkmanager-0.8/src/sha1.cpp
@@ -328,7 +328,7 @@ Minor changes to match the coding style used in Dynamics.
 
 Modified September 24, 2004
 By Jouni Malinen <[email protected]>
-Fixed alignment issue in SHA1Transform when SHA1HANDSOFF is defined.
+Fixed tqalignment issue in SHA1Transform when SHA1HANDSOFF is defined.
 
 */
 
diff --git a/knetworkmanager-0.8/src/vpnauthentication.ui b/knetworkmanager-0.8/src/vpnauthentication.ui
index 124fa55..0c49472 100644
--- a/knetworkmanager-0.8/src/vpnauthentication.ui
+++ b/knetworkmanager-0.8/src/vpnauthentication.ui
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -78,7 +78,7 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -92,7 +92,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
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 020df5a..0593a08 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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_openvpnWidget = new OpenVPNConfigWidget(this);
-	layout->addWidget(_openvpnWidget);
+	tqlayout->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::fromLatin1(buffer, len), false );
+	TQStringList cipherModes = TQStringList::split("\n", TQString::tqfromLatin1(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::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn);
+		*cipherHelper << TQString::tqfromLatin1("%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))
@@ -275,7 +275,7 @@ void OpenVPNConfig::setVPNData(const TQStringList& routes, const TQMap<TQString,
 		}
 		else
 		{
-			kdDebug() << TQString("OpenVPN: Property '%1' not handled").arg(entry) << endl;
+			kdDebug() << TQString("OpenVPN: Property '%1' not handled").tqarg(entry) << endl;
 		}
 	}
 
@@ -516,9 +516,9 @@ bool OpenVPNConfig::isValid(TQStringList& err_msg)
 OpenVPNAuthentication::OpenVPNAuthentication(TQWidget* parent, char* name)
 	: VPNAuthenticationWidget(parent, name)
 {
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_openvpnAuth = new OpenVPNAuthenticationWidget(this);
-	layout->addWidget(_openvpnAuth);
+	tqlayout->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 95d58d0..c78f524 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 <layout.h>
+#include <tqlayout.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 3bea9b4..4cb6578 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <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 a6d0945..c136050 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="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -444,7 +444,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <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 452fb23..091b400 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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_pptpWidget = new PPTPConfigWidget(this);
-	layout->addWidget(_pptpWidget);
+	tqlayout->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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_pptpAuth = new PPTPAuthenticationWidget(this);
-	layout->addWidget(_pptpAuth);
+	tqlayout->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 4bce41f..d703743 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 <layout.h>
+#include <tqlayout.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 4078684..5388561 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="sizeHint">
+            <property name="tqsizeHint">
                 <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 c966535..b57e065 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="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>30</height>
@@ -99,7 +99,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -124,7 +124,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>220</width>
                                 <height>20</height>
@@ -141,7 +141,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <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 39a512c..37cee81 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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_strongswanWidget = new StrongswanConfigWidget(this);
-	layout->addWidget(_strongswanWidget);
+	tqlayout->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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_strongswanAuth = new StrongswanAuthenticationWidget(this);
-	layout->addWidget(_strongswanAuth);
+	tqlayout->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 92c3aa5..74f82a5 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 <layout.h>
+#include <tqlayout.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 244a6ac..332d3c8 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <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 a728a1d..d55c066 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="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -197,7 +197,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>51</height>
@@ -214,7 +214,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <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 5bab84c..526d5d5 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* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_vpncWidget = new VPNCConfigWidget(this);
-	layout->addWidget(_vpncWidget);
+	tqlayout->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").arg(linedata));
+					KMessageBox::information(this, TQString("Your group password is: %1\n\r\n\rYou will need this information when you log on").tqarg(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").arg(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));
 				}
 			}
 		}
@@ -344,9 +344,9 @@ bool VPNCConfig::isValid(TQStringList& err_msg)
 VPNCAuthentication::VPNCAuthentication(TQWidget* parent, char* name)
 	: VPNAuthenticationWidget(parent, name)
 {
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_vpncAuth = new VPNCAuthenticationWidget(this);
-	layout->addWidget(_vpncAuth);
+	tqlayout->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 9fdcdec..429bc55 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 <layout.h>
+#include <tqlayout.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 c9fbd43..ab2b8fc 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="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -253,7 +253,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>