1 files changed, 3 insertions, 29 deletions
diff --git a/src/plugins/platforms/cocoa/qt_mac_p.h b/src/plugins/platforms/cocoa/qt_mac_p.h
index 576e0f9729..9a20c31720 100644
--- a/src/plugins/platforms/cocoa/qt_mac_p.h
+++ b/src/plugins/platforms/cocoa/qt_mac_p.h
@@ -48,7 +48,7 @@
 #include "qmacdefines_mac.h"
 
 #ifdef __OBJC__
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <objc/runtime.h>
 #endif
 
@@ -63,30 +63,10 @@
 
 #include "QtGui/qpainter.h"
 
-#include <Carbon/Carbon.h>
-
 QT_BEGIN_NAMESPACE
 class QWidget;
 class QDragMoveEvent;
 
-/* Event masks */
-// internal Qt types
-
-enum {
-    //AE types
-    typeAEClipboardChanged = 1,
-    //types
-    typeQWidget = 1,  /* QWidget *  */
-    //params
-    kEventParamQWidget = 'qwid',   /* typeQWidget */
-    //events
-    kEventQtRequestContext = 13,
-    kEventQtRequestMenubarUpdate = 14,
-    kEventQtRequestShowSheet = 17,
-    kEventQtRequestActivate = 18,
-    kEventQtRequestWindowChange = 20
-};
-
 // Simple class to manage short-lived regions
 class QMacSmartQuickDrawRegion
 {
@@ -103,8 +83,6 @@ public:
     }
 };
 
-QString qt_mac_removeMnemonics(const QString &original); //implemented in qmacstyle_mac.cpp
-
 class Q_WIDGETS_EXPORT QMacWindowChangeEvent
 {
 private:
@@ -127,8 +105,8 @@ class QMacCGContext
 public:
     QMacCGContext(QPainter *p); //qpaintengine_mac.mm
     inline QMacCGContext() { context = 0; }
-    inline QMacCGContext(const QPaintDevice *pdev) {
-        extern CGContextRef qt_mac_cg_context(const QPaintDevice *);
+    inline QMacCGContext(QPaintDevice *pdev) {
+        extern CGContextRef qt_mac_cg_context(QPaintDevice *);
         context = qt_mac_cg_context(pdev);
     }
     inline QMacCGContext(CGContextRef cg, bool takeOwnership=false) {
@@ -173,10 +151,6 @@ extern QPoint qt_mac_nativeMapFromParent(const QWidget *child, const QPoint &pt)
 # undef check
 #endif
 
-QFont qfontForThemeFont(ThemeFontID themeID);
-
-QColor qcolorForThemeTextColor(ThemeTextColor themeColor);
-
 struct QMacDndAnswerRecord {
     QRect rect;
     Qt::KeyboardModifiers modifiers;