From f86993cdeef298131bfcdc4e2078e7a353d42dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 3 Jul 2014 17:55:59 +0200 Subject: iOS: Refactor qioswindow.mm into quiview.mm and quiview_accessibility.mm Change-Id: Ib6297e37d67b2c0ea251ae054b8ff877af2673a5 Reviewed-by: Richard Moe Gustavsen --- src/plugins/platforms/ios/quiview.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms/ios/quiview.h') diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h index 7c65037004..99c710ffee 100644 --- a/src/plugins/platforms/ios/quiview.h +++ b/src/plugins/platforms/ios/quiview.h @@ -40,11 +40,23 @@ ****************************************************************************/ #import -#include "qioswindow.h" + +#include +#include + +#include + +class QIOSWindow; @interface QUIView : UIView { -@public + @public + QIOSWindow *m_qioswindow; + @private + QHash m_activeTouches; + int m_nextTouchId; + + @public UITextAutocapitalizationType autocapitalizationType; UITextAutocorrectionType autocorrectionType; BOOL enablesReturnKeyAutomatically; @@ -52,12 +64,10 @@ UIKeyboardType keyboardType; UIReturnKeyType returnKeyType; BOOL secureTextEntry; - QIOSWindow *m_qioswindow; - QHash m_activeTouches; - int m_nextTouchId; QString m_markedText; BOOL m_inSendEventToFocusObject; + @private NSMutableArray *m_accessibleElements; } @@ -71,6 +81,8 @@ @property(nonatomic) UIReturnKeyType returnKeyType; @property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry; +- (id)initWithQIOSWindow:(QIOSWindow *)window; +- (void)sendUpdatedExposeEvent; @end @interface QUIView (TextInput) @@ -79,3 +91,7 @@ - (void)commit; + (bool)inUpdateKeyboardLayout; @end + +@interface QUIView (Accessibility) +- (void)clearAccessibleCache; +@end -- cgit v1.2.3