diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-10 12:49:50 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-10 13:03:24 +0100 |
commit | ade15563a6c7613b58201e6e05e3f67fde3f6056 (patch) | |
tree | d6d1e0223ea6d07a6d2a04f38f3f83a8d3aad98e /src | |
parent | c68e0ef22623452ce348c19aa0a7369c064a23d7 (diff) | |
download | qttools-ade15563a6c7613b58201e6e05e3f67fde3f6056.tar.gz |
Don't use deprecated QMatrix class anymore
Task-number: QTBUG-46653
Change-Id: I62145c2ecb97a5f3538502303fbdb81ad33aded7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/designer/src/lib/shared/connectionedit.cpp | 4 | ||||
-rw-r--r-- | src/designer/src/lib/shared/previewmanager.cpp | 14 | ||||
-rw-r--r-- | src/designer/src/lib/shared/zoomwidget.cpp | 2 | ||||
-rw-r--r-- | src/shared/deviceskin/deviceskin.cpp | 4 | ||||
-rw-r--r-- | src/shared/deviceskin/deviceskin.h | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 35b3bbf94..5e43607d4 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -35,7 +35,7 @@ #include <QtGui/qevent.h> #include <QtGui/qfontmetrics.h> #include <QtGui/qpixmap.h> -#include <QtGui/qmatrix.h> +#include <QtGui/qtransform.h> #include <QtWidgets/qapplication.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qaction.h> @@ -881,7 +881,7 @@ void Connection::updatePixmap(EndPoint::Type type) const LineDir dir = labelDir(type); if (dir == DownDir) - *pm = pm->transformed(QMatrix(0.0, -1.0, 1.0, 0.0, 0.0, 0.0)); + *pm = pm->transformed(QTransform(0.0, -1.0, 1.0, 0.0, 0.0, 0.0)); } void Connection::checkWidgets() diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index f7947d938..68466d597 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -54,7 +54,7 @@ #include <QtWidgets/qaction.h> #include <QtWidgets/qactiongroup.h> #include <QtGui/qcursor.h> -#include <QtGui/qmatrix.h> +#include <QtGui/qtransform.h> #include <QtCore/qmap.h> #include <QtCore/qdebug.h> @@ -169,7 +169,7 @@ protected: virtual void fitWidget(const QSize &size); // Calculate the complete transformation for the skin // (base class implementation provides rotation). - virtual QMatrix skinTransform() const; + virtual QTransform skinTransform() const; private: const QSize m_screenSize; @@ -286,9 +286,9 @@ void PreviewDeviceSkin::fitWidget(const QSize &size) view()->setFixedSize(size); } -QMatrix PreviewDeviceSkin::skinTransform() const +QTransform PreviewDeviceSkin::skinTransform() const { - QMatrix newTransform; + QTransform newTransform; switch (m_direction) { case DirectionUp: break; @@ -342,7 +342,7 @@ signals: protected: void populateContextMenu(QMenu *m) override; - QMatrix skinTransform() const override; + QTransform skinTransform() const override; void fitWidget(const QSize &size) override; private: @@ -415,10 +415,10 @@ void ZoomablePreviewDeviceSkin::populateContextMenu(QMenu *menu) menu->addSeparator(); } -QMatrix ZoomablePreviewDeviceSkin::skinTransform() const +QTransform ZoomablePreviewDeviceSkin::skinTransform() const { // Complete transformation consisting of base class rotation and zoom. - QMatrix rc = PreviewDeviceSkin::skinTransform(); + QTransform rc = PreviewDeviceSkin::skinTransform(); const int zp = zoomPercent(); if (zp != 100) { const qreal factor = zoomFactor(zp); diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index 7a7ca2afc..9670958ce 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -516,7 +516,7 @@ void ZoomWidget::dump() const { qDebug() << "ZoomWidget::dump " << geometry() << " Viewport " << viewport()->geometry() - << "Scroll: " << scrollPosition() << "Matrix: " << matrix() << " SceneRect: " << sceneRect(); + << "Scroll: " << scrollPosition() << "Transform: " << transform() << " SceneRect: " << sceneRect(); if (m_proxy) { qDebug() << "Proxy Pos: " << m_proxy->pos() << "Proxy " << m_proxy->size() << "\nProxy size hint" diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index bc594f118..b44f06103 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -474,7 +474,7 @@ DeviceSkin::~DeviceSkin( ) delete cursorw; } -void DeviceSkin::setTransform( const QMatrix& wm ) +void DeviceSkin::setTransform(const QTransform &wm) { transform = QImage::trueMatrix(wm,m_parameters.skinImageUp.width(),m_parameters.skinImageUp.height()); calcRegions(); @@ -488,7 +488,7 @@ void DeviceSkin::setTransform( const QMatrix& wm ) void DeviceSkin::setZoom( double z ) { - setTransform(QMatrix().scale(z,z)); + setTransform(QTransform().scale(z,z)); } void DeviceSkin::updateSecondaryScreen() diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h index 348119d96..fcdb88093 100644 --- a/src/shared/deviceskin/deviceskin.h +++ b/src/shared/deviceskin/deviceskin.h @@ -113,7 +113,7 @@ public: void setSecondaryView( QWidget *v ); void setZoom( double ); - void setTransform( const QMatrix& ); + void setTransform(const QTransform &); bool hasCursor() const; @@ -155,7 +155,7 @@ private: QPoint clickPos; bool buttonPressed; int buttonIndex; - QMatrix transform; + QTransform transform; qvfb_internal::CursorWindow *cursorw; bool joydown; |