16 files changed, 29 insertions, 29 deletions
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 6441761..42d1629 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -433,12 +433,12 @@ sub gst_network_ipv4_vec2str
 sub gst_network_ipv4_calc_subnet_vec
 {
   my ($addr, $tqmask) = @_;
-  my ($addrvec, $tqmaskvec);
+  my ($addrvec, $maskvec);
 
   $addrvec = &gst_network_ipv4_str2vec ($addr);
-  $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
+  $maskvec = &gst_network_ipv4_str2vec ($tqmask);
 
-  return $addrvec & $tqmaskvec;
+  return $addrvec & $maskvec;
 }
 
 # What you're looking for.
@@ -455,9 +455,9 @@ sub gst_network_ipv4_calc_bcast_vec
   my ($addr, $tqmask) = @_;
 
   $addrvec = &gst_network_ipv4_str2vec ($addr);
-  $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
+  $maskvec = &gst_network_ipv4_str2vec ($tqmask);
 
-  return $addrvec | ~$tqmaskvec;
+  return $addrvec | ~$maskvec;
 }
 
 # And this returning the quad-dot notation.
@@ -3531,7 +3531,7 @@ sub gst_network_pld10_get_ipaddr
 {
   my ($file, $key, $what) = @_;
   my ($ipaddr, $nettqmask, $ret, $i);
-	my @nettqmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
+	my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
 
   $ipaddr = &gst_parse_sh($file, $key);
   return undef if $ipaddr eq "";
@@ -3551,7 +3551,7 @@ sub gst_network_pld10_get_ipaddr
       $ret .= "255.";
     }
 
-    $ret .= "$nettqmask_prefixes[$b%8]." if $nettqmask < 32;
+    $ret .= "$netmask_prefixes[$b%8]." if $nettqmask < 32;
 
     for($i = int($nettqmask/8) + 1; $i < 4; $i++)
     {
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 30ec359..bac1f9a 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -477,7 +477,7 @@ sub gst_replace_join_hash
   return $res;
 }
 
-# Find $re matching send string and replace tqparenthesyzed
+# Find $re matching send string and replace parenthesyzed
 # part of $re with $value. FIXME: apply meeks' more general impl.
 sub gst_replace_chat
 {
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index 9421f75..dfd41cd 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -891,7 +891,7 @@ sub gst_xml_model_ensure
     next if ($elem eq "");
 
     my @tqchildren = @$branch;
-    my $tqparent_branch = $branch;
+    my $parent_branch = $branch;
 
     shift @tqchildren;  # Attributes
     $branch = undef;
@@ -918,8 +918,8 @@ sub gst_xml_model_ensure
 
       push @list, \%hash;
 
-      push @$tqparent_branch, $elem;
-      push @$tqparent_branch, $branch;
+      push @$parent_branch, $elem;
+      push @$parent_branch, $branch;
     }
   }
 
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 6690739..f8bba5d 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -128,7 +128,7 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
     {
       KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
     }    
-    else if (_advanced && !KAddressValidator::isNettqmaskValid(nettqmask))
+    else if (_advanced && !KAddressValidator::isNetmaskValid(nettqmask))
         KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address"));
         
     else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast))
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index dd99d94..a3f2a23 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -402,7 +402,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
index 31657ec..ebbca21 100644
--- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
@@ -147,7 +147,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddevicewifiext.ui b/knetworkconf/knetworkconf/kadddevicewifiext.ui
index 6b04eb6..6b60cf2 100644
--- a/knetworkconf/knetworkconf/kadddevicewifiext.ui
+++ b/knetworkconf/knetworkconf/kadddevicewifiext.ui
@@ -88,7 +88,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpassdlg.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index 57094a5..4bacfab 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -156,7 +156,7 @@
     <function returnType="bool">modified()</function>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 96cf559..397df4c 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -289,7 +289,7 @@
     <function access="private" specifier="non virtual">init()</function>
     <function specifier="non virtual" returnType="bool">modified()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp
index d7d23bc..f3fabe7 100644
--- a/knetworkconf/knetworkconf/kaddressvalidator.cpp
+++ b/knetworkconf/knetworkconf/kaddressvalidator.cpp
@@ -18,7 +18,7 @@
 #include "kaddressvalidator.h"
 
 /*
-  Class for validating IP address and nettqmasks, and to calculate network and broadcast values.
+  Class for validating IP address and netmasks, and to calculate network and broadcast values.
   The functions to do the last two things where taken from the code of ipcalc.c, made by
   Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. .
 */
@@ -53,7 +53,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){
   else
     return false;
 }
-bool KAddressValidator::isNettqmaskValid(TQString addr){
+bool KAddressValidator::isNetmaskValid(TQString addr){
   TQString s = "";
   int i;
   int number;
@@ -140,7 +140,7 @@ unsigned long int KAddressValidator::prefix2tqmask(int prefix){
   return htonl(~((2 << (31 - prefix)) - 1));
 }
 /** \fn int tqmask2prefix(unsigned long int tqmask)
-  \brief calculates the number of bits tqmasked off by a nettqmask.
+  \brief calculates the number of bits masked off by a nettqmask.
 
   This function calculates the significant bits in an IP address as specified by
   a nettqmask.  See also \ref prefix2tqmask.
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.h b/knetworkconf/knetworkconf/kaddressvalidator.h
index 5a05d84..fa8b8ca 100644
--- a/knetworkconf/knetworkconf/kaddressvalidator.h
+++ b/knetworkconf/knetworkconf/kaddressvalidator.h
@@ -19,7 +19,7 @@
 #define KADDRESSVALIDATOR_H
 
 /*
-  Class for validating IP address and nettqmasks, and to calculate network and broadcast values.
+  Class for validating IP address and netmasks, and to calculate network and broadcast values.
   The functions to do the last two things where taken from the code of ipcalc.c, made by
   Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. 
 */
@@ -43,7 +43,7 @@
 #include <netinet/in.h>
 #include <tqstring.h>
 
-/**Class that has simple methods for validating IP addresses, nettqmasks, calculating
+/**Class that has simple methods for validating IP addresses, netmasks, calculating
    broadcast and network addresses.
 
   *@author Juan Luis Baptiste
@@ -56,7 +56,7 @@ public:
   /** Validates if the address written by the user is a valid one. Return true if it is and false if not. */
   static bool isValidIPAddress(TQString addr);
   /** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */
-  static bool isNettqmaskValid(TQString addr);
+  static bool isNetmaskValid(TQString addr);
 /** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */
   static bool isNetworkValid(const TQString &addr);
 /** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */
@@ -103,7 +103,7 @@ private: // Private methods
  */
   static unsigned long int prefix2tqmask(int prefix);
   /** \fn int tqmask2prefix(unsigned long int tqmask)
-  \brief calculates the number of bits tqmasked off by a nettqmask.
+  \brief calculates the number of bits masked off by a nettqmask.
 
   This function calculates the significant bits in an IP address as specified by
   a nettqmask.  See also \ref prefix2tqmask.
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
index 8391d6c..e4ad380 100644
--- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
@@ -69,5 +69,5 @@
         <data format="PNG" length="983">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index ac0b9e0..0986db4 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -97,7 +97,7 @@
 <Q_SLOTS>
     <slot>close()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
 </includehints>
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index a184930..2405333 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -1072,7 +1072,7 @@
     <slot access="private">removeProfileSlot()</slot>
     <slot access="private">updateProfileSlot()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 816f4ab..9a1f62d 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -129,7 +129,7 @@ the changes can take effect.</string>
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui
index e982f42..2bbfd95 100644
--- a/knetworkconf/knetworkconf/kselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui
@@ -132,7 +132,7 @@
 <Q_SLOTS>
     <slot>exitSlot()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>klistbox.h</includehint>