From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Tue, 5 Jul 2011 09:05:51 +0000 (+0200)
Subject: Remove Carbon Mac defines
X-Git-Tag: qt-v5.0.0-alpha1~3626^2~282
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14757fedb2e4a92fb37a90a88485107909f4f5e1;p=profile%2Fivi%2Fqtbase.git

Remove Carbon Mac defines
---

diff --git a/src/widgets/platforms/mac/qmacdefines_mac.h b/src/widgets/platforms/mac/qmacdefines_mac.h
index 0236087..d0accf8 100644
--- a/src/widgets/platforms/mac/qmacdefines_mac.h
+++ b/src/widgets/platforms/mac/qmacdefines_mac.h
@@ -117,7 +117,6 @@ typedef signed long OSStatus;
 #      undef old_slots
 #    endif
 #endif
-#ifdef QT_MAC_USE_COCOA
     typedef struct OpaqueEventHandlerCallRef * EventHandlerCallRef;
     typedef struct OpaqueEventRef * EventRef;
     typedef struct OpaqueMenuRef * MenuRef;
@@ -142,27 +141,6 @@ typedef signed long OSStatus;
         typedef void *OSMenuRef;
         typedef void *OSEventRef;
 #   endif
-#else  // Carbon
-    typedef struct OpaqueEventHandlerCallRef * EventHandlerCallRef;
-    typedef struct OpaqueEventRef * EventRef;
-    typedef struct OpaqueMenuRef * MenuRef;
-    typedef struct OpaquePasteboardRef* PasteboardRef;
-    typedef struct OpaqueRgnHandle * RgnHandle;
-    typedef const struct __HIShape *HIShapeRef;
-    typedef struct __HIShape *HIMutableShapeRef;
-    typedef struct CGRect CGRect;
-    typedef struct CGImage *CGImageRef;
-    typedef struct CGContext *CGContextRef;
-    typedef struct GDevice * GDPtr;
-    typedef GDPtr * GDHandle;
-    typedef struct OpaqueIconRef * IconRef;
-    typedef struct OpaqueWindowPtr * WindowRef;
-    typedef struct OpaqueControlRef * HIViewRef;
-    typedef WindowRef OSWindowRef;
-    typedef HIViewRef OSViewRef;
-    typedef MenuRef OSMenuRef;
-    typedef EventRef OSEventRef;
-#endif  // QT_MAC_USE_COCOA
 
 typedef PasteboardRef OSPasteboardRef;
 typedef struct AEDesc AEDescList;