summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/ios
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-11-19 15:57:32 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-11-25 20:26:53 +0100
commitfe13d53c24b8917a2cc88097d96a7aac4b1c6927 (patch)
tree6985e6f29202103e315a2d52e49bdab1b048f193 /src/plugins/platforms/ios
parentc238d34137ffe80d30933733a12aa2893b9631c2 (diff)
iOS: Clean up QPlatformInputContext subclass header
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 <richard.gustavsen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios')
-rw-r--r--src/plugins/platforms/ios/qiosinputcontext.h22
1 files changed, 12 insertions, 10 deletions
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;