Changeset 5918 in vbox

Timestamp:

Dec 2, 2007 10:19:33 PM (17 years ago)

Author:

vboxsync

Message:

gcc-4.3 fixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxGlobal.cpp (modified) (2 diffs)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (2 diffs)

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

@@ -76 +76 @@
 #include <iprt/path.h>
 #include <iprt/env.h>
+
+#if defined (Q_WS_X11)
+#include <iprt/mem.h>
+#endif
 
 #if defined (VBOX_GUI_DEBUG)
@@ -1722 +1726 @@
     /* get the apps doc path */
     int size = 256;
-    char *buffer = (char*) malloc (size);
+    char *buffer = (char*) RTMemTmpAlloc (size);
     RTPathAppDocs (buffer, size);
     QString path (buffer);
-    free (buffer);
+    RTMemTmpFree (buffer);
     QDir docDir (path);
     docDir.setFilter (QDir::Files);

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

@@ -1760 +1760 @@
         QUuid machineId = hd.GetMachineId();
         if (machineId.isNull() ||
-            vbox.GetMachine (machineId).GetState() != CEnums::PoweredOff &&
-            vbox.GetMachine (machineId).GetState() != CEnums::Aborted)
+            (vbox.GetMachine (machineId).GetState() != CEnums::PoweredOff &&
+             vbox.GetMachine (machineId).GetState() != CEnums::Aborted))
             return false;
     }
@@ -1790 +1790 @@
         if (!tempMachines.isEmpty())
             return false;
-        /* only permamently mounted .iso could be released */
+        /* only permamently mounted floppies could be released */
         QStringList permMachines =
             QStringList::split (' ', vbox.GetFloppyImageUsage (itemId,