diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2020-08-24 19:33:18 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2020-08-26 01:49:24 +0200 |
| commit | 8dd50ef206f384ac781d6bb9ca5e254851531298 (patch) | |
| tree | 85f612d1c12b53d544757440b09e886d23a6c07f /src/gui/math3d/qmatrix4x4.h | |
| parent | ba9c4ee2cbcfc2513e9e5a3973eac207115aadfd (diff) | |
Remove deprecated qGenericMatrix{To,From}Matrix4x4 functions
Change-Id: I3b43d48f5324f3a1f2fff8e22bb4f9563d3ea997
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/math3d/qmatrix4x4.h')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 27 |
1 files changed, 0 insertions, 27 deletions
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 <int N, int M> -QT_DEPRECATED QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, float>& matrix) -{ - return QMatrix4x4(matrix.constData(), N, M); -} - -template <int N, int M> -QT_DEPRECATED QGenericMatrix<N, M, float> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix) -{ - QGenericMatrix<N, M, float> 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 |