diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-13 16:40:19 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-05 00:03:51 +0200 |
| commit | df2e029a06f065c82dacc28ec885b4307260b6fb (patch) | |
| tree | 7c1c8f334c9036c0b5438c944fce1b205b962293 /src/plugins/platforms/cocoa/qcocoaintegration.h | |
| parent | c7d80486dee44c096ba993cbda8f69612441a264 (diff) | |
macOS: Clean up headers
The headers are now C++ clean and can be used outside of Objective-C
code. All includes of Objective-C frameworks have been moved to the
implementation files.
Header guards have been added in the few places they were missing.
All includes are now done via #include, instead of sometimes using
the #import variant.
Change-Id: Ibb0a9c0bcfefbda4347737212e40e300a3184982
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 2fb16faca5..d2fffc8e73 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -40,8 +40,6 @@ #ifndef QPLATFORMINTEGRATION_COCOA_H #define QPLATFORMINTEGRATION_COCOA_H -#include <AppKit/AppKit.h> - #include "qcocoacursor.h" #include "qcocoawindow.h" #include "qcocoanativeinterface.h" @@ -59,6 +57,8 @@ #include <qpa/qplatformintegration.h> #include <QtGui/private/qcoretextfontdatabase_p.h> +Q_FORWARD_DECLARE_OBJC_CLASS(NSToolbar); + QT_BEGIN_NAMESPACE class QCocoaIntegration : public QObject, public QPlatformIntegration |