From 8dd50ef206f384ac781d6bb9ca5e254851531298 Mon Sep 17 00:00:00 2001 From: Marcel Krems Date: Mon, 24 Aug 2020 19:33:18 +0200 Subject: Remove deprecated qGenericMatrix{To,From}Matrix4x4 functions Change-Id: I3b43d48f5324f3a1f2fff8e22bb4f9563d3ea997 Reviewed-by: Thiago Macieira --- src/gui/math3d/qmatrix4x4.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/gui/math3d/qmatrix4x4.h') diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 4f1a74a834..5664de6729 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -1109,33 +1109,6 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QMatrix4x4 &); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix4x4 &); #endif -#if QT_DEPRECATED_SINCE(5, 0) -template -QT_DEPRECATED QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix& matrix) -{ - return QMatrix4x4(matrix.constData(), N, M); -} - -template -QT_DEPRECATED QGenericMatrix qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix) -{ - QGenericMatrix result; - const float *m = matrix.constData(); - float *values = result.data(); - for (int col = 0; col < N; ++col) { - for (int row = 0; row < M; ++row) { - if (col < 4 && row < 4) - values[col * M + row] = m[col * 4 + row]; - else if (col == row) - values[col * M + row] = 1.0f; - else - values[col * M + row] = 0.0f; - } - } - return result; -} -#endif - #endif QT_END_NAMESPACE -- cgit v1.2.3