diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-05-15 13:28:21 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-05-15 22:40:05 +0000 |
| commit | ee1868df2b6b60d59dff1a14fa2c16a9e759ef19 (patch) | |
| tree | 09939b2c96895adf4e63e0c7d8f9c0f63ac549da /src/plugins/styles/mac/qmacstyle_mac_p_p.h | |
| parent | cdc5f7ab5cdadff42e7736f66c823debbc0d85fc (diff) | |
QMacStyle: Remove a couple void *, dead code
Change-Id: If05fbdf8cc5ced81adfd75232313969223bf1453
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac_p_p.h')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p_p.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index 68d77deb06..f312adac52 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -118,6 +118,8 @@ Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(CGContext); Q_FORWARD_DECLARE_OBJC_CLASS(NSView); +Q_FORWARD_DECLARE_OBJC_CLASS(NSButtonCell); +Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(NotificationReceiver)); QT_BEGIN_NAMESPACE @@ -244,15 +246,10 @@ public: mutable QPointer<QObject> autoDefaultButton; static QVector<QPointer<QObject> > scrollBars; - struct ButtonState { - int frame; - enum { ButtonDark, ButtonLight } dir; - } buttonState; mutable QPointer<QFocusFrame> focusWidget; CFAbsoluteTime defaultButtonStart; - bool mouseDown; - void* receiver; - void *indicatorBranchButtonCell; + QT_MANGLE_NAMESPACE(NotificationReceiver) *receiver; + NSButtonCell *indicatorBranchButtonCell; NSView *backingStoreNSView; QHash<QCocoaWidget, NSView *> cocoaControls; }; |