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/qcocoaaccessibilityelement.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/qcocoaaccessibilityelement.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h index f74afb8440..93158e562f 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h @@ -36,28 +36,21 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QCOCOAACCESIBILITYELEMENT_H #define QCOCOAACCESIBILITYELEMENT_H -#include <QtCore/qglobal.h> - -#include <QtCore/private/qcore_mac_p.h> - #ifndef QT_NO_ACCESSIBILITY -#import <Cocoa/Cocoa.h> -#import <AppKit/NSAccessibility.h> - -#import <qaccessible.h> +#include <QtCore/qglobal.h> -@interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement) : NSObject <NSAccessibilityElement> +#include <QtCore/private/qcore_mac_p.h> +#include <QtGui/qaccessible.h> +QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QMacAccessibilityElement, NSObject <NSAccessibilityElement> - (instancetype)initWithId:(QAccessible::Id)anId; + (instancetype)elementWithId:(QAccessible::Id)anId; - -@end - -QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement); +) #endif // QT_NO_ACCESSIBILITY |