TDE
/
wlassistant
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/wlassistant
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/wlassistant@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 197fa69548
commit abbf0b157f
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

10
src/netlistviewitem.h
Unescape View File

@ -31,11 +31,11 @@
class NetListViewItem : public KListViewItem class NetListViewItem : public KListViewItem
{ {
public: public:
//NetListViewItem(KListView *tqparent) : KListViewItem(tqparent) {} //NetListViewItem(KListView *parent) : KListViewItem(parent) {}
//NetListViewItem(KListView *tqparent, KListViewItem *after) : KListViewItem(tqparent, after) {} //NetListViewItem(KListView *parent, KListViewItem *after) : KListViewItem(parent, after) {}
//NetListViewItem(KListView *tqparent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(tqparent, after, essid, mode) {} //NetListViewItem(KListView *parent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(parent, after, essid, mode) {}
NetListViewItem(KListView *tqparent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 ) NetListViewItem(KListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
: KListViewItem(tqparent, TQString(), TQString(), TQString(), TQString(), TQString()) : KListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString())
{ {
mEssid = essid; mEssid = essid;
mChannel = chan; mChannel = chan;

10
src/netparams.h
Unescape View File

@ -43,7 +43,7 @@ public:
bool dhcp; bool dhcp;
TQString ip; TQString ip;
TQString nettqmask; TQString netmask;
TQString broadcast; TQString broadcast;
TQString gateway; TQString gateway;
TQString domain; TQString domain;
@ -90,7 +90,7 @@ public:
TQString netParamsString() TQString netParamsString()
{ {
TQStringList mNPS; 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) << \ preConnectionCommand << TQString::number(preConnectionTimeout) << boolToString(preConnectionDetached) << \
postConnectionCommand << TQString::number(postConnectionTimeout) << boolToString(postConnectionDetached) << \ postConnectionCommand << TQString::number(postConnectionTimeout) << boolToString(postConnectionDetached) << \
preDisconnectionCommand << TQString::number(preDisconnectionTimeout) << boolToString(preDisconnectionDetached) << \ preDisconnectionCommand << TQString::number(preDisconnectionTimeout) << boolToString(preDisconnectionDetached) << \
@ -116,7 +116,7 @@ public:
wepKey = nps.section(",",6,6); wepKey = nps.section(",",6,6);
dhcp = ( nps.section(",",7,7) == "true" ); dhcp = ( nps.section(",",7,7) == "true" );
ip = nps.section(",",8,8); ip = nps.section(",",8,8);
nettqmask = nps.section(",",9,9); netmask = nps.section(",",9,9);
broadcast = nps.section(",",10,10); broadcast = nps.section(",",10,10);
gateway = nps.section(",",11,11); gateway = nps.section(",",11,11);
domain = nps.section(",",12,12); domain = nps.section(",",12,12);
@ -234,8 +234,8 @@ public:
} else if (action=="ifconfig_manual") { } else if (action=="ifconfig_manual") {
mCmd << ifconfig << np.iface << np.ip; mCmd << ifconfig << np.iface << np.ip;
if (!np.nettqmask.isEmpty()) if (!np.netmask.isEmpty())
mCmd << "nettqmask" << np.nettqmask; mCmd << "netmask" << np.netmask;
if (!np.broadcast.isEmpty()) if (!np.broadcast.isEmpty())
mCmd << "broadcast" << np.broadcast; mCmd << "broadcast" << np.broadcast;

6
src/ui_NetParamsEdit.ui
Unescape View File

@ -224,7 +224,7 @@
</property> </property>
<widget class="TQLineEdit" row="2" column="1"> <widget class="TQLineEdit" row="2" column="1">
<property name="name"> <property name="name">
<cstring>nettqmask</cstring> <cstring>netmask</cstring>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
@ -232,7 +232,7 @@
<cstring>textLabel4</cstring> <cstring>textLabel4</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Nettqmask:</string> <string>Netmask:</string>
</property> </property>
</widget> </widget>
<widget class="TQLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
@ -1094,7 +1094,7 @@
<tabstop>radioManualConfig</tabstop> <tabstop>radioManualConfig</tabstop>
<tabstop>ip</tabstop> <tabstop>ip</tabstop>
<tabstop>broadcast</tabstop> <tabstop>broadcast</tabstop>
<tabstop>nettqmask</tabstop> <tabstop>netmask</tabstop>
<tabstop>gateway</tabstop> <tabstop>gateway</tabstop>
<tabstop>domain</tabstop> <tabstop>domain</tabstop>
<tabstop>dns1</tabstop> <tabstop>dns1</tabstop>

6
src/ui_NetParamsWizard.ui
Unescape View File

@ -348,7 +348,7 @@
<cstring>textLabel3</cstring> <cstring>textLabel3</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Nettqmask:</string> <string>Netmask:</string>
</property> </property>
<property name="tqalignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
@ -391,7 +391,7 @@
</widget> </widget>
<widget class="TQLineEdit" row="2" column="1"> <widget class="TQLineEdit" row="2" column="1">
<property name="name"> <property name="name">
<cstring>nettqmask</cstring> <cstring>netmask</cstring>
</property> </property>
<property name="maxLength"> <property name="maxLength">
<number>32767</number> <number>32767</number>
@ -879,7 +879,7 @@
<tabstop>buttonGroup3</tabstop> <tabstop>buttonGroup3</tabstop>
<tabstop>ip</tabstop> <tabstop>ip</tabstop>
<tabstop>broadcast</tabstop> <tabstop>broadcast</tabstop>
<tabstop>nettqmask</tabstop> <tabstop>netmask</tabstop>
<tabstop>gateway</tabstop> <tabstop>gateway</tabstop>
<tabstop>domain</tabstop> <tabstop>domain</tabstop>
<tabstop>dns1</tabstop> <tabstop>dns1</tabstop>

8
src/ui_netparamsedit.cpp
Unescape View File

@ -34,8 +34,8 @@
#include <kiconloader.h> #include <kiconloader.h>
ui_NetParamsEdit::ui_NetParamsEdit(TQWidget* tqparent, const char* name, bool modal, WFlags fl) ui_NetParamsEdit::ui_NetParamsEdit(TQWidget* parent, const char* name, bool modal, WFlags fl)
: netProperties(tqparent,name, modal,fl) : netProperties(parent,name, modal,fl)
{ {
buttonHelp->hide(); buttonHelp->hide();
buttonOk->setIconSet( SmallIconSet("ok") ); buttonOk->setIconSet( SmallIconSet("ok") );
@ -97,7 +97,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np )
ip->setText(np.ip); ip->setText(np.ip);
broadcast->setText( np.broadcast ); broadcast->setText( np.broadcast );
nettqmask->setText( np.nettqmask ); netmask->setText( np.netmask );
gateway->setText( np.gateway ); gateway->setText( np.gateway );
domain->setText( np.domain ); domain->setText( np.domain );
dns1->setText( np.dns1 ); dns1->setText( np.dns1 );
@ -129,7 +129,7 @@ WANetParams ui_NetParamsEdit::readNetParams( WANetParams & np )
np.dhcp = radioDhcp->isChecked(); np.dhcp = radioDhcp->isChecked();
np.ip = ip->text(); np.ip = ip->text();
np.broadcast = broadcast->text(); np.broadcast = broadcast->text();
np.nettqmask = nettqmask->text(); np.netmask = netmask->text();
np.gateway = gateway->text(); np.gateway = gateway->text();
np.domain = domain->text(); np.domain = domain->text();
np.dns1 = dns1->text(); np.dns1 = dns1->text();

2
src/ui_netparamsedit.h
Unescape View File

@ -31,7 +31,7 @@ class ui_NetParamsEdit : public netProperties
TQ_OBJECT TQ_OBJECT
public: 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(); ~ui_NetParamsEdit();
/*$PUBLIC_FUNCTIONS$*/ /*$PUBLIC_FUNCTIONS$*/
//void setWepEnabled( bool w ); //void setWepEnabled( bool w );

6
src/ui_netparamswizard.cpp
Unescape View File

@ -30,8 +30,8 @@
#include <kiconloader.h> #include <kiconloader.h>
ui_NetParamsWizard::ui_NetParamsWizard(TQWidget* tqparent, const char* name, bool modal, WFlags fl) ui_NetParamsWizard::ui_NetParamsWizard(TQWidget* parent, const char* name, bool modal, WFlags fl)
: NetParamsWizard(tqparent,name, modal,fl) : NetParamsWizard(parent,name, modal,fl)
{ {
backButton()->setIconSet( SmallIconSet("back") ); backButton()->setIconSet( SmallIconSet("back") );
nextButton()->setIconSet( SmallIconSet("forward") ); nextButton()->setIconSet( SmallIconSet("forward") );
@ -79,7 +79,7 @@ WANetParams ui_NetParamsWizard::readNetParams( WANetParams & np )
if (!np.dhcp) { // manual configuration option selected if (!np.dhcp) { // manual configuration option selected
np.ip = ip->text(); np.ip = ip->text();
np.broadcast = broadcast->text(); np.broadcast = broadcast->text();
np.nettqmask = nettqmask->text(); np.netmask = netmask->text();
np.gateway = gateway->text(); np.gateway = gateway->text();
np.domain = domain->text(); np.domain = domain->text();
np.dns1 = dns1->text(); np.dns1 = dns1->text();

2
src/ui_netparamswizard.h
Unescape View File

@ -31,7 +31,7 @@ class ui_NetParamsWizard : public NetParamsWizard
TQ_OBJECT TQ_OBJECT
public: 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(); ~ui_NetParamsWizard();
/*$PUBLIC_FUNCTIONS$*/ /*$PUBLIC_FUNCTIONS$*/
void setWepEnabled( bool w ); void setWepEnabled( bool w );

4
src/wlassistant.cpp
Unescape View File

@ -48,8 +48,8 @@
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
WirelessAssistant::WirelessAssistant(TQWidget* tqparent, const char* name, bool modal, WFlags fl) WirelessAssistant::WirelessAssistant(TQWidget* parent, const char* name, bool modal, WFlags fl)
: mainWindow(tqparent,name, modal,fl) : mainWindow(parent,name, modal,fl)
{ {
buttonScan->setIconSet( SmallIconSet("reload") ); buttonScan->setIconSet( SmallIconSet("reload") );
buttonConnect->setIconSet( SmallIconSet("connect_creating") ); buttonConnect->setIconSet( SmallIconSet("connect_creating") );

2
src/wlassistant.h
Unescape View File

@ -40,7 +40,7 @@ class WirelessAssistant : public mainWindow
public: public:
/*$PUBLIC_FUNCTIONS$*/ /*$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(); ~WirelessAssistant();
static TQString getVal(const TQString & str, const TQString & rxs); static TQString getVal(const TQString & str, const TQString & rxs);

Write Preview
Loading…
Cancel
Save