diff options
author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-11-18 13:19:09 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-24 10:33:29 +0100 |
commit | 5aad0f5da641d778958a4127f33cbd9943e6a6c5 (patch) | |
tree | 2a4f83a9df6235e95f193891b4f32478fda7119f /src | |
parent | 296951a630d932f0834d26efb8912dc04cf79823 (diff) |
Get rid of unused inputMethodQuery and inputMethodEvent functions in QQuickCanvas
* in Qt5 input method events and queries are meant to be sent directly to
QInputPanel::inputItem() instead of the focused QWindow
* protected inputMethodEvent was actually never called by QWindow::event()
like it called other specialized event functions
Change-Id: I68cced106808098c320841d6a17a0cc170a8369f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qquickcanvas.cpp | 38 | ||||
-rw-r--r-- | src/declarative/items/qquickcanvas.h | 3 |
2 files changed, 0 insertions, 41 deletions
diff --git a/src/declarative/items/qquickcanvas.cpp b/src/declarative/items/qquickcanvas.cpp index 765f9eca8d..c699a76f06 100644 --- a/src/declarative/items/qquickcanvas.cpp +++ b/src/declarative/items/qquickcanvas.cpp @@ -805,28 +805,6 @@ void QQuickCanvasPrivate::updateInputMethodData() qApp->inputPanel()->setInputItem(inputItem); } -/*! - Queries the Input Method. -*/ -QVariant QQuickCanvas::inputMethodQuery(Qt::InputMethodQuery query) const -{ - Q_D(const QQuickCanvas); - if (!d->activeFocusItem || !(QQuickItemPrivate::get(d->activeFocusItem)->flags & QQuickItem::ItemAcceptsInputMethod)) - return QVariant(); - QVariant value = d->activeFocusItem->inputMethodQuery(query); - - //map geometry types - QVariant::Type type = value.type(); - if (type == QVariant::RectF || type == QVariant::Rect) { - const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform(); - value = transform.mapRect(value.toRectF()); - } else if (type == QVariant::PointF || type == QVariant::Point) { - const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform(); - value = transform.map(value.toPointF()); - } - return value; -} - void QQuickCanvasPrivate::dirtyItem(QQuickItem *) { Q_Q(QQuickCanvas); @@ -998,14 +976,6 @@ void QQuickCanvas::keyReleaseEvent(QKeyEvent *e) sendEvent(d->activeFocusItem, e); } -void QQuickCanvas::inputMethodEvent(QInputMethodEvent *e) -{ - Q_D(QQuickCanvas); - - if (d->activeFocusItem) - sendEvent(d->activeFocusItem, e); -} - bool QQuickCanvasPrivate::deliverInitialMousePressEvent(QQuickItem *item, QMouseEvent *event) { Q_Q(QQuickCanvas); @@ -1591,14 +1561,6 @@ bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e) QQuickItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e)); } break; - case QEvent::InputMethod: - e->accept(); - QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e)); - while (!e->isAccepted() && (item = item->parentItem())) { - e->accept(); - QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e)); - } - break; case QEvent::FocusIn: case QEvent::FocusOut: QQuickItemPrivate::get(item)->deliverFocusEvent(static_cast<QFocusEvent *>(e)); diff --git a/src/declarative/items/qquickcanvas.h b/src/declarative/items/qquickcanvas.h index bf8693a354..83e3087493 100644 --- a/src/declarative/items/qquickcanvas.h +++ b/src/declarative/items/qquickcanvas.h @@ -85,8 +85,6 @@ public: bool sendEvent(QQuickItem *, QEvent *); - QVariant inputMethodQuery(Qt::InputMethodQuery query) const; - QSGEngine *sceneGraphEngine() const; void setVSyncAnimations(bool enabled); @@ -132,7 +130,6 @@ protected: virtual bool event(QEvent *); virtual void keyPressEvent(QKeyEvent *); virtual void keyReleaseEvent(QKeyEvent *); - virtual void inputMethodEvent(QInputMethodEvent *); virtual void mousePressEvent(QMouseEvent *); virtual void mouseReleaseEvent(QMouseEvent *); virtual void mouseDoubleClickEvent(QMouseEvent *); |