From 2dddba7f6641e2a49912e87d07dfecd3bb68d916 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Thu, 5 Aug 2010 11:47:13 +0200
Subject: Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4

Rev-by: dev mailing list
---
 src/gui/math3d/qmatrix4x4.cpp | 10 +++++-----
 src/gui/math3d/qmatrix4x4.h   |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 04a9099..2f03bd0 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -110,7 +110,7 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
     the remaining elements are filled with elements from the identity
     matrix.
 
-    \sa toGenericMatrix(), qGenericMatrixToMatrix4x4()
+    \sa toGenericMatrix()
 */
 
 /*!
@@ -120,32 +120,32 @@ QMatrix4x4::QMatrix4x4(const qreal *values)
     top-most M rows of this 4x4 matrix.  If N or M is greater than 4,
     then the remaining elements are filled with elements from the
     identity matrix.
-
-    \sa qGenericMatrixFromMatrix4x4()
 */
 
 /*!
     \fn QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
     \relates QMatrix4x4
+    \obsolete
 
     Returns a 4x4 matrix constructed from the left-most 4 columns and
     top-most 4 rows of \a matrix.  If \a matrix has less than 4 columns
     or rows, the remaining elements are filled with elements from the
     identity matrix.
 
-    \sa qGenericMatrixFromMatrix4x4()
+    \sa QMatrix4x4(const QGenericMatrix &)
 */
 
 /*!
     \fn QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
     \relates QMatrix4x4
+    \obsolete
 
     Returns a NxM generic matrix constructed from the left-most N columns
     and top-most M rows of \a matrix.  If N or M is greater than 4,
     then the remaining elements are filled with elements from the
     identity matrix.
 
-    \sa qGenericMatrixToMatrix4x4(), QMatrix4x4::toGenericMatrix()
+    \sa QMatrix4x4::toGenericMatrix()
 */
 
 /*!
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 1f77d36..598058c 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -986,14 +986,15 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QMatrix4x4 &);
 Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix4x4 &);
 #endif
 
+#ifdef QT_DEPRECATED
 template <int N, int M>
-QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
+QT_DEPRECATED QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
 {
     return QMatrix4x4(matrix.constData(), N, M);
 }
 
 template <int N, int M>
-QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
+QT_DEPRECATED QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix)
 {
     QGenericMatrix<N, M, qreal> result;
     const qreal *m = matrix.constData();
@@ -1010,6 +1011,7 @@ QGenericMatrix<N, M, qreal> qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix
     }
     return result;
 }
+#endif
 
 #endif
 
-- 
cgit v0.12