1 files changed, 11 insertions, 11 deletions

diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index 1bba25c..e6aa338 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -142,8 +142,8 @@ void KNetworkConfigParser::readListIfacesSlot(){
             originalDevice->setIpAddress(tempDevice->getIpAddress());
           if (!tempDevice->getMacAddress().isEmpty())
             originalDevice->setMacAddress(tempDevice->getMacAddress());
-          if (!tempDevice->getNettqmask().isEmpty())
-            originalDevice->setNettqmask(tempDevice->getNettqmask());
+          if (!tempDevice->getNetmask().isEmpty())
+            originalDevice->setNetmask(tempDevice->getNetmask());
           if (!tempDevice->getNetwork().isEmpty())
             originalDevice->setNetwork(tempDevice->getNetwork());
         }
@@ -299,7 +299,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
   procSaveNetworkInfo->addArgument( "--set" );
 
 //  KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
-  KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)tqparent(), 0, true);
+  KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
   dialog->setCaption(i18n("Reloading Network"));
   dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
   dialog->show();
@@ -410,11 +410,11 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo
         t = doc->createTextNode( device->getBroadcast() );
         innerTag.appendChild( t );
       }
-      if (!device->getNettqmask().isEmpty())
+      if (!device->getNetmask().isEmpty())
       {
-        innerTag = doc->createElement( "nettqmask" );
+        innerTag = doc->createElement( "netmask" );
         configurationTag.appendChild( innerTag );
-        t = doc->createTextNode( device->getNettqmask() );
+        t = doc->createTextNode( device->getNetmask() );
         innerTag.appendChild( t );
       }
       if (!device->getNetwork().isEmpty())
@@ -677,11 +677,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
               if (!e.text().isEmpty())
             	  tempDevice->setGateway(e.text());
             }
-            else if ( configNodeName == "nettqmask" || configNodeName == "tqmask")
+            else if ( configNodeName == "netmask" || configNodeName == "mask")
             {
               TQDomElement e = configNode.toElement();
               if (!e.text().isEmpty())
-            	  tempDevice->setNettqmask(e.text());
+            	  tempDevice->setNetmask(e.text());
             }
             else if ( configNodeName == "network" )
             {
@@ -707,11 +707,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
         if (!e.text().isEmpty())
 	       tempDevice->setIpAddress(e.text());
       }
-      else if ( nodeName == "tqmask")
+      else if ( nodeName == "mask")
       {
         TQDomElement e = node.toElement();
         if (!e.text().isEmpty())
-          tempDevice->setNettqmask(e.text());
+          tempDevice->setNetmask(e.text());
       }
       else if ( nodeName == "bdcast")
       {
@@ -769,7 +769,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
   if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp"))
   {
     tempDevice->setIpAddress("");
-    tempDevice->setNettqmask("");
+    tempDevice->setNetmask("");
     tempDevice->setNetwork("");
     tempDevice->setBroadcast("");
   }