From e761f5b906c427433325debb9f08c4f2d0ba902d Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Fri, 3 Feb 2012 10:07:51 +0200 Subject: Use QInputMethod instead of deprecated QInputPanel Similarly deprecate Qt.application.inputPanel and introduce replacement Qt.inputMethod. Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146 Reviewed-by: Joona Petrell Reviewed-by: Lars Knoll Reviewed-by: Sami Kananoja --- src/quick/items/qquickcanvas.cpp | 8 ++++---- src/quick/items/qquickitem.cpp | 6 +++--- src/quick/items/qquicktext.cpp | 4 ++-- src/quick/items/qquicktextcontrol.cpp | 8 ++++---- src/quick/items/qquicktextedit.cpp | 10 +++++----- src/quick/items/qquicktextinput.cpp | 18 +++++++++--------- src/quick/items/qquicktextinput_p_p.h | 2 +- src/quick/util/qdeclarativeutilmodule.cpp | 7 +++++-- 8 files changed, 33 insertions(+), 30 deletions(-) (limited to 'src/quick') diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index c9371b5087..6c5b223c6e 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include @@ -77,7 +77,7 @@ void QQuickCanvasPrivate::updateFocusItemTransform() Q_Q(QQuickCanvas); QQuickItem *focus = q->activeFocusItem(); if (focus && qApp->focusObject() == focus) - qApp->inputPanel()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToCanvasTransform()); + qApp->inputMethod()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToCanvasTransform()); } class QQuickCanvasIncubationController : public QObject, public QDeclarativeIncubationController @@ -498,7 +498,7 @@ void QQuickCanvasPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, F if (oldActiveFocusItem) { #ifndef QT_NO_IM - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); #endif activeFocusItem = 0; @@ -605,7 +605,7 @@ void QQuickCanvasPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item, Q_ASSERT(oldActiveFocusItem); #ifndef QT_NO_IM - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); #endif activeFocusItem = 0; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f443b1acd0..67da4c8fc8 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include @@ -3128,7 +3128,7 @@ void QQuickItem::setInputMethodHints(Qt::InputMethodHints hints) return; if (qApp->focusObject() == this) - qApp->inputPanel()->update(Qt::ImHints); + qApp->inputMethod()->update(Qt::ImHints); } QVariant QQuickItem::inputMethodQuery(Qt::InputMethodQuery query) const @@ -3671,7 +3671,7 @@ void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value) void QQuickItem::updateInputMethod(Qt::InputMethodQueries queries) { if (hasActiveFocus()) - qApp->inputPanel()->update(queries); + qApp->inputMethod()->update(queries); } /*! \internal */ diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index c671320fb9..52365a8a21 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include @@ -1470,7 +1470,7 @@ bool QQuickTextPrivate::setHAlign(QQuickText::HAlignment alignment, bool forceAl bool QQuickTextPrivate::determineHorizontalAlignment() { if (hAlignImplicit) { - bool alignToRight = text.isEmpty() ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft : rightToLeftText; + bool alignToRight = text.isEmpty() ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : rightToLeftText; return setHAlign(alignToRight ? QQuickText::AlignRight : QQuickText::AlignLeft); } return false; diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 06ab5c3fc2..a763626410 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include "private/qtextdocumentlayout_p.h" #include "private/qabstracttextdocumentlayout_p.h" #include "qtextdocument.h" @@ -1310,7 +1310,7 @@ void QQuickTextControlPrivate::mouseMoveEvent(QMouseEvent *e, const QPointF &mou emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); if (qGuiApp) - qGuiApp->inputPanel()->update(Qt::ImQueryInput); + qGuiApp->inputMethod()->update(Qt::ImQueryInput); } else if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); } @@ -1424,7 +1424,7 @@ bool QQuickTextControlPrivate::sendMouseEventToInputContext(QMouseEvent *e, cons if (cursorPos >= 0 && cursorPos <= layout->preeditAreaText().length()) { if (e->type() == QEvent::MouseButtonRelease) { - qApp->inputPanel()->invokeAction(QInputPanel::Click, cursorPos); + qApp->inputMethod()->invokeAction(QInputMethod::Click, cursorPos); } return true; @@ -1859,7 +1859,7 @@ void QQuickTextControlPrivate::commitPreedit() return; cursor.beginEditBlock(); - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); if (!tentativeCommit.isEmpty()) { cursor.insertText(tentativeCommit); diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 85480cf558..5343715c3a 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -560,7 +560,7 @@ bool QQuickTextEditPrivate::determineHorizontalAlignment() if (document->isEmpty()) { const QString preeditText = control->textCursor().block().layout()->preeditAreaText(); alignToRight = preeditText.isEmpty() - ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : preeditText.isRightToLeft(); } else { alignToRight = rightToLeftText; @@ -1545,10 +1545,10 @@ void QQuickTextEdit::itemChange(ItemChange change, const ItemChangeData &value) if (value.boolValue) { q_updateAlignment(); - connect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } else { - disconnect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } } @@ -2099,7 +2099,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption() void QQuickTextEdit::openSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->show(); + qGuiApp->inputMethod()->show(); } /*! @@ -2142,7 +2142,7 @@ void QQuickTextEdit::openSoftwareInputPanel() void QQuickTextEdit::closeSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->hide(); + qGuiApp->inputMethod()->hide(); } void QQuickTextEdit::focusInEvent(QFocusEvent *event) diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index d4f73f7514..830b875617 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" @@ -131,7 +131,7 @@ void QQuickTextInput::setText(const QString &s) if (s == text()) return; if (d->composeMode()) - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); d->m_tentativeCommit.clear(); d->internalSetText(s, -1, false); } @@ -482,7 +482,7 @@ bool QQuickTextInputPrivate::determineHorizontalAlignment() QString text = q_func()->text(); if (text.isEmpty()) text = m_textLayout.preeditAreaText(); - bool isRightToLeft = text.isEmpty() ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + bool isRightToLeft = text.isEmpty() ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : text.isRightToLeft(); return setHAlign(isRightToLeft ? QQuickTextInput::AlignRight : QQuickTextInput::AlignLeft); } @@ -1529,7 +1529,7 @@ bool QQuickTextInputPrivate::sendMouseEventToInputContext(QMouseEvent *event) int mousePos = tmp_cursor - m_cursor; if (mousePos >= 0 && mousePos <= m_textLayout.preeditAreaText().length()) { if (event->type() == QEvent::MouseButtonRelease) { - qApp->inputPanel()->invokeAction(QInputPanel::Click, mousePos); + qApp->inputMethod()->invokeAction(QInputMethod::Click, mousePos); } return true; } @@ -2417,7 +2417,7 @@ void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode) void QQuickTextInput::openSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->show(); + qGuiApp->inputMethod()->show(); } /*! @@ -2460,7 +2460,7 @@ void QQuickTextInput::openSoftwareInputPanel() void QQuickTextInput::closeSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->hide(); + qGuiApp->inputMethod()->hide(); } void QQuickTextInput::focusInEvent(QFocusEvent *event) @@ -2490,11 +2490,11 @@ void QQuickTextInput::itemChange(ItemChange change, const ItemChangeData &value) d->commitPreedit(); if (!d->persistentSelection) d->deselect(); - disconnect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } else { q_updateAlignment(); - connect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } } @@ -2790,7 +2790,7 @@ void QQuickTextInputPrivate::commitPreedit() if (!composeMode()) return; - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); if (!m_tentativeCommit.isEmpty()) { internalInsert(m_tentativeCommit); diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index a124dbbdad..07d73bebdf 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -395,7 +395,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; diff --git a/src/quick/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp index 1841a8c94f..02e4e9cf52 100644 --- a/src/quick/util/qdeclarativeutilmodule.cpp +++ b/src/quick/util/qdeclarativeutilmodule.cpp @@ -61,11 +61,14 @@ #include #include #include -#include +#include void QDeclarativeUtilModule::defineModule() { - qmlRegisterUncreatableType("QtQuick",2,0,"InputPanel", QInputPanel::tr("InputPanel is an abstract class")); + qmlRegisterUncreatableType("QtQuick",2,0,"InputPanel", + QInputMethod::tr("InputPanel is an abstract class")); // deprecated + qmlRegisterUncreatableType("QtQuick",2,0,"InputMethod", + QInputMethod::tr("InputMethod is an abstract class")); qmlRegisterUncreatableType("QtQuick",2,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); qmlRegisterType("QtQuick",2,0,"Behavior"); -- cgit v1.2.3