Changeset 17275 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 3, 2009 1:28:12 PM (16 years ago)

Author:

vboxsync

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

43635

Message:

networking API renaming

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (2 diffs)
• VBoxVMSettingsNetwork.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2399 +2399 @@
                      * an additional symbolic network/interface name field, use
                      * this name instead */
-                    if (type == KNetworkAttachmentType_HostInterface)
+                    if (type == KNetworkAttachmentType_Bridged)
                         attType = attType.arg (tr ("host interface, %1",
                             "details report (network)").arg (adapter.GetHostInterface()));
@@ -3418 +3418 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_NAT] =
         tr ("NAT", "NetworkAttachmentType");
-    mNetworkAttachmentTypes [KNetworkAttachmentType_HostInterface] =
-        tr ("Host Interface", "NetworkAttachmentType");
+    mNetworkAttachmentTypes [KNetworkAttachmentType_Bridged] =
+        tr ("Bridged Interface", "NetworkAttachmentType");
     mNetworkAttachmentTypes [KNetworkAttachmentType_Internal] =
         tr ("Internal Network", "NetworkAttachmentType");

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -130 +130 @@
             mAdapter.AttachToNAT();
             break;
-        case KNetworkAttachmentType_HostInterface:
-            mAdapter.AttachToHostInterface();
+        case KNetworkAttachmentType_Bridged:
+            mAdapter.AttachToBridgedNetwork();
             break;
         case KNetworkAttachmentType_Internal:
@@ -148 +148 @@
     mAdapter.SetCableConnected (mCbCable->isChecked());
 
-    if (type == KNetworkAttachmentType_HostInterface
+    if (type == KNetworkAttachmentType_Bridged
 #if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
             || type == KNetworkAttachmentType_HostOnly
@@ -257 +257 @@
 #if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     bool enableHostIf = vboxGlobal().toNetworkAttachmentType (aString) ==
-                        KNetworkAttachmentType_HostInterface;
+                        KNetworkAttachmentType_Bridged;
     setTapEnabled (enableHostIf);
 #endif
@@ -312 +312 @@
         mCbNAType->itemText(1), Qt::ToolTipRole);
     mCbNAType->insertItem (2,
-        vboxGlobal().toString (KNetworkAttachmentType_HostInterface));
+        vboxGlobal().toString (KNetworkAttachmentType_Bridged));
     mCbNAType->setItemData (2,
         mCbNAType->itemText(2), Qt::ToolTipRole);
@@ -555 +555 @@
     CHost host = vboxGlobal().virtualBox().GetHost();
     CHostNetworkInterface iFace;
-    CProgress progress = host.CreateHostNetworkInterface (iName, iFace);
+    CProgress progress = host.CreateHostOnlyNetworkInterface (iName, iFace);
     if (host.isOk())
     {
@@ -614 +614 @@
     {
         /* Delete interface */
-        CProgress progress = host.RemoveHostNetworkInterface (iFace.GetId(), iFace);
+        CProgress progress = host.RemoveHostOnlyNetworkInterface (iFace.GetId(), iFace);
         if (host.isOk())
         {
@@ -673 +673 @@
 #if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
         /* display real for not host-only and viceversa */
-        if((enmAttachmentType == KNetworkAttachmentType_HostOnly) != it->GetReal())
+        if((enmAttachmentType == KNetworkAttachmentType_HostOnly)
+                == (it->GetInterfaceType() == KHostNetworkInterfaceType_HostOnly))
 #endif
             itemsList << new VBoxNIListItem (it->GetName());
@@ -807 +808 @@
 
 #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
-        if ((type == KNetworkAttachmentType_HostInterface
+        if ((type == KNetworkAttachmentType_Bridged
 #if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
                 || type == KNetworkAttachmentType_HostOnly
@@ -885 +886 @@
     KNetworkAttachmentType enmType = vboxGlobal().toNetworkAttachmentType (page->mCbNAType->currentText());
 
-    bool isHostInterfaceAttached = enmType == KNetworkAttachmentType_HostInterface;
+    bool isHostInterfaceAttached = enmType == KNetworkAttachmentType_Bridged;
 
     mNIList->setEnabled (isHostInterfaceAttached);