diff options
author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-27 02:57:55 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-27 11:55:24 +0000 |
commit | f00794bb12a26c79135eb45656e994542ce81c99 (patch) | |
tree | 7490bd8988d8f5dc94e452a21471e8b54c0aa855 /src/plugins/platforms/cocoa | |
parent | bdf49888ef4044bd513bfd4c888071b41119a6d4 (diff) |
Remove dead code.
Change-Id: Idfaef408536bafbb31444ec8728dbcf289abac8d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qnsviewaccessibility.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qt_mac_p.h | 24 |
6 files changed, 4 insertions, 28 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 61ececc93a..4b63c7207f 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -48,6 +48,8 @@ #include <algorithm> +#include <Carbon/Carbon.h> + QT_BEGIN_NAMESPACE // diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 42ddce6e23..51e96cac89 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -55,6 +55,8 @@ #include <qpa/qplatformintegration.h> #include <qpa/qplatformnativeinterface.h> +#include <Carbon/Carbon.h> + QT_BEGIN_NAMESPACE const char *QCocoaTheme::name = "cocoa"; diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 4c6b1bac9f..6a247d04e1 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -48,7 +48,6 @@ #include <qpa/qplatformscreen.h> #include <AppKit/AppKit.h> -#include <Carbon/Carbon.h> #include <QDebug> diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index f414193bdb..17d73dc926 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -33,7 +33,6 @@ #include <QtCore/qglobal.h> -#include <Carbon/Carbon.h> #include <dlfcn.h> #include "qnsview.h" diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm index 1f15da5b3b..d44b02549d 100644 --- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm +++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm @@ -31,8 +31,6 @@ ** ****************************************************************************/ -#include <Carbon/Carbon.h> - #include "qnsview.h" #include "qcocoahelpers.h" #include "qcocoaaccessibility.h" diff --git a/src/plugins/platforms/cocoa/qt_mac_p.h b/src/plugins/platforms/cocoa/qt_mac_p.h index c59e0941b2..9bfc0f7ba1 100644 --- a/src/plugins/platforms/cocoa/qt_mac_p.h +++ b/src/plugins/platforms/cocoa/qt_mac_p.h @@ -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 { @@ -171,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; |