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

18 files changed, 131 insertions, 131 deletions

diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 0a02012..25c9373 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1451,12 +1451,12 @@ sub gst_parse_xml
 sub gst_parse_xml_child_names
 {
   my ($file, $varpath) = @_;
-  my ($model, $branch, @tqchildren);
+  my ($model, $branch, @children);
 
   ($model) = &gst_xml_model_scan ($file);
   $branch  = &gst_xml_model_find ($model, $varpath);
 
-  if (!$branch) { return @tqchildren; }
+  if (!$branch) { return @children; }
 
   my @list = @$branch;
   shift @list;  # Attributes
@@ -1465,7 +1465,7 @@ sub gst_parse_xml_child_names
   {
     if ($list [0] ne "__unparsed__" && $list [0] ne "0")
     {
-      push @tqchildren, shift @list;
+      push @children, shift @list;
     }
     else
     {
@@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names
     shift @list;
   }
 
-  return @tqchildren;
+  return @children;
 }
 
 sub gst_parse_alchemist
@@ -1505,7 +1505,7 @@ sub gst_parse_alchemist_print_option
 
   return undef if (!$branch);
 
-  $options = &gst_xml_model_get_tqchildren ($branch);
+  $options = &gst_xml_model_get_children ($branch);
 
   foreach $o (@$options)
   {
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 8114f19..a72e3ef 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1457,22 +1457,22 @@ sub gst_replace_alchemist_ensure_list_types
   for $elem (@path)
   {
     next if ($elem eq "");
-    my @tqchildren = @$branch;
-    shift @tqchildren;  # Attributes
+    my @children = @$branch;
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         &gst_xml_model_set_attribute ($branch, "TYPE", "LIST");
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     last if ($branch == undef);
@@ -1532,7 +1532,7 @@ sub gst_replace_alchemist_print_option
 
   # See if option is already defined.
 
-  $options = &gst_xml_model_get_tqchildren ($branch);
+  $options = &gst_xml_model_get_children ($branch);
 
   foreach $o (@$options)
   {
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index cd2201c..b9810c6 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse
   my ($tree, $indent) = @_;
   my ($string);
 
-  my @tqchildren = @$tree;
-  shift @tqchildren;  # Attributes
+  my @children = @$tree;
+  shift @children;  # Attributes
 
-  while (@tqchildren)
+  while (@children)
   {
-    my $branch = $tqchildren [1];
+    my $branch = $children [1];
 
-    if ($tqchildren [0] eq "__unparsed__")
+    if ($children [0] eq "__unparsed__")
     {
-      $string .= "<" . $tqchildren [1] . ">";
+      $string .= "<" . $children [1] . ">";
     }
-    elsif ($tqchildren [0] eq "0")
+    elsif ($children [0] eq "0")
     {
-      $string .= $tqchildren [1];
+      $string .= $children [1];
     }
     elsif (@$branch == 1)  # Empty tag.
     {
-      $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>";
+      $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>";
     }
     else
     {
-      $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">";
+      $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">";
       $string .= &gst_xml_model_print_recurse ($branch);
-      $string .= "</" . $tqchildren [0] . ">";
+      $string .= "</" . $children [0] . ">";
     }
 
-    shift @tqchildren;
-    shift @tqchildren;
+    shift @children;
+    shift @children;
   }
 
 #  if ($branch)
@@ -825,21 +825,21 @@ sub gst_xml_model_find
   for $elem (@path)
   {
     next if ($elem eq "");
-    my @tqchildren = @$branch;
-    shift @tqchildren;  # Attributes
+    my @children = @$branch;
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     last if ($branch == undef);
@@ -890,23 +890,23 @@ sub gst_xml_model_ensure
   {
     next if ($elem eq "");
 
-    my @tqchildren = @$branch;
+    my @children = @$branch;
     my $parent_branch = $branch;
 
-    shift @tqchildren;  # Attributes
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     if ($branch == undef)
@@ -950,22 +950,22 @@ sub gst_xml_model_remove
   return -1;
 }
 
-sub gst_xml_model_get_tqchildren
+sub gst_xml_model_get_children
 {
   my ($branch) = @_;
-  my (@tqchildren);
+  my (@children);
 
-  if (!$branch) { return \@tqchildren; }
+  if (!$branch) { return \@children; }
 
   for ($i = 1; $i < @$branch; $i += 2)
   {
     if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0")
     {
-      push @tqchildren, @$branch [$i + 1];
+      push @children, @$branch [$i + 1];
     }
   }
 
-  return \@tqchildren;
+  return \@children;
 }
 
 sub gst_xml_model_get_pcdata
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 361f893..d68dffe 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -58,7 +58,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     kpbCancel->setText( i18n( "&Cancel" ) );
     TQToolTip::add( kpbCancel, i18n( "Forget changes" ) );
 
-    //Creat and add the KAddDeviceDlg widget to the main tqlayout
+    //Creat and add the KAddDeviceDlg widget to the main layout
     addDlg = new KAddDeviceDlg(this);
     mainLayout->addWidget(addDlg);
     mainLayout->setResizeMode(TQLayout::Auto);
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index e4c118e..97b4792 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index 2066705..60a720f 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -22,13 +22,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -252,7 +252,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -352,7 +352,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index 4bacfab..f79401d 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -12,13 +12,13 @@
             <height>81</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -44,7 +44,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>16</height>
@@ -69,7 +69,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -116,7 +116,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 397df4c..c111143 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -70,7 +70,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>180</width>
                     <height>20</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout25</cstring>
+                        <cstring>layout25</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -174,7 +174,7 @@
                             <property name="name">
                                 <cstring>kpbAddHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -191,7 +191,7 @@
                             <property name="name">
                                 <cstring>kpbEditHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -208,7 +208,7 @@
                             <property name="name">
                                 <cstring>kpbRemoveHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
index e4ad380..af91fc8 100644
--- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index 0986db4..37098be 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -43,7 +43,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -54,7 +54,7 @@
             <property name="name">
                 <cstring>label</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>150</width>
                     <height>0</height>
@@ -74,7 +74,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index a769705..2a5c4c0 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){
   if (item != NULL)
   {
     TQString currentDevice = item->text(0);
-    configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice));
+    configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice));
     KNetworkInterface *dev = getDeviceInfo(currentDevice);
     KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension();
 
@@ -677,9 +677,9 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){
   KInterfaceUpDownDlg* dialog = new KInterfaceUpDownDlg(this,"Changing device state");
 
   if (state == DEVICE_UP)
-    dialog->label->setText(i18n("Enabling interface <b>%1</b>").tqarg(dev));
+    dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev));
   else
