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/widgets/qwidgetlinecontrol_p.h | |
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/widgets/qwidgetlinecontrol_p.h')
-rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 566b930024..1d955363e6 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -62,7 +62,7 @@ #include "QtWidgets/qstyleoption.h" #include "QtCore/qpointer.h" #include "QtGui/qclipboard.h" -#include "QtGui/qinputpanel.h" +#include "QtGui/qinputmethod.h" #include "QtCore/qpoint.h" #include "QtWidgets/qcompleter.h" #include "QtCore/qthread.h" @@ -232,7 +232,7 @@ public: void setText(const QString &txt) { if (composeMode()) - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); m_tentativeCommit.clear(); internalSetText(txt, -1, false); } @@ -318,7 +318,7 @@ public: Qt::LayoutDirection layoutDirection() const { if (m_layoutDirection == Qt::LayoutDirectionAuto) { if (m_text.isEmpty()) - return qApp->inputPanel()->inputDirection(); + return qApp->inputMethod()->inputDirection(); return m_text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; } return m_layoutDirection; |