diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-15 14:30:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 04:28:49 +0100 |
| commit | c79f36c51f24905c188a1a6a7e2b38960713f093 (patch) | |
| tree | 9982302a6b605ba5a0704eec1065f9536c7905ce /src/quick/items/qquicktextinput_p.h | |
| parent | ece70ccba8718804bf8f42dafdcda00f8caa4d1a (diff) | |
Have input method hints on only classes using them
Removed inputMethodHints setter and getter from QQuickItem.
No need to consume memory for input method hints on every item when
only QQuickTextInput and QQuickTextEdit actually use them.
Additionally introduced change signals on the editor hint properties.
Change-Id: Ice380d4f4dd47fdde73d2468f4a44a7d1540ad45
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index b5b3d0f430..952752205d 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -88,7 +88,7 @@ class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged) #endif Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged) - Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ imHints WRITE setIMHints) + Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged) Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged) Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged) @@ -251,8 +251,8 @@ public: bool isInputMethodComposing() const; - Qt::InputMethodHints imHints() const; - void setIMHints(Qt::InputMethodHints hints); + Qt::InputMethodHints inputMethodHints() const; + void setInputMethodHints(Qt::InputMethodHints hints); Q_INVOKABLE QString getText(int start, int end) const; @@ -295,6 +295,7 @@ Q_SIGNALS: void inputMethodComposingChanged(); void effectiveHorizontalAlignmentChanged(); void contentSizeChanged(); + void inputMethodHintsChanged(); protected: virtual void geometryChanged(const QRectF &newGeometry, |