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

Timestamp:

Aug 29, 2008 9:32:44 PM (16 years ago)

Author:

vboxsync

Message:

Merged VBOX_WITH_NETFLT_WINDOWS into VBOX_WITH_NETFLT. Made the GUIs, Main, Devices and HostDrivers use VBOX_WITH_NETFLT.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• ui/VBoxVMNetworkSettings.ui.h (modified) (8 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -403 +403 @@
  VirtualBox_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
 endif
+ifdef VBOX_WITH_NETFLT
+ VirtualBox_DEFS         += VBOX_WITH_NETFLT
+endif
 
 VirtualBox_INCS           = \

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

@@ -56 +56 @@
 #endif
 
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     /* disable unused interface name UI */
     grbTAP->setHidden (true);
@@ -90 +90 @@
         return CheckPage_Ok;
     else
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     if (type == KNetworkAttachmentType_HostInterface &&
         isInterfaceInvalid (aList, cbHostInterfaceName->currentText()))
@@ -108 +108 @@
                                                const QString &aNillItem)
 {
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     /* save current list item name */
     QString currentListItemName = cbHostInterfaceName->currentText();
@@ -161 +161 @@
     chbCableConnected->setChecked (adapter.GetCableConnected());
 
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     if (!adapter.GetHostInterface().isEmpty())
         cbHostInterfaceName->setCurrentText (adapter.GetHostInterface());
@@ -210 +210 @@
     if (type == KNetworkAttachmentType_HostInterface)
     {
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
         if (!cbHostInterfaceName->currentText().isEmpty())
             cadapter.SetHostInterface (cbHostInterfaceName->currentText());
@@ -241 +241 @@
 void VBoxVMNetworkSettings::grbEnabledToggled (bool aOn)
 {
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     cbNetworkAttachment_activated (cbNetworkAttachment->currentText());
 #else
@@ -256 +256 @@
                         vboxGlobal().toNetworkAttachmentType (aString) ==
                         KNetworkAttachmentType_Internal;
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     txHostInterface_WIN->setEnabled (enableHostIf);
     cbHostInterfaceName->setEnabled (enableHostIf);
@@ -269 +269 @@
                                                 const QString &aIface)
 {
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     return aList.find (aIface) == aList.end();
 #else

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -663 +663 @@
     /* Network Page */
 
-#if !defined(Q_WS_WIN) && !defined Q_OS_MAC
+#if !defined(Q_WS_WIN) && !defined(VBOX_WITH_NETFLT)
     gbInterfaceList->setHidden (true);
 #endif
-#ifdef Q_OS_MAC
+#ifdef VBOX_WITH_NETFLT
     pbHostAdd->setHidden (true);
     pbHostRemove->setHidden (true);
@@ -978 +978 @@
 void VBoxVMSettingsDlg::loadInterfacesList()
 {
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     /* clear inner list */
     mInterfaceList.clear();
@@ -1035 +1035 @@
 void VBoxVMSettingsDlg::hostInterfaceAdd()
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN && !defined VBOX_WITH_NETFLT
 
     /* allow the started helper process to make itself the foreground window */
@@ -1093 +1093 @@
 void VBoxVMSettingsDlg::hostInterfaceRemove()
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN && !defined VBOX_WITH_NETFLT
 
     /* allow the started helper process to make itself the foreground window */
@@ -1154 +1154 @@
 {
     if (!aWidget) return;
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
     VBoxVMNetworkSettings *set = static_cast<VBoxVMNetworkSettings*> (aWidget);
     set->loadInterfaceList (mInterfaceList, mNoInterfaces);
@@ -2180 +2180 @@
     page->revalidate();
 
-#if defined Q_WS_WIN || defined Q_OS_MAC
+#if defined Q_WS_WIN || defined VBOX_WITH_NETFLT
 
     /* fix focus order (make sure the Host Interface list UI goes after the