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/qcocoaaccessibility.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/qcocoaaccessibility.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaaccessibility.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.h b/src/plugins/platforms/cocoa/qcocoaaccessibility.h index 539d876094..5f89a41e65 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h @@ -36,18 +36,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QCOCOAACCESIBILITY_H #define QCOCOAACCESIBILITY_H -#include <AppKit/AppKit.h> +#ifndef QT_NO_ACCESSIBILITY -#include <QtGui> #include <qpa/qplatformaccessibility.h> #include "qcocoaaccessibilityelement.h" -#ifndef QT_NO_ACCESSIBILITY - QT_BEGIN_NAMESPACE class QCocoaAccessibility : public QPlatformAccessibility @@ -81,6 +79,7 @@ namespace QCocoaAccessible { demand. */ +#if defined(__OBJC__) NSString *macRole(QAccessibleInterface *interface); NSString *macSubrole(QAccessibleInterface *interface); bool shouldBeIgnored(QAccessibleInterface *interface); @@ -89,6 +88,7 @@ NSString *getTranslatedAction(const QString &qtAction); QString translateAction(NSString *nsAction, QAccessibleInterface *interface); bool hasValueAttribute(QAccessibleInterface *interface); id getValueAttribute(QAccessibleInterface *interface); +#endif // __OBJC__ } |