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

Timestamp:

Jan 14, 2011 1:52:02 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: s/VBOX_WITH_PIDFILE/VBOX_GUI_WITH_PIDFILE/ plus Makefile.kmk change

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (5 diffs)
• src/globals/VBoxGlobal.h (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/runtime/UISession.cpp (modified) (1 diff)

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

@@ -129 +129 @@
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
         $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
-        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI)
+        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
+        $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE,)
 ifdef VBOX_WITH_DEBUGGER_GUI
  VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI

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

@@ -66 +66 @@
 #include <QLocale>
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
 # include <QTextStream>
-#endif /* VBOX_WITH_PIDFILE */
+#endif /* VBOX_GUI_WITH_PIDFILE */
 
 #include <math.h>
@@ -449 +449 @@
 }
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
 void VBoxGlobal::createPidfile()
 {
@@ -5035 +5035 @@
             }
         }
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
         else if (!::strcmp(arg, "-pidfile") || !::strcmp(arg, "--pidfile"))
         {
@@ -5041 +5041 @@
                 m_strPidfile = QString(qApp->argv()[i]);
         }
-#endif /* VBOX_WITH_PIDFILE */
+#endif /* VBOX_GUI_WITH_PIDFILE */
         else if (!::strcmp(arg, "-seamless") || !::strcmp(arg, "--seamless"))
         {
@@ -5210 +5210 @@
 #endif
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
     deletePidfile();
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -147 +147 @@
     QWidget *mainWindow() const { return mMainWindow; }
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
     void createPidfile();
     void deletePidfile();
@@ -868 +868 @@
     QFileIconProvider m_globalIconProvider;
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
     QString m_strPidfile;
 #endif

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

@@ -260 +260 @@
             "  --rmode %-18s select different render mode (default is %s)\n"
             "  --no-startvm-errormsgbox   do not show a message box for VM start errors\n"
-# ifdef VBOX_WITH_PIDFILE
+# ifdef VBOX_GUI_WITH_PIDFILE
             "  --pid-file file            create a pidfile file when a VM is up and running\n"
 # endif

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -282 +282 @@
 #endif
 
-#ifdef VBOX_WITH_PIDFILE
+#ifdef VBOX_GUI_WITH_PIDFILE
     vboxGlobal().createPidfile();
 #endif