Changeset 11871 in vbox for trunk/src

Timestamp:

Aug 30, 2008 2:14:17 PM (16 years ago)

Author:

vboxsync

Message:

Remove the TAP fields (VBOX_WITH_NETFLT).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMSettingsNetwork.h (modified) (1 diff)
• src/VBoxVMSettingsNetwork.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsNetwork.h

@@ -71 +71 @@
     void naTypeChanged (const QString &aString);
     void genMACClicked();
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     void tapSetupClicked();
     void tapTerminateClicked();

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

@@ -32 +32 @@
 
 /* Qt Includes */
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
 #include <QFileDialog>
 #endif
@@ -64 +64 @@
 
     /* Setup dialog for current platform */
-#ifndef Q_WS_X11
+#if !defined (Q_WS_X11) || defined (VBOX_WITH_NETFLT)
     setTapVisible (false);
-#endif
-#ifdef Q_WS_X11
+#else
     /* Setup iconsets */
     mTbSetup_x11->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
@@ -115 +114 @@
                      QString::null : aAdapter.GetHostInterface();
 #endif
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     mLeInterface_x11->setText (aAdapter.GetHostInterface());
     mLeSetup_x11->setText (aAdapter.GetTAPSetupApplication());
@@ -159 +158 @@
         mAdapter.SetHostInterface (mInterfaceName);
 #endif
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
         QString iface = mLeInterface_x11->text();
         mAdapter.SetHostInterface (iface.isEmpty() ? QString::null : iface);
@@ -194 +193 @@
              mValidator, SLOT (revalidate()));
     connect (mPbMAC, SIGNAL (clicked()), this, SLOT (genMACClicked()));
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     connect (mTbSetup_x11, SIGNAL (clicked()), this, SLOT (tapSetupClicked()));
     connect (mTbTerminate_x11, SIGNAL (clicked()), this, SLOT (tapTerminateClicked()));
@@ -269 +268 @@
     mLbNetwork->setEnabled (enableIntNet);
     mCbNetwork->setEnabled (enableIntNet);
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     bool enableHostIf = vboxGlobal().toNetworkAttachmentType (aString) ==
                         KNetworkAttachmentType_HostInterface;
@@ -284 +283 @@
 }
 
-#ifdef Q_WS_X11
+#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
 void VBoxVMSettingsNetwork::tapSetupClicked()
 {