Remove deprecated tentative commit from QInputMethodEvent
Introduced and deprecated during Qt5 development. Change-Id: I5bceefcb5dfc13f8eae2ad22f04feeea5f87dcb3 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
This commit is contained in:
parent
4cf993c3ac
commit
92283176ac
@ -1675,15 +1675,6 @@ void QInputMethodEvent::setCommitString(const QString &commitString, int replace
|
||||
replace_length = replaceLength;
|
||||
}
|
||||
|
||||
/*!
|
||||
\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
|
||||
|
||||
@ -1733,16 +1724,6 @@ void QInputMethodEvent::setCommitString(const QString &commitString, int replace
|
||||
\sa replacementStart(), setCommitString()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\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
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user