From 2bc1d72869b62af05ae4feafd878203b526da8c5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lanbrowsing/kcmlisa/findnic.cpp | 28 ++++++++++++++-------------- lanbrowsing/kcmlisa/findnic.h | 2 +- lanbrowsing/kcmlisa/kcmkiolan.cpp | 4 ++-- lanbrowsing/kcmlisa/kcmkiolan.h | 2 +- lanbrowsing/kcmlisa/kcmlisa.cpp | 10 +++++----- lanbrowsing/kcmlisa/kcmlisa.h | 2 +- lanbrowsing/kcmlisa/kcmreslisa.cpp | 12 ++++++------ lanbrowsing/kcmlisa/kcmreslisa.h | 2 +- lanbrowsing/kcmlisa/main.cpp | 12 ++++++------ lanbrowsing/kcmlisa/portsettingsbar.cpp | 4 ++-- lanbrowsing/kcmlisa/portsettingsbar.h | 2 +- lanbrowsing/kcmlisa/setupwizard.cpp | 18 +++++++++--------- lanbrowsing/kcmlisa/setupwizard.h | 2 +- 13 files changed, 50 insertions(+), 50 deletions(-) (limited to 'lanbrowsing/kcmlisa') diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index 61996018..d7437848 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -128,10 +128,10 @@ NICList* findNICs() if (result==0) { sinptr = (struct sockaddr_in *) &ifcopy.ifr_addr; - tmp->nettqmask=inet_ntoa(sinptr->sin_addr); + tmp->netmask=inet_ntoa(sinptr->sin_addr); } else - tmp->nettqmask=i18n("Unknown"); + tmp->netmask=i18n("Unknown"); nl->append(tmp); break; @@ -159,14 +159,14 @@ NICList* findNICs() getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); tmp->addr = buf; - if (ifa->ifa_nettqmask != NULL) { + if (ifa->ifa_netmask != NULL) { #ifdef Q_OS_FREEBSD - struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_nettqmask; - tmp->nettqmask=inet_ntoa(sinptr->sin_addr); + struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask; + tmp->netmask=inet_ntoa(sinptr->sin_addr); #else bzero(buf, 128); - getnameinfo(ifa->ifa_nettqmask, ifa->ifa_nettqmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); - tmp->nettqmask = buf; + getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); + tmp->netmask = buf; #endif } @@ -193,12 +193,12 @@ NICList* findNICs() void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci) { TQString ip=addrMask.left(addrMask.find("/")); - TQString tqmask=addrMask.mid(addrMask.find("/")+1); + TQString mask=addrMask.mid(addrMask.find("/")+1); - if (tqmask[tqmask.length()-1]==';') - tqmask=tqmask.left(tqmask.length()-1); + if (mask[mask.length()-1]==';') + mask=mask.left(mask.length()-1); MyNIC tmpNic; - KInetSocketAddress::stringToAddr(AF_INET, tqmask.latin1(), &tmpNic.nettqmask); + KInetSocketAddress::stringToAddr(AF_INET, mask.latin1(), &tmpNic.netmask); KInetSocketAddress::stringToAddr(AF_INET, ip.latin1(), &tmpNic.addr); suggestSettingsForNic(&tmpNic,lci); } @@ -209,11 +209,11 @@ void suggestSettingsForNic(MyNIC* nic, LisaConfigInfo& lci) if (nic==0) return; TQString address = nic->addr; - TQString nettqmask = nic->nettqmask; + TQString netmask = nic->netmask; - TQString addrMask(address+"/"+nettqmask+";"); + TQString addrMask(address+"/"+netmask+";"); struct in_addr tmpaddr; - inet_aton(nic->nettqmask.latin1(), &tmpaddr); + inet_aton(nic->netmask.latin1(), &tmpaddr); unsigned int tmp= ntohl(tmpaddr.s_addr); //if the host part is less than 20 bits simply take it diff --git a/lanbrowsing/kcmlisa/findnic.h b/lanbrowsing/kcmlisa/findnic.h index 0e9453c0..bff0aabb 100644 --- a/lanbrowsing/kcmlisa/findnic.h +++ b/lanbrowsing/kcmlisa/findnic.h @@ -32,7 +32,7 @@ struct MyNIC { TQString name; TQString addr; - TQString nettqmask; + TQString netmask; TQString state; TQString type; }; diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index d1c0c4f7..2f02e2fa 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -31,8 +31,8 @@ #include #include -IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *tqparent) -:KCModule(tqparent) +IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) +:KCModule(parent) ,m_config(config,false,true) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h index 9fc4da67..de57af86 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.h +++ b/lanbrowsing/kcmlisa/kcmkiolan.h @@ -33,7 +33,7 @@ class IOSlaveSettings:public KCModule Q_OBJECT TQ_OBJECT public: - IOSlaveSettings(const TQString& config, TQWidget *tqparent=0); + IOSlaveSettings(const TQString& config, TQWidget *parent=0); virtual ~IOSlaveSettings() {}; void load(); void save(); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 36ab9ba6..01bf9bc2 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -48,8 +48,8 @@ #include -LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) -: KCModule(tqparent, "kcmlanbrowser") +LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) +: KCModule(parent, "kcmlanbrowser") ,m_config(config,false,true) ,m_wizard(0) ,m_configFilename(config) @@ -86,7 +86,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) tqlayout->setStretchFactor(addressesGrid,0); label=new TQLabel(i18n("&Broadcast network address:"),addressesGrid); - comment=i18n("Your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + comment=i18n("Your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_broadcastNetwork=new KRestrictedLine(addressesGrid,"a","0123456789./;"); @@ -94,7 +94,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) label->setBuddy(m_broadcastNetwork); label=new TQLabel(i18n("&Trusted IP addresses:"),addressesGrid); - comment = i18n("Usually your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(addressesGrid,"a","0123456789./;"); @@ -335,7 +335,7 @@ void LisaSettings::suggestSettings() //not that easy to handle for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) { - msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->nettqmask+";
"; + msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->netmask+";
"; } KMessageBox::information(0,TQString("%1").tqarg(msg)); } diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index af576ca1..e3fbf46c 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -39,7 +39,7 @@ class LisaSettings:public KCModule Q_OBJECT TQ_OBJECT public: - LisaSettings(const TQString& config, TQWidget *tqparent=0); + LisaSettings(const TQString& config, TQWidget *parent=0); virtual ~LisaSettings() {}; void load(); void save(); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 06342be4..1ced6c13 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -36,8 +36,8 @@ #include #include -ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *tqparent) -: KCModule(tqparent) +ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) +: KCModule(parent) ,m_config(config,false,true) ,m_kiolanConfig("kio_lanrc",false,true) ,m_advancedSettingsButton(0) @@ -68,7 +68,7 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *tqparent) TQHBox *hbox=new TQHBox(this); hbox->setSpacing(10); TQLabel *label=new TQLabel(i18n("&Trusted addresses:"),hbox); - TQString comment = i18n("Usually your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + TQString comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(hbox,"a","0123456789./;"); TQToolTip::add(m_allowedAddresses,comment); @@ -218,8 +218,8 @@ void ResLisaSettings::suggestSettings() MyNIC *nic=nics->first(); TQString address = nic->addr; - TQString nettqmask = nic->nettqmask; - m_allowedAddresses->setText(address+"/"+nettqmask+";"); + TQString netmask = nic->netmask; + m_allowedAddresses->setText(address+"/"+netmask+";"); m_secondWait->setValue(0); m_secondScan->setChecked(FALSE); m_secondWait->setEnabled(FALSE); @@ -235,7 +235,7 @@ void ResLisaSettings::suggestSettings() //not that easy to handle for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) { - msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->nettqmask+";
"; + msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->netmask+";
"; } KMessageBox::information(0,TQString("%1").tqarg(msg)); } diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h index 68cd8f4f..ae079784 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.h +++ b/lanbrowsing/kcmlisa/kcmreslisa.h @@ -37,7 +37,7 @@ class ResLisaSettings:public KCModule Q_OBJECT TQ_OBJECT public: - ResLisaSettings(const TQString& config, TQWidget *tqparent=0); + ResLisaSettings(const TQString& config, TQWidget *parent=0); virtual ~ResLisaSettings() {} void load(); void save(); diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp index 83d80ab5..00d03e52 100644 --- a/lanbrowsing/kcmlisa/main.cpp +++ b/lanbrowsing/kcmlisa/main.cpp @@ -33,17 +33,17 @@ extern "C" { - KDE_EXPORT KCModule *create_lisa(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *) { - return new LisaSettings("/etc/lisarc", tqparent); + return new LisaSettings("/etc/lisarc", parent); } - KDE_EXPORT KCModule *create_reslisa(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *) { - return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", tqparent); + return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent); } - KDE_EXPORT KCModule *create_kiolan(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *) { - return new IOSlaveSettings("kio_lanrc", tqparent); + return new IOSlaveSettings("kio_lanrc", parent); } } diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp index 1b3e7c1b..3e94c730 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.cpp +++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp @@ -23,8 +23,8 @@ #include -PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *tqparent) -:TQHBox(tqparent) +PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *parent) +:TQHBox(parent) { TQLabel* label=new TQLabel(title, this); m_box=new TQComboBox(this); diff --git a/lanbrowsing/kcmlisa/portsettingsbar.h b/lanbrowsing/kcmlisa/portsettingsbar.h index bc674788..c2571e94 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.h +++ b/lanbrowsing/kcmlisa/portsettingsbar.h @@ -33,7 +33,7 @@ class PortSettingsBar:public TQHBox Q_OBJECT TQ_OBJECT public: - PortSettingsBar(const TQString& title, TQWidget *tqparent=0); + PortSettingsBar(const TQString& title, TQWidget *parent=0); virtual ~PortSettingsBar() {}; int selected() const; void setChecked(int what); diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index 82873c00..f5b985e1 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -31,8 +31,8 @@ #include #include -SetupWizard::SetupWizard(TQWidget* tqparent, LisaConfigInfo* configInfo) - :TQWizard(tqparent,"hallo",true) +SetupWizard::SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo) + :TQWizard(parent,"hallo",true) ,m_page1(0) ,m_noNicPage(0) ,m_multiNicPage(0) @@ -208,12 +208,12 @@ void SetupWizard::setupAddressesPage() { m_addressesPage=new TQVBox(this); TQLabel *info=new TQLabel(i18n("All IP addresses included in the specified range will be pinged.
" - "If you are part of a small network, e.g. with network tqmask 255.255.255.0
" - "use your IP address/network tqmask.
"),m_addressesPage); + "If you are part of a small network, e.g. with network mask 255.255.255.0
" + "use your IP address/network mask.
"),m_addressesPage); info->setTextFormat(TQt::RichText); m_pingAddresses=new KRestrictedLine(m_addressesPage,"0123456789./;-"); info=new TQLabel(i18n("
There are four ways to specify address ranges:
" - "1. IP address/network tqmask, like 192.168.0.0/255.255.255.0;
" + "1. IP address/network mask, like 192.168.0.0/255.255.255.0;
" "2. single IP addresses, like 10.0.0.23;
" "3. continuous ranges, like 10.0.1.0-10.0.1.200;
" "4. ranges for each part of the address, like 10-10.1-5.1-25.1-3;
" @@ -237,7 +237,7 @@ void SetupWizard::setupAllowedPage() "It provides a simple IP address based way to specify \"trusted\" hosts.
" "Only hosts which fit into the addresses given here are accepted by LISa as clients. " "The list of hosts published by LISa will also only contain hosts which fit into this scheme.
" - "Usually you enter your IP address/network tqmask here."),m_allowedAddressesPage); + "Usually you enter your IP address/network mask here."),m_allowedAddressesPage); info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;"); m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage); @@ -255,7 +255,7 @@ void SetupWizard::setupAllowedPage() void SetupWizard::setupBcastPage() { m_bcastPage=new TQVBox(this); - TQLabel *info=new TQLabel(i18n("
Enter your IP address and network tqmask here, like 192.168.0.1/255.255.255.0"),m_bcastPage); + TQLabel *info=new TQLabel(i18n("
Enter your IP address and network mask here, like 192.168.0.1/255.255.255.0"),m_bcastPage); info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./"); info=new TQLabel(i18n("
To reduce the network load, the LISa servers in one network
" @@ -398,7 +398,7 @@ void SetupWizard::next() m_nicListBox->clear(); for (MyNIC *nic=m_nics->first(); nic!=0; nic=m_nics->next()) { - TQString tmp=nic->name+": "+nic->addr+"/"+nic->nettqmask+";"; + TQString tmp=nic->name+": "+nic->addr+"/"+nic->netmask+";"; m_nicListBox->insertItem(tmp); } m_nicListBox->setSelected(0,true); @@ -462,7 +462,7 @@ void SetupWizard::showPage(TQWidget* page) text+=i18n("You can use the same syntax as on the previous page.
"); else text+=i18n("There are three ways to specify IP addresses:
" - "1. IP address/network tqmask, like 192.168.0.0/255.255.255.0;
" + "1. IP address/network mask, like 192.168.0.0/255.255.255.0;
" "2. continuous ranges, like 10.0.1.0-10.0.1.200;
" "3. single IP addresses, like 10.0.0.23;
" "You can also enter combinations of 1 to 3, separated by \";\",
" diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h index f571bd6e..c67b330b 100644 --- a/lanbrowsing/kcmlisa/setupwizard.h +++ b/lanbrowsing/kcmlisa/setupwizard.h @@ -45,7 +45,7 @@ class SetupWizard:public TQWizard Q_OBJECT TQ_OBJECT public: - SetupWizard(TQWidget* tqparent, LisaConfigInfo* configInfo); + SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo); ~SetupWizard(); virtual void showPage(TQWidget* page); void clearAll(); -- cgit v1.2.1