diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-10 11:35:17 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-17 11:35:38 +0100 |
| commit | e5f7c5f2712957d0e1753c629e4cce86a0e6bdbc (patch) | |
| tree | bcf701df26f9546035d8492ed8cd2938f2ee8093 /src/quick/items/qquicktextcontrol.cpp | |
| parent | c6899f16389458766904d8d913054f09076e06dd (diff) | |
Don't use deprecated QMatrix class anymore
Task-number: QTBUG-46653
Change-Id: I3570c84014788b7b66d9cb54b77f9964ae15af6d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextcontrol.cpp')
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 3c392be751..4c741f67e3 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -60,6 +60,7 @@ #include <QtCore/qloggingcategory.h> #include <qtextformat.h> +#include <qtransform.h> #include <qdatetime.h> #include <qbuffer.h> #include <qguiapplication.h> @@ -718,12 +719,12 @@ void QQuickTextControl::selectAll() void QQuickTextControl::processEvent(QEvent *e, const QPointF &coordinateOffset) { - QMatrix m; - m.translate(coordinateOffset.x(), coordinateOffset.y()); - processEvent(e, m); + QTransform t; + t.translate(coordinateOffset.x(), coordinateOffset.y()); + processEvent(e, t); } -void QQuickTextControl::processEvent(QEvent *e, const QMatrix &matrix) +void QQuickTextControl::processEvent(QEvent *e, const QTransform &transform) { Q_D(QQuickTextControl); if (d->interactionFlags == Qt::NoTextInteraction) { @@ -740,25 +741,25 @@ void QQuickTextControl::processEvent(QEvent *e, const QMatrix &matrix) break; case QEvent::MouseButtonPress: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mousePressEvent(ev, matrix.map(ev->localPos())); + d->mousePressEvent(ev, transform.map(ev->localPos())); break; } case QEvent::MouseMove: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseMoveEvent(ev, matrix.map(ev->localPos())); + d->mouseMoveEvent(ev, transform.map(ev->localPos())); break; } case QEvent::MouseButtonRelease: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseReleaseEvent(ev, matrix.map(ev->localPos())); + d->mouseReleaseEvent(ev, transform.map(ev->localPos())); break; } case QEvent::MouseButtonDblClick: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseDoubleClickEvent(ev, matrix.map(ev->localPos())); + d->mouseDoubleClickEvent(ev, transform.map(ev->localPos())); break; } case QEvent::HoverEnter: case QEvent::HoverMove: case QEvent::HoverLeave: { QHoverEvent *ev = static_cast<QHoverEvent *>(e); - d->hoverEvent(ev, matrix.map(ev->posF())); + d->hoverEvent(ev, transform.map(ev->posF())); break; } #if QT_CONFIG(im) case QEvent::InputMethod: |