Changeset 71662 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 4, 2018 3:24:06 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Small cleanup for VBoxUtils-darwin stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• VBoxUtils-darwin.h (modified) (6 diffs)

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

@@ -694 +694 @@
 }
 
-void* darwinCocoaToCarbonEvent(void *pvCocoaEvent)
+void *darwinCocoaToCarbonEvent(void *pvCocoaEvent)
 {
     NSEvent *pEvent = (NSEvent*)pvCocoaEvent;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef ___VBoxUtils_darwin_h
-#define ___VBoxUtils_darwin_h
-
+#ifndef ___VBoxUtils_darwin_h___
+#define ___VBoxUtils_darwin_h___
+
+/* Qt includes: */
+#include <QRect>
+
+/* Other VBox includes: */
 #include <VBox/VBoxCocoa.h>
 #include <ApplicationServices/ApplicationServices.h>
-#undef PVM                              /* Stupid, stupid apple headers (sys/param.h)!!  */
-#include <iprt/cdefs.h> /* for RT_C_DECLS_BEGIN/RT_C_DECLS_END & stuff */
-
-#include <QRect>
-
-ADD_COCOA_NATIVE_REF(NSEvent);
-ADD_COCOA_NATIVE_REF(NSImage);
-ADD_COCOA_NATIVE_REF(NSView);
-ADD_COCOA_NATIVE_REF(NSWindow);
-ADD_COCOA_NATIVE_REF(NSButton);
-ADD_COCOA_NATIVE_REF(NSString);
-
+#undef PVM // Stupid, stupid apple headers (sys/param.h)!!
+#include <iprt/cdefs.h>
+
+/* External includes: */
+#include <ApplicationServices/ApplicationServices.h>
+
+/* Forward declarations: */
 class QImage;
 class QMainWindow;
@@ -39 +38 @@
 class QToolBar;
 class QWidget;
+
+/* Cocoa declarations: */
+ADD_COCOA_NATIVE_REF(NSButton);
+ADD_COCOA_NATIVE_REF(NSEvent);
+ADD_COCOA_NATIVE_REF(NSImage);
+ADD_COCOA_NATIVE_REF(NSString);
+ADD_COCOA_NATIVE_REF(NSView);
+ADD_COCOA_NATIVE_REF(NSWindow);
+
 
 /** Mac OS X: Standard window button types. */
@@ -51 +59 @@
     StandardWindowButtonType_FullScreen        // Since OS X 10.7
 };
+
 
 RT_C_DECLS_BEGIN
@@ -203 +212 @@
 NativeNSImageRef darwinToNSImageRef(const QPixmap *pPixmap);
 NativeNSImageRef darwinToNSImageRef(const char *pczSource);
-
-#ifndef __OBJC__
 
 #include <QEvent>
@@ -289 +296 @@
 void darwinMouseRelease(QWidget *pWidget);
 
-void* darwinCocoaToCarbonEvent(void *pvCocoaEvent);
-
-#endif /* !__OBJC__ */
-
-#endif /* !___VBoxUtils_darwin_h */
-
+void *darwinCocoaToCarbonEvent(void *pvCocoaEvent);
+
+#endif /* !___VBoxUtils_darwin_h___ */
+