summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-04-01 09:19:26 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-04-01 13:10:27 (GMT)
commitaaf765dfb797da6b72807fad61fd2a1d19187c0c (patch)
tree0d9e081d40557c61b42657dc34f07bf9dc93f17b /src
parentebd82c4fb5d7e9b417baca199b6f9e6893318536 (diff)
downloadQt-aaf765dfb797da6b72807fad61fd2a1d19187c0c.zip
Qt-aaf765dfb797da6b72807fad61fd2a1d19187c0c.tar.gz
Qt-aaf765dfb797da6b72807fad61fd2a1d19187c0c.tar.bz2
Marked QWidget::resetInputContext() function as obsolete.
Fixed the behavior of the function that was broken by me some time ago. But anyway this function is for convenience only since QInputContext that operates on the widget is available to the user directly. Reviewed-by: Prasanth Ullattil
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index fd3d304..f92d660 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -308,20 +308,24 @@ void QWidget::setInputContext(QInputContext *context)
/*!
+ \obsolete
+
This function can be called on the widget that currently has focus
to reset the input method operating on it.
- \sa QInputContext, QInputContext::reset()
+ This function is providing for convenience, instead you should use
+ \l{QInputContext::}{reset()} on the input context that was
+ returned by inputContext().
+
+ \sa QInputContext, inputContext(), QInputContext::reset()
*/
void QWidget::resetInputContext()
{
if (!hasFocus())
return;
#ifndef QT_NO_IM
- if (!d_func()->ic)
- return;
QInputContext *qic = this->inputContext();
- if( qic )
+ if(qic)
qic->reset();
#endif // QT_NO_IM
}