diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-01 09:43:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 11:01:34 +0100 |
| commit | c802a5d272cde1f18a8debfb50b02ab1c682c2fc (patch) | |
| tree | 995138a95baa7a285d5912f6bd9fe8c24f38a405 /src/widgets/kernel/qwidget.cpp | |
| parent | 0160f58d4ba5efd3beacaca3ce122554a90f1eb4 (diff) | |
Remove QInputContext
This has only been around as compatibility interface for Qt4
but is now replaced by QPlatformInputContext.
Change-Id: I677dbbea46311bf39f6c5ca9dc3fb5009abe924a
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2a7497947d4..4709a89d273 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -75,7 +75,6 @@ #include "qdebug.h" #include "private/qstylesheetstyle_p.h" #include "private/qstyle_p.h" -#include "qinputcontext.h" #include "qfileinfo.h" #include "private/qsoftkeymanager_p.h" #include <QtGui/qinputmethod.h> @@ -358,24 +357,6 @@ void QWidgetPrivate::updateWidgetTransform() } } -/*! - This function returns the QInputContext for this widget. By - default the input context is inherited from the widgets - parent. For toplevels it is inherited from QApplication. - - You can override this and set a special input context for this - widget by using the setInputContext() method. - - \sa setInputContext() -*/ -QInputContext *QWidget::inputContext() -{ - if (!testAttribute(Qt::WA_InputMethodEnabled)) - return 0; - - return qApp->inputContext(); -} - #ifdef QT_KEYPAD_NAVIGATION QPointer<QWidget> QWidgetPrivate::editingWidget; @@ -8752,7 +8733,7 @@ void QWidget::inputMethodEvent(QInputMethodEvent *event) \a query specifies which property is queried. - \sa inputMethodEvent(), QInputMethodEvent, QInputContext, inputMethodHints + \sa inputMethodEvent(), QInputMethodEven, inputMethodHints */ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const { @@ -8790,7 +8771,7 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const \since 4.6 - \sa inputMethodQuery(), QInputContext + \sa inputMethodQuery() */ Qt::InputMethodHints QWidget::inputMethodHints() const { @@ -10507,8 +10488,6 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable) /*! Updates the widget's micro focus. - - \sa QInputContext */ void QWidget::updateMicroFocus() { |