-    dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev));
+    dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev));
 
   dialog->setModal(true);
   dialog->show();
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index d5cf482..467ad67 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
 #include <kpopupmenu.h>
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index 2405333..7e2a4da 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>510</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -71,7 +71,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout16</cstring>
+                            <cstring>layout16</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -95,7 +95,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>301</width>
                                         <height>20</height>
@@ -177,7 +177,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -231,7 +231,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>230</height>
@@ -306,7 +306,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>181</width>
                                                 <height>0</height>
@@ -358,7 +358,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>0</height>
@@ -385,13 +385,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>70</width>
                                                 <height>0</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>65</width>
                                                 <height>32767</height>
@@ -415,7 +415,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>90</height>
@@ -462,7 +462,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -478,7 +478,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>20</height>
@@ -523,7 +523,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>16</height>
@@ -534,7 +534,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout25</cstring>
+                                    <cstring>layout25</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -550,7 +550,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
@@ -561,7 +561,7 @@
                                         <property name="name">
                                             <cstring>kpbAddDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -578,7 +578,7 @@
                                         <property name="name">
                                             <cstring>kpbEditDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -595,7 +595,7 @@
                                         <property name="name">
                                             <cstring>kpbRemoveDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -618,7 +618,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
@@ -669,7 +669,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout20</cstring>
+                                    <cstring>layout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -679,7 +679,7 @@
                                         <property name="name">
                                             <cstring>kpbAddKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -696,7 +696,7 @@
                                         <property name="name">
                                             <cstring>kpbEditKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -713,7 +713,7 @@
                                         <property name="name">
                                             <cstring>kpbRemoveKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -807,7 +807,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout28</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -857,7 +857,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>51</height>
