diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-13 17:13:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 05:07:51 +0100 |
| commit | 4f3300b7ce5c3138421a21ec83615a536c9fd316 (patch) | |
| tree | e3ffcd7bcb7b8290a6a50c2997849657bfb6dfd1 /src/declarative/graphicsitems | |
| parent | 278a39cec989c1f9e6d69b21e1f404bd61ee4ec6 (diff) | |
Adapt to QInputPanel -> QInputMethod renaming
Change-Id: Id11fc9ae1be91611fee22d28407e54035e190c71
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 8 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 940644c3..38bc4531 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -56,7 +56,7 @@ #include <QGraphicsSceneMouseEvent> #include <QDebug> #include <QPainter> -#include <QtGui/QInputPanel> +#include <QtGui/QInputMethod> #include <private/qwidgettextcontrol_p.h> @@ -553,7 +553,7 @@ bool QDeclarativeTextEditPrivate::determineHorizontalAlignment() ? control->textCursor().block().layout()->preeditAreaText() : QString(); alignToRight = preeditText.isEmpty() - ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : preeditText.isRightToLeft(); } else { alignToRight = rightToLeftText; @@ -1816,7 +1816,7 @@ void QDeclarativeTextEdit::openSoftwareInputPanel() if (qApp) { if (QGraphicsView * view = qobject_cast<QGraphicsView*>(qApp->focusWidget())) { if (view->scene() && view->scene() == scene()) { - qApp->inputPanel()->show(); + qApp->inputMethod()->show(); } } } @@ -1865,7 +1865,7 @@ void QDeclarativeTextEdit::closeSoftwareInputPanel() if (qApp) { if (QGraphicsView * view = qobject_cast<QGraphicsView*>(qApp->focusWidget())) { if (view->scene() && view->scene() == scene()) { - qApp->inputPanel()->hide(); + qApp->inputMethod()->hide(); } } } diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 8715ba72..ad43cd48 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -48,7 +48,7 @@ #include <QValidator> #include <QTextCursor> #include <QApplication> -#include <QtGui/QInputPanel> +#include <QtGui/QInputMethod> #include <QFontMetrics> #include <QPainter> #include <QTextBoundaryFinder> @@ -411,7 +411,7 @@ bool QDeclarativeTextInputPrivate::determineHorizontalAlignment() if (text.isEmpty()) text = control->preeditAreaText(); bool isRightToLeft = text.isEmpty() - ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : text.isRightToLeft(); return setHAlign(isRightToLeft ? QDeclarativeTextInput::AlignRight : QDeclarativeTextInput::AlignLeft); } @@ -1229,7 +1229,7 @@ bool QDeclarativeTextInputPrivate::sendMouseEventToInputContext( int mousePos = tmp_cursor - control->cursor(); if (mousePos >= 0 && mousePos <= control->preeditAreaText().length()) { if (eventType == QEvent::MouseButtonRelease) { - qApp->inputPanel()->invokeAction(QInputPanel::Click, mousePos); + qApp->inputMethod()->invokeAction(QInputPanel::Click, mousePos); } return true; } |