From fe13d53c24b8917a2cc88097d96a7aac4b1c6927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 19 Nov 2014 15:57:32 +0100 Subject: iOS: Clean up QPlatformInputContext subclass header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implements isValid(), which should be returning true for subclasses, and re-orders and adds Q_DECL_OVERRIDE where appropriate. Change-Id: I03519bf674b6f7b7ccc07a7154c9a1fb9a8105f2 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/ios/qiosinputcontext.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/plugins/platforms/ios/qiosinputcontext.h') diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h index d2a9c261ba..b4ff695f1a 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.h +++ b/src/plugins/platforms/ios/qiosinputcontext.h @@ -63,25 +63,27 @@ public: QIOSInputContext(); ~QIOSInputContext(); - QRectF keyboardRect() const; + bool isValid() const Q_DECL_OVERRIDE { return true; } - void showInputPanel(); - void hideInputPanel(); + void showInputPanel() Q_DECL_OVERRIDE; + void hideInputPanel() Q_DECL_OVERRIDE; - void clearCurrentFocusObject(); + bool isInputPanelVisible() const Q_DECL_OVERRIDE; + QRectF keyboardRect() const Q_DECL_OVERRIDE; + + void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + void commit() Q_DECL_OVERRIDE; - bool isInputPanelVisible() const; - void setFocusObject(QObject *object); + void clearCurrentFocusObject(); + void setFocusObject(QObject *object) Q_DECL_OVERRIDE; void focusWindowChanged(QWindow *focusWindow); void cursorRectangleChanged(); + void scrollToCursor(); void scroll(int y); - void update(Qt::InputMethodQueries); - void reset(); - void commit(); - const ImeState &imeState() { return m_imeState; }; bool inputMethodAccepted() const; -- cgit v1.2.3