@@ -876,7 +876,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>150</height>
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index e6aa338..5f4d44e 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -38,7 +38,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
   if (pathToProgram.isEmpty())
   {
     KMessageBox::error(0,
-                        i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that  \n{KDE_PATH}/%1 \nfile is present.").tqarg(BACKEND_PATH),
+                        i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that  \n{KDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH),
                         i18n("Could Not Find Network Configuration Backend Script"));
       dialog->close();
       //kapp->quit();
@@ -301,7 +301,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
 //  KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
   KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
   dialog->setCaption(i18n("Reloading Network"));
-  dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
+  dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>"));
   dialog->show();
 
   xmlOuput = "";
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index f25c99d..2deac9e 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -17,7 +17,7 @@
 
 #include <klocale.h>
 #include <kcmodule.h>
-#include <tqlayout.h> 
+#include <layout.h> 
 #include <version.h>
 #include "knetworkconfmodule.h"
 
@@ -110,7 +110,7 @@ KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"
 
 TQString KNetworkConfModule::quickHelp() const
 {
-  return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>");
+  return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
 }
 
 //#include "knetworkconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index 579f0e4..dc30c12 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -60,9 +60,9 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
   if ( !item )
     return;
  
-  const TQRect tqitemRect = listView->tqitemRect( item );
+  const TQRect itemRect = listView->itemRect( item );
  
-  if ( !tqitemRect.isValid() )
+  if ( !itemRect.isValid() )
     return;
   
   const int col = listView->header()->sectionAt( p.x() );
@@ -75,7 +75,7 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
   if ( !headerRect.isValid() )
     return;
  
-  const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width() + 60, tqitemRect.height() );
+  const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width() + 60, itemRect.height() );
  
   TQString tipStr;
  
@@ -91,31 +91,31 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
       {
         if (device->getType() != LOOPBACK_IFACE_TYPE)
         {
-          tipStr.append(i18n("<p><b>Interface:</b> %1").tqarg(device->getDeviceName().latin1()));
-          tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType()));
+          tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1()));
+          tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType()));
           TQString bootProto;
           if (device->getBootProto() == "none")
             bootProto = "Manual";
           else
             bootProto = device->getBootProto();
-          tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto));
+          tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto));
           if (bootProto != "dhcp")
           {
-            tipStr.append(i18n("<br><b>IP Address:</b>   %1").tqarg(device->getIpAddress()));
-            tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").tqarg(device->getBroadcast()));
+            tipStr.append(i18n("<br><b>IP Address:</b>   %1").arg(device->getIpAddress()));
+            tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast()));
           }  
-          tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot()));    
+          tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot()));    
         }
       }
       KRoutingInfo *route = profile->getRoutingInfo();
-      tipStr.append(i18n("</p><p><b>Default Gateway:</b>   %1").tqarg(route->getGateway()));
+      tipStr.append(i18n("</p><p><b>Default Gateway:</b>   %1").arg(route->getGateway()));
       KDNSInfo *dns = profile->getDNSInfo();
-      tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName()));
-      tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName()));
+      tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName()));
+      tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(dns->getMachineName()));
       TQStringList nameServers = dns->getNameServers();
       for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it)
       {
-        tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").tqarg((*it)));
+        tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it)));
       }
     }  
   }
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 9a1f62d..705396e 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -12,13 +12,13 @@
             <height>130</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>342</width>
             <height>130</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>342</width>
             <height>130</height>
@@ -32,7 +32,7 @@
     </property>
     <widget class="TQLabel">
         <property name="name">
-            <cstring>tlNetworktqStatus</cstring>
+            <cstring>tlNetworkStatus</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -50,7 +50,7 @@
         <property name="text">
             <string></string>
         </property>
-        <property name="tqalignment">
+        <property name="alignment">
             <set>AlignCenter</set>
         </property>
     </widget>
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui
index 2bbfd95..496502b 100644
--- a/knetworkconf/knetworkconf/kselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>130</width>
                     <height>20</height>