rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/wlassistant@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 28 insertions, 28 deletions

diff --git a/src/netlistviewitem.h b/src/netlistviewitem.h
index 084c274..5b55f0a 100644
--- a/src/netlistviewitem.h
+++ b/src/netlistviewitem.h
@@ -31,11 +31,11 @@
 class NetListViewItem : public KListViewItem
 {
 public:
-        //NetListViewItem(KListView *tqparent) : KListViewItem(tqparent) {}
-        //NetListViewItem(KListView *tqparent, KListViewItem *after) : KListViewItem(tqparent, after) {}
-        //NetListViewItem(KListView *tqparent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(tqparent, after, essid, mode) {}
-        NetListViewItem(KListView *tqparent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
-                        : KListViewItem(tqparent, TQString(), TQString(), TQString(), TQString(), TQString())
+        //NetListViewItem(KListView *parent) : KListViewItem(parent) {}
+        //NetListViewItem(KListView *parent, KListViewItem *after) : KListViewItem(parent, after) {}
+        //NetListViewItem(KListView *parent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(parent, after, essid, mode) {}
+        NetListViewItem(KListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
+                        : KListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString())
         {
                 mEssid = essid;
                 mChannel = chan;
diff --git a/src/netparams.h b/src/netparams.h
index c6a81b8..9cc0d28 100644
--- a/src/netparams.h
+++ b/src/netparams.h
@@ -43,7 +43,7 @@ public:
 
         bool dhcp;
         TQString ip;
-        TQString nettqmask;
+        TQString netmask;
         TQString broadcast;
         TQString gateway;
         TQString domain;
@@ -90,7 +90,7 @@ public:
         TQString netParamsString()
         {
                 TQStringList mNPS;
-                mNPS << boolToString(hiddenEssid) << essid << ap << channel << boolToString(wep) << wepMode << wepKey << boolToString(dhcp) << ip << nettqmask << broadcast << gateway << domain << dns1 << dns2 << boolToString(wasHiddenEssid) << boolToString(wasWep) << \
+                mNPS << boolToString(hiddenEssid) << essid << ap << channel << boolToString(wep) << wepMode << wepKey << boolToString(dhcp) << ip << netmask << broadcast << gateway << domain << dns1 << dns2 << boolToString(wasHiddenEssid) << boolToString(wasWep) << \
 		preConnectionCommand << TQString::number(preConnectionTimeout) << boolToString(preConnectionDetached) << \
 		postConnectionCommand << TQString::number(postConnectionTimeout) << boolToString(postConnectionDetached) << \
 		preDisconnectionCommand << TQString::number(preDisconnectionTimeout) << boolToString(preDisconnectionDetached) << \
@@ -116,7 +116,7 @@ public:
                 wepKey = nps.section(",",6,6);
 		dhcp = ( nps.section(",",7,7) == "true" );
                 ip = nps.section(",",8,8);
-                nettqmask = nps.section(",",9,9);
+                netmask = nps.section(",",9,9);
                 broadcast = nps.section(",",10,10);
                 gateway = nps.section(",",11,11);
                 domain = nps.section(",",12,12);
@@ -234,8 +234,8 @@ public:
 
                 } else if (action=="ifconfig_manual") {
                         mCmd << ifconfig << np.iface << np.ip;
-                        if (!np.nettqmask.isEmpty())
-                                mCmd << "nettqmask" << np.nettqmask;
+                        if (!np.netmask.isEmpty())
+                                mCmd << "netmask" << np.netmask;
                         if (!np.broadcast.isEmpty())
                                 mCmd << "broadcast" << np.broadcast;
 
diff --git a/src/ui_NetParamsEdit.ui b/src/ui_NetParamsEdit.ui
index cda5a40..ea80838 100644
--- a/src/ui_NetParamsEdit.ui
+++ b/src/ui_NetParamsEdit.ui
@@ -224,7 +224,7 @@
 </property>
 <widget class="TQLineEdit" row="2" column="1">
 <property name="name">
-<cstring>nettqmask</cstring>
+<cstring>netmask</cstring>
 </property>
 </widget>
 <widget class="TQLabel" row="2" column="0">
@@ -232,7 +232,7 @@
 <cstring>textLabel4</cstring>
 </property>
 <property name="text">
-<string>Nettqmask:</string>
+<string>Netmask:</string>
 </property>
 </widget>
 <widget class="TQLineEdit" row="0" column="1">
@@ -1094,7 +1094,7 @@
 <tabstop>radioManualConfig</tabstop>
 <tabstop>ip</tabstop>
 <tabstop>broadcast</tabstop>
-<tabstop>nettqmask</tabstop>
+<tabstop>netmask</tabstop>
 <tabstop>gateway</tabstop>
 <tabstop>domain</tabstop>
 <tabstop>dns1</tabstop>
diff --git a/src/ui_NetParamsWizard.ui b/src/ui_NetParamsWizard.ui
index 5fc9192..1c933c4 100644
--- a/src/ui_NetParamsWizard.ui
+++ b/src/ui_NetParamsWizard.ui
@@ -348,7 +348,7 @@
 <cstring>textLabel3</cstring>
 </property>
 <property name="text">
-<string>Nettqmask:</string>
+<string>Netmask:</string>
 </property>
 <property name="tqalignment">
 <set>AlignVCenter|AlignRight</set>
@@ -391,7 +391,7 @@
 </widget>
 <widget class="TQLineEdit" row="2" column="1">
 <property name="name">
-<cstring>nettqmask</cstring>
+<cstring>netmask</cstring>
 </property>
 <property name="maxLength">
 <number>32767</number>
@@ -879,7 +879,7 @@
 <tabstop>buttonGroup3</tabstop>
 <tabstop>ip</tabstop>
 <tabstop>broadcast</tabstop>
-<tabstop>nettqmask</tabstop>
+<tabstop>netmask</tabstop>
 <tabstop>gateway</tabstop>
 <tabstop>domain</tabstop>
 <tabstop>dns1</tabstop>
diff --git a/src/ui_netparamsedit.cpp b/src/ui_netparamsedit.cpp
index ee4b588..1b757a8 100644
--- a/src/ui_netparamsedit.cpp
+++ b/src/ui_netparamsedit.cpp
@@ -34,8 +34,8 @@
 
 #include <kiconloader.h>
 
-ui_NetParamsEdit::ui_NetParamsEdit(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-                : netProperties(tqparent,name, modal,fl)
+ui_NetParamsEdit::ui_NetParamsEdit(TQWidget* parent, const char* name, bool modal, WFlags fl)
+                : netProperties(parent,name, modal,fl)
 {
         buttonHelp->hide();
         buttonOk->setIconSet( SmallIconSet("ok") );
@@ -97,7 +97,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np )
 
         ip->setText(np.ip);
         broadcast->setText( np.broadcast );
-        nettqmask->setText( np.nettqmask );
+        netmask->setText( np.netmask );
         gateway->setText( np.gateway );
         domain->setText( np.domain );
         dns1->setText( np.dns1 );
@@ -129,7 +129,7 @@ WANetParams ui_NetParamsEdit::readNetParams( WANetParams & np )
         np.dhcp = radioDhcp->isChecked();
         np.ip = ip->text();
         np.broadcast = broadcast->text();
-        np.nettqmask = nettqmask->text();
+        np.netmask = netmask->text();
         np.gateway = gateway->text();
         np.domain = domain->text();
         np.dns1 = dns1->text();
diff --git a/src/ui_netparamsedit.h b/src/ui_netparamsedit.h
index e1e13c9..12166cb 100644
--- a/src/ui_netparamsedit.h
+++ b/src/ui_netparamsedit.h
@@ -31,7 +31,7 @@ class ui_NetParamsEdit : public netProperties
   TQ_OBJECT
 
 public:
-        ui_NetParamsEdit(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        ui_NetParamsEdit(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
         ~ui_NetParamsEdit();
         /*$PUBLIC_FUNCTIONS$*/
 	//void setWepEnabled( bool w );
diff --git a/src/ui_netparamswizard.cpp b/src/ui_netparamswizard.cpp
index a2b46ce..de8c39f 100644
--- a/src/ui_netparamswizard.cpp
+++ b/src/ui_netparamswizard.cpp
@@ -30,8 +30,8 @@
 
 #include <kiconloader.h>
 
-ui_NetParamsWizard::ui_NetParamsWizard(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-                : NetParamsWizard(tqparent,name, modal,fl)
+ui_NetParamsWizard::ui_NetParamsWizard(TQWidget* parent, const char* name, bool modal, WFlags fl)
+                : NetParamsWizard(parent,name, modal,fl)
 {
         backButton()->setIconSet( SmallIconSet("back") );
         nextButton()->setIconSet( SmallIconSet("forward") );
@@ -79,7 +79,7 @@ WANetParams ui_NetParamsWizard::readNetParams( WANetParams & np )
         if (!np.dhcp) { // manual configuration option selected
                 np.ip = ip->text();
                 np.broadcast = broadcast->text();
-                np.nettqmask = nettqmask->text();
+                np.netmask = netmask->text();
                 np.gateway = gateway->text();
                 np.domain = domain->text();
                 np.dns1 = dns1->text();
diff --git a/src/ui_netparamswizard.h b/src/ui_netparamswizard.h
index e617176..26c9a58 100644
--- a/src/ui_netparamswizard.h
+++ b/src/ui_netparamswizard.h
@@ -31,7 +31,7 @@ class ui_NetParamsWizard : public NetParamsWizard
   TQ_OBJECT
 
 public:
-        ui_NetParamsWizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        ui_NetParamsWizard(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
         ~ui_NetParamsWizard();
         /*$PUBLIC_FUNCTIONS$*/
 	void setWepEnabled( bool w );
diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp
index 6569456..a179766 100644
--- a/src/wlassistant.cpp
+++ b/src/wlassistant.cpp
@@ -48,8 +48,8 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-WirelessAssistant::WirelessAssistant(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-                : mainWindow(tqparent,name, modal,fl)
+WirelessAssistant::WirelessAssistant(TQWidget* parent, const char* name, bool modal, WFlags fl)
+                : mainWindow(parent,name, modal,fl)
 {
         buttonScan->setIconSet( SmallIconSet("reload") );
         buttonConnect->setIconSet( SmallIconSet("connect_creating") );
diff --git a/src/wlassistant.h b/src/wlassistant.h
index 388935a..03a9c54 100644
--- a/src/wlassistant.h
+++ b/src/wlassistant.h
@@ -40,7 +40,7 @@ class WirelessAssistant : public mainWindow
 
 public:
         /*$PUBLIC_FUNCTIONS$*/
-        WirelessAssistant(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        WirelessAssistant(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
         ~WirelessAssistant();
 
         static TQString getVal(const TQString & str, const TQString & rxs);