diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-24 17:44:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 11:10:04 +0100 |
commit | 71726ccf676ef0921ef557c7162d2d87563066fb (patch) | |
tree | 5c6095908fcc9bb37fb3716cdc430aad5de5aab1 /src/widgets/kernel/qinputcontext.cpp | |
parent | b2b3abe0ebc0ca147e1a29d06d1872bc09bf16cc (diff) |
Renamed QInputPanel as QInputMethod
QInputMethod better describes what the class is about, input methods
in general, be they panels or just composing input from key events.
Compatability headers added for old name. Not bulletproof but should be
enough to get transition done.
Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qinputcontext.cpp')
-rw-r--r-- | src/widgets/kernel/qinputcontext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/kernel/qinputcontext.cpp b/src/widgets/kernel/qinputcontext.cpp index 53e9cce553..fcbee624f5 100644 --- a/src/widgets/kernel/qinputcontext.cpp +++ b/src/widgets/kernel/qinputcontext.cpp @@ -65,7 +65,7 @@ #include "qmenu.h" #include "qtextformat.h" #include "qpalette.h" -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include <QtGui/qevent.h> #include <stdlib.h> @@ -228,7 +228,7 @@ void QInputContext::setFocusWidget(QWidget *widget) void QInputContext::sendEvent(const QInputMethodEvent &event) { - QObject *focus = qApp->inputPanel()->inputItem(); + QObject *focus = qApp->inputMethod()->inputItem(); if (!focus) return; @@ -257,7 +257,7 @@ void QInputContext::sendEvent(const QInputMethodEvent &event) void QInputContext::mouseHandler(int x, QMouseEvent *event) { if (event->type() == QEvent::MouseButtonRelease) - qApp->inputPanel()->invokeAction(QInputPanel::Click, x); + qApp->inputMethod()->invokeAction(QInputMethod::Click, x); } @@ -280,7 +280,7 @@ QFont QInputContext::font() const */ void QInputContext::update() { - qApp->inputPanel()->update(Qt::ImQueryAll); + qApp->inputMethod()->update(Qt::ImQueryAll); } /*! @@ -291,7 +291,7 @@ void QInputContext::update() void QInputContext::widgetDestroyed(QWidget *widget) { Q_UNUSED(widget) - // nothing to be done here, as we use a weak pointer in the input panel + // nothing to be done here, as we use a weak pointer in the input method } /*! @@ -316,7 +316,7 @@ void QInputContext::widgetDestroyed(QWidget *widget) */ void QInputContext::reset() { - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); } |