diff options
Diffstat (limited to 'knetworkconf/knetworkconf/knetworkconf.cpp')
| -rw-r--r-- | knetworkconf/knetworkconf/knetworkconf.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index c03b762..1d8efd9 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -19,7 +19,7 @@ #include "knetworkconf.h" -KNetworkConf::KNetworkConf(TQWidget *tqparent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(tqparent, name) +KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) { netInfo = 0L; makeButtonsResizeable(); @@ -245,7 +245,7 @@ void KNetworkConf::configureDeviceSlot(){ configDlg.addDlg->rbBootProtoManual->setChecked(false); configDlg.addDlg->rbBootProtoAuto->setChecked(true); configDlg.addDlg->kleIPAddress->setEnabled(false); - configDlg.addDlg->kcbNettqmask->setEnabled(false); + configDlg.addDlg->kcbNetmask->setEnabled(false); configDlg.kpbAdvanced->setEnabled(false); } else if (dev->getBootProto().lower() == "bootp") @@ -266,12 +266,12 @@ void KNetworkConf::configureDeviceSlot(){ if (!dev->getBroadcast().isEmpty()) advancedOptions->kleBroadcast->setText(dev->getBroadcast()); else - advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNettqmask())); + advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNetmask())); advancedOptions->kleGateway->setText(dev->getGateway()); - if (!dev->getNettqmask().isEmpty()) - configDlg.addDlg->kcbNettqmask->setCurrentText(dev->getNettqmask()); + if (!dev->getNetmask().isEmpty()) + configDlg.addDlg->kcbNetmask->setCurrentText(dev->getNetmask()); if (readOnly) { @@ -305,7 +305,7 @@ void KNetworkConf::configureDeviceSlot(){ dev->setBootProto("none"); } //If the selected boot protocol is dhcp or bootp (Auto), then we don't need the - //past IP address, nettqmask, network and broadcast, as a new one will be assigned by + //past IP address, netmask, network and broadcast, as a new one will be assigned by //the dhcp server. else if (configDlg.addDlg->rbBootProtoAuto->isChecked()) { @@ -314,7 +314,7 @@ void KNetworkConf::configureDeviceSlot(){ dev->setIpAddress(""); configDlg.addDlg->kleIPAddress->setText(""); dev->setGateway(""); - dev->setNettqmask(""); + dev->setNetmask(""); dev->setNetwork(""); dev->setBroadcast(""); } @@ -326,7 +326,7 @@ void KNetworkConf::configureDeviceSlot(){ if (valuesChanged(dev, configDlg.addDlg->kcbAutoBootProto->currentText(), - configDlg.addDlg->kcbNettqmask->currentText(), + configDlg.addDlg->kcbNetmask->currentText(), configDlg.addDlg->kleIPAddress->text(), advancedOptions->kleGateway->text(), configDlg.addDlg->kcbstartAtBoot->isChecked(), @@ -335,12 +335,12 @@ void KNetworkConf::configureDeviceSlot(){ { dev->setIpAddress(configDlg.addDlg->kleIPAddress->text().stripWhiteSpace()); dev->setGateway(advancedOptions->kleGateway->text().stripWhiteSpace()); - dev->setNettqmask(configDlg.addDlg->kcbNettqmask->currentText().stripWhiteSpace()); - TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); + dev->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace()); + TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); dev->setNetwork(network); TQString broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace(); if (broadcast.isEmpty()) - broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace()); + broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace()); dev->setBroadcast(broadcast); dev->setDescription(advancedOptions->kleDescription->text()); @@ -789,14 +789,14 @@ TQStringList KNetworkConf::getDeviceList(){ /** No descriptions */ bool KNetworkConf::valuesChanged(KNetworkInterface *dev, TQString bootProto, - TQString nettqmask, + TQString netmask, TQString ipAddr, TQString gateway, bool onBoot, TQString desc, TQString broadcast){ if ((dev->getBootProto() != bootProto) || - (dev->getNettqmask() != nettqmask) || + (dev->getNetmask() != netmask) || (dev->getIpAddress() != ipAddr) || (dev->getGateway() != gateway) || ((dev->getOnBoot() == "yes") && !(onBoot)) || |