Changeset 16469 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxDockIconPreview.h

Timestamp:

Feb 2, 2009 5:21:58 PM (16 years ago)

Author:

vboxsync

Message:

Qt4Gui: Carbon -> Coca; make it build. (darwin/amd64)

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxDockIconPreview.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDockIconPreview.h

@@ -21 +21 @@
  */
 
-#ifndef __VBoxDockIconPreview_h__
-#define __VBoxDockIconPreview_h__
+#ifndef ___VBoxDockIconPreview_h___
+#define ___VBoxDockIconPreview_h___
 
-#include <Carbon/Carbon.h>
+#include <QObject> /* drag in QT_MAC_USE_COCOA */
+
+#ifndef QT_MAC_USE_COCOA
+/** @todo include chocolatey headers... */
+#else
+# include <Carbon/Carbon.h>
+#endif
 
 class VBoxConsoleWnd;
@@ -38 +44 @@
 
     void updateDockOverlay();
+#ifndef QT_MAC_USE_COCOA
     void updateDockPreview (CGImageRef aVMImage);
+#endif
     void updateDockPreview (VBoxFrameBuffer *aFrameBuffer);
 
 private:
+#ifdef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+#else
     inline void initPreviewImages();
     inline void initOverlayData (int aBitmapByteCount);
@@ -56 +67 @@
         return aRect;
     }
+#endif /* !QT_MAC_USE_COCOA */
 
     /* Private member vars */
     VBoxConsoleWnd *mMainWnd;
+#ifdef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+#else
     const CGRect mDockIconRect;
 
@@ -73 +88 @@
     CGRect mUpdateRect;
     CGRect mMonitorRect;
+#endif
 };
 
-#endif /* __VBoxDockIconPreview_h__ */
+#endif /* !___VBoxDockIconPreview_h___ */