From f00794bb12a26c79135eb45656e994542ce81c99 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 27 Nov 2015 02:57:55 -0800 Subject: [PATCH] Remove dead code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idfaef408536bafbb31444ec8728dbcf289abac8d Reviewed-by: Richard Moe Gustavsen Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/cocoa/qcocoahelpers.mm | 2 ++ src/plugins/platforms/cocoa/qcocoatheme.mm | 2 ++ src/plugins/platforms/cocoa/qcocoawindow.mm | 1 - src/plugins/platforms/cocoa/qnsview.mm | 1 - .../platforms/cocoa/qnsviewaccessibility.mm | 2 -- src/plugins/platforms/cocoa/qt_mac_p.h | 24 ------------------- src/widgets/kernel/mac.pri | 2 +- src/widgets/styles/styles.pri | 3 ++- src/widgets/widgets/qmainwindowlayout_p.h | 12 ---------- 9 files changed, 7 insertions(+), 42 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 +#include + 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 #include +#include + 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 #include -#include #include 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 -#include #include #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 - #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 - 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; diff --git a/src/widgets/kernel/mac.pri b/src/widgets/kernel/mac.pri index 129fdebe1b..8c694c5e05 100644 --- a/src/widgets/kernel/mac.pri +++ b/src/widgets/kernel/mac.pri @@ -1,4 +1,4 @@ !x11:osx { - LIBS_PRIVATE += -framework Carbon -framework AppKit -lz + LIBS_PRIVATE += -framework AppKit -lz *-mwerks:INCLUDEPATH += compat } diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index a54563c036..11f7d973cc 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -49,7 +49,8 @@ contains( styles, mac ) { HEADERS += \ styles/qmacstyle_mac_p.h \ styles/qmacstyle_mac_p_p.h - OBJECTIVE_SOURCES += styles/qmacstyle_mac.mm + OBJECTIVE_SOURCES += styles/qmacstyle_mac.mm + LIBS_PRIVATE += -framework Carbon } else { DEFINES += QT_NO_STYLE_MAC } diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 9a13e5f5ce..a7f2f17bdf 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -60,18 +60,6 @@ #include "qdockarealayout_p.h" #include "qtoolbararealayout_p.h" -#ifdef Q_DEAD_CODE_FROM_QT4_MAC -// Forward defs to make avoid including Carbon.h (faster compile you know ;). -struct OpaqueHIObjectRef; -typedef struct OpaqueHIObjectRef* HIObjectRef; -typedef HIObjectRef HIToolbarItemRef; -typedef const void * CFTypeRef; -typedef const struct __CFString * CFStringRef; - -#include - -#endif // Q_DEAD_CODE_FROM_QT4_MAC - QT_BEGIN_NAMESPACE class QToolBar;