diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-06-26 16:41:01 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 17:15:17 +0200 |
commit | 92283176ac3ab537b589dd6530fc7849adf5cae4 (patch) | |
tree | e70a02a7d72a969de171c8501820765de01a102b | |
parent | 4cf993c3ac60717a8a803c550b58ef63c0defa39 (diff) |
Remove deprecated tentative commit from QInputMethodEvent
Introduced and deprecated during Qt5 development.
Change-Id: I5bceefcb5dfc13f8eae2ad22f04feeea5f87dcb3
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
-rw-r--r-- | src/gui/kernel/qevent.cpp | 19 | ||||
-rw-r--r-- | src/gui/kernel/qevent.h | 7 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index abd6bafaf5..0c2dc0aae1 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1676,15 +1676,6 @@ void QInputMethodEvent::setCommitString(const QString &commitString, int replace } /*! - \fn void QInputMethodEvent::setTentativeCommitString(const QString &string) - Sets the tentative commit string to \a string. - - The tentative commit string is what the preedit string is expected to be committed as. - The string can be used within the editor to trigger code that reacts on text changes such as validators. - \deprecated -*/ - -/*! \fn const QList<Attribute> &QInputMethodEvent::attributes() const Returns the list of attributes passed to the QInputMethodEvent @@ -1734,16 +1725,6 @@ void QInputMethodEvent::setCommitString(const QString &commitString, int replace */ /*! - \fn const QString &tentativeCommitString() const - - Returns the text as which preedit string is expected to be committed as. - The string can be used within the editor to trigger code that reacts on text changes such as validators. - \deprecated - - \sa setTentativeCommitString() -*/ - -/*! \class QInputMethodQueryEvent \since 5.0 \inmodule QtGui diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 55c8ed4de6..5ff5b112f4 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -457,12 +457,6 @@ public: inline int replacementStart() const { return replace_from; } inline int replacementLength() const { return replace_length; } -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED inline void setTentativeCommitString(const QString &string) - { tentativeCommit = string; } - QT_DEPRECATED inline const QString &tentativeCommitString() const { return tentativeCommit; } -#endif - QInputMethodEvent(const QInputMethodEvent &other); private: @@ -471,7 +465,6 @@ private: QString commit; int replace_from; int replace_length; - QString tentativeCommit; }; Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_MOVABLE_TYPE); |