Changeset 11849 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

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

Author:

vboxsync

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

35689

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsNetwork.h (modified) (7 diffs)

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

@@ -28 +28 @@
 #include "COMDefs.h"
 
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC)
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
 class QTreeWidget;
 class QTreeWidgetItem;
@@ -57 +57 @@
     void setNetworksList (const QStringList &aList);
 
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC)
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
     void setInterfaceName (const QString &);
     QString interfaceName() const;
@@ -86 +86 @@
     QIWidgetValidator *mValidator;
 
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC)
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
     QString mInterfaceName;
 #endif
@@ -92 +92 @@
 
 
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC) || defined(__APPLE__) /// @todo fix stupid stupid moc.
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
 /*
  * QGroupBox sub-class which represents network interface list.
@@ -129 +129 @@
     QTreeWidget      *mList;
 
-# if defined (Q_WS_WIN)
+# if defined (Q_WS_WIN) && !defined(VBOX_WITH_NETFLT)
     QAction *mAddAction;
     QAction *mDelAction;
 # endif
 };
-#endif /* Q_WS_WIN || Q_OS_MAC */
+#endif /* Q_WS_WIN || VBOX_WITH_NETFLT */
 
 
@@ -161 +161 @@
 
     void updateNetworksList();
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC) || defined (__APPLE__) /// @todo fix stupid stupid moc.
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
     void onCurrentPageChanged (int);
     void onCurrentInterfaceChanged (const QString &);
@@ -172 +172 @@
     /* Widgets */
     QTabWidget *mTwAdapters;
-#if defined (Q_WS_WIN) || defined (Q_OS_MAC)
+#if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
     VBoxNIList *mNIList;
 #endif