Changeset 28296 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Apr 14, 2010 12:11:07 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60048

Message:

Main: cosmetical fixes, mostly spaces

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (8 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1834 +1834 @@
         if (llNetworkModes.size() > 2)
         {
-            throw ConfigFileError(this, pelmAdapter, N_("Invalid number of modes '%d' attached to Adapter attribute"), llNetworkModes.size());
+            throw ConfigFileError(this, pelmAdapter, N_("Invalid number of modes ('%d') attached to Adapter attribute"), llNetworkModes.size());
         }
         for (it = llNetworkModes.begin(); it != llNetworkModes.end(); ++it)
@@ -1845 +1845 @@
                 pelmNode->getChildElements(llDisabledNetworkModes);
                 /* run over disabled list and load settings */
-                for(itDisabled = llDisabledNetworkModes.begin(); itDisabled != llDisabledNetworkModes.end(); ++itDisabled)
+                for (itDisabled = llDisabledNetworkModes.begin();
+                     itDisabled != llDisabledNetworkModes.end(); ++itDisabled)
                 {
                     const xml::ElementNode *pelmDisabledNode = *itDisabled;
@@ -1865 +1866 @@
     {
         if (fEnabled)
-        {
             nic.mode = NetworkAttachmentType_NAT;
-        } 
-        nic.fHasDisabledNAT = (nic.mode != NetworkAttachmentType_NAT) && !fEnabled;
+
+        nic.fHasDisabledNAT = (nic.mode != NetworkAttachmentType_NAT && !fEnabled);
         elmMode.getAttributeValue("network", nic.nat.strNetwork);    // optional network name
         elmMode.getAttributeValue("hostip", nic.nat.strBindIP);
@@ -1892 +1892 @@
         xml::ElementNodesList plstNatPF;
         elmMode.getChildElements(plstNatPF, "Forwarding");
-        for(xml::ElementNodesList::iterator pf = plstNatPF.begin(); pf != plstNatPF.end(); ++pf)
+        for (xml::ElementNodesList::iterator pf = plstNatPF.begin(); pf != plstNatPF.end(); ++pf)
         {
             NATRule rule;
@@ -1907 +1907 @@
         }
     }
-    else if (    fEnabled
-              && (   (elmMode.nameEquals("HostInterface"))
-                  || (elmMode.nameEquals("BridgedInterface")))
+    else if (   fEnabled
+             && (   (elmMode.nameEquals("HostInterface"))
+                 || (elmMode.nameEquals("BridgedInterface")))
             )
     {
@@ -1922 +1922 @@
             throw ConfigFileError(this, &elmMode, N_("Required InternalNetwork/@name element is missing"));
     }
-    else if (    fEnabled
-              && elmMode.nameEquals("HostOnlyInterface"))
+    else if (   fEnabled
+             && elmMode.nameEquals("HostOnlyInterface"))
     {
         nic.mode = NetworkAttachmentType_HostOnly;
@@ -3546 +3546 @@
 }
 
-void MachineConfigFile::buildNetworkXML(NetworkAttachmentType_T mode, xml::ElementNode &elmParent, const NetworkAdapter &nic)
+/**
+ * Fill a <Network> node. Only relevant for XML version >= v1_10.
+ * @param mode
+ * @param elmParent
+ * @param nice
+ */
+void MachineConfigFile::buildNetworkXML(NetworkAttachmentType_T mode,
+                                        xml::ElementNode &elmParent,
+                                        const NetworkAdapter &nic)
 {
     switch (mode)
@@ -3584 +3592 @@
                     pelmTFTP->setAttribute("next-server", nic.nat.strTftpNextServer);
             }
-            for(NATRuleList::const_iterator rule = nic.nat.llRules.begin();
+            for (NATRuleList::const_iterator rule = nic.nat.llRules.begin();
                     rule != nic.nat.llRules.end(); ++rule)
             {