Changeset 65680 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 8, 2017 2:15:16 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: Network page: Some reordering to prevent horrific diffs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -32 +32 @@
 struct UIDataSettingsGlobalNetworkNAT
 {
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalNetworkNAT &other) const
+    {
+        return true
+               && (m_fEnabled == other.m_fEnabled)
+               && (m_strName == other.m_strName)
+               && (m_strNewName == other.m_strNewName)
+               && (m_strCIDR == other.m_strCIDR)
+               && (m_fSupportsDHCP == other.m_fSupportsDHCP)
+               && (m_fSupportsIPv6 == other.m_fSupportsIPv6)
+               && (m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route)
+               && (m_ipv4rules == other.m_ipv4rules)
+               && (m_ipv6rules == other.m_ipv6rules)
+               ;
+    }
+
     /** Holds whether this network enabled. */
     bool m_fEnabled;
@@ -50 +66 @@
     /** Holds IPv6 port forwarding rules. */
     UIPortForwardingDataList m_ipv6rules;
-
-    /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataSettingsGlobalNetworkNAT &other) const
-    {
-        return true
-               && (m_fEnabled == other.m_fEnabled)
-               && (m_strName == other.m_strName)
-               && (m_strNewName == other.m_strNewName)
-               && (m_strCIDR == other.m_strCIDR)
-               && (m_fSupportsDHCP == other.m_fSupportsDHCP)
-               && (m_fSupportsIPv6 == other.m_fSupportsIPv6)
-               && (m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route)
-               && (m_ipv4rules == other.m_ipv4rules)
-               && (m_ipv6rules == other.m_ipv6rules)
-               ;
-    }
 };
 
@@ -72 +72 @@
 struct UIDataSettingsGlobalNetworkHostInterface
 {
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalNetworkHostInterface &other) const
+    {
+        return true
+               && (m_strName == other.m_strName)
+               && (m_fDhcpClientEnabled == other.m_fDhcpClientEnabled)
+               && (m_strInterfaceAddress == other.m_strInterfaceAddress)
+               && (m_strInterfaceMask == other.m_strInterfaceMask)
+               && (m_fIpv6Supported == other.m_fIpv6Supported)
+               && (m_strInterfaceAddress6 == other.m_strInterfaceAddress6)
+               && (m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6)
+               ;
+    }
+
     /** Holds host interface name. */
     QString m_strName;
@@ -86 +100 @@
     /** Holds IPv6 interface mask length. */
     QString m_strInterfaceMaskLength6;
-
-    /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataSettingsGlobalNetworkHostInterface &other) const
-    {
-        return true
-               && (m_strName == other.m_strName)
-               && (m_fDhcpClientEnabled == other.m_fDhcpClientEnabled)
-               && (m_strInterfaceAddress == other.m_strInterfaceAddress)
-               && (m_strInterfaceMask == other.m_strInterfaceMask)
-               && (m_fIpv6Supported == other.m_fIpv6Supported)
-               && (m_strInterfaceAddress6 == other.m_strInterfaceAddress6)
-               && (m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6)
-               ;
-    }
 };
 
@@ -106 +106 @@
 struct UIDataSettingsGlobalNetworkDHCPServer
 {
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalNetworkDHCPServer &other) const
+    {
+        return true
+               && (m_fDhcpServerEnabled == other.m_fDhcpServerEnabled)
+               && (m_strDhcpServerAddress == other.m_strDhcpServerAddress)
+               && (m_strDhcpServerMask == other.m_strDhcpServerMask)
+               && (m_strDhcpLowerAddress == other.m_strDhcpLowerAddress)
+               && (m_strDhcpUpperAddress == other.m_strDhcpUpperAddress)
+               ;
+    }
+
     /** Holds whether DHCP server enabled. */
     bool m_fDhcpServerEnabled;
@@ -116 +128 @@
     /** Holds DHCP server upper address. */
     QString m_strDhcpUpperAddress;
-
-    /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataSettingsGlobalNetworkDHCPServer &other) const
-    {
-        return true
-               && (m_fDhcpServerEnabled == other.m_fDhcpServerEnabled)
-               && (m_strDhcpServerAddress == other.m_strDhcpServerAddress)
-               && (m_strDhcpServerMask == other.m_strDhcpServerMask)
-               && (m_strDhcpLowerAddress == other.m_strDhcpLowerAddress)
-               && (m_strDhcpUpperAddress == other.m_strDhcpUpperAddress)
-               ;
-    }
 };
 
@@ -134 +134 @@
 struct UIDataSettingsGlobalNetworkHost
 {
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalNetworkHost &other) const
+    {
+        return true
+               && (m_interface == other.m_interface)
+               && (m_dhcpserver == other.m_dhcpserver)
+               ;
+    }
+
     /** Holds the host interface data. */
     UIDataSettingsGlobalNetworkHostInterface m_interface;
     /** Holds the DHCP server data. */
     UIDataSettingsGlobalNetworkDHCPServer m_dhcpserver;
-
-    /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataSettingsGlobalNetworkHost &other) const
-    {
-        return true
-               && (m_interface == other.m_interface)
-               && (m_dhcpserver == other.m_dhcpserver)
-               ;
-    }
 };