Changeset 30001 in vbox

Timestamp:

Jun 2, 2010 3:36:51 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix NSAutoreleaseNoPool warnings triggered from Qt

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• darwin/VBoxUtils-darwin-cocoa.mm (modified) (13 diffs)
• darwin/VBoxUtils-darwin.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-cocoa.mm

@@ -20 +20 @@
 
 #include "VBoxUtils-darwin.h"
+#include "VBoxCocoaHelper.h"
+
+#include <QMenu>
 
 #include <iprt/assert.h>
@@ -29 +32 @@
 NativeWindowRef darwinToNativeWindowImpl (NativeViewRef aView)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     NativeWindowRef window = NULL;
@@ -35 +38 @@
         window = [aView window];
 
-    [pool release];
     return window;
 }
@@ -41 +43 @@
 NativeViewRef darwinToNativeViewImpl (NativeWindowRef aWindow)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     NativeViewRef view = NULL;
@@ -47 +49 @@
         view = [aWindow contentView];
 
-    [pool release];
     return view;
 }
@@ -53 +54 @@
 void darwinSetShowsToolbarButtonImpl (NativeWindowRef aWindow, bool aEnabled)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     [aWindow setShowsToolbarButton:aEnabled];
-
-    [pool release];
 }
 
 void darwinSetShowsResizeIndicatorImpl (NativeWindowRef aWindow, bool aEnabled)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     [aWindow setShowsResizeIndicator:aEnabled];
-
-    [pool release];
 }
 
 void darwinSetHidesAllTitleButtonsImpl (NativeWindowRef aWindow)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     /* Remove all title buttons by changing the style mask. This method is
@@ -95 +92 @@
             [pButton setEnabled: NO];
     }
-
-    [pool release];
 }
 
 void darwinSetShowsWindowTransparentImpl (NativeWindowRef aWindow, bool aEnabled)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     if (aEnabled)
@@ -115 +110 @@
         [aWindow setHasShadow:YES];
     }
+}
 
-    [pool release];
+void darwinSetDockIconMenu(QMenu* pMenu)
+{
+    CocoaAutoreleasePool pool;
+
+    extern void qt_mac_set_dock_menu(QMenu *);
+    qt_mac_set_dock_menu(pMenu);
 }
 
@@ -126 +127 @@
 void darwinSetMouseCoalescingEnabled (bool aEnabled)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     [NSEvent setMouseCoalescingEnabled:aEnabled];
-
-    [pool release];
 }
 
 void darwinWindowAnimateResizeImpl (NativeWindowRef aWindow, int x, int y, int width, int height)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     /* It seems that Qt doesn't return the height of the window with the
@@ -151 +150 @@
 
     [aWindow setFrame:windowFrame display:YES animate:YES];
-
-    [pool release];
 }
 
 void darwinWindowInvalidateShadowImpl (NativeWindowRef aWindow)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     [aWindow invalidateShadow];
-
-    [pool release];
 }
 
 int darwinWindowToolBarHeight (NativeWindowRef aWindow)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     NSToolbar *toolbar = [aWindow toolbar];
@@ -177 +172 @@
         toolbarHeight = NSHeight (windowFrame) - NSHeight ([[aWindow contentView] frame]) - theight;
 
-    [pool release];
     return toolbarHeight;
 }
@@ -183 +177 @@
 bool darwinIsWindowMaximized(NativeWindowRef aWindow)
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     bool fResult = [aWindow isZoomed];
 
-    [pool release];
     return fResult;
 }
@@ -193 +186 @@
 float darwinSmallFontSize()
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CocoaAutoreleasePool pool;
 
     float size = [NSFont systemFontSizeForControlSize: NSSmallControlSize];
 
-    [pool release];
     return size;
 }

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.h

@@ -43 +43 @@
 class QPixmap;
 class QImage;
+class QMenu;
 
 # ifdef QT_MAC_USE_COCOA
@@ -154 +155 @@
 void darwinSetHidesAllTitleButtons(QWidget *aWidget);
 void darwinSetShowsWindowTransparent(QWidget *aWidget, bool aEnabled);
+void darwinSetDockIconMenu(QMenu *pMenu);
 void darwinDisableIconsInMenus(void);
 

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

@@ -598 +598 @@
 
     /* Add it to the dock. */
-    extern void qt_mac_set_dock_menu(QMenu *);
-    qt_mac_set_dock_menu(pDockMenu);
+    ::darwinSetDockIconMenu(pDockMenu);
 
     /* Now the dock icon preview */