diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-15 21:56:08 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-15 21:56:08 (GMT) |
commit | c51b0e8389f52f895a9d69e9e96c1fd768d78bf4 (patch) | |
tree | a77e655a6539326b9ea2087d64358a70237a9466 | |
parent | ca83968f235c731f3bd1eb38e3c97d38d34565a0 (diff) | |
download | Qt-c51b0e8389f52f895a9d69e9e96c1fd768d78bf4.zip Qt-c51b0e8389f52f895a9d69e9e96c1fd768d78bf4.tar.gz Qt-c51b0e8389f52f895a9d69e9e96c1fd768d78bf4.tar.bz2 |
Remove the int constructors from the vector classes
The int constructors existed to make fixed-point conversions faster
in certain circumstances. With the removal of fixed-point support,
they are no longer required.
Reviewed-by: trustme
-rw-r--r-- | src/gui/math3d/qquaternion.cpp | 7 | ||||
-rw-r--r-- | src/gui/math3d/qquaternion.h | 3 | ||||
-rw-r--r-- | src/gui/math3d/qvector2d.cpp | 6 | ||||
-rw-r--r-- | src/gui/math3d/qvector2d.h | 3 | ||||
-rw-r--r-- | src/gui/math3d/qvector3d.cpp | 6 | ||||
-rw-r--r-- | src/gui/math3d/qvector3d.h | 3 | ||||
-rw-r--r-- | src/gui/math3d/qvector4d.cpp | 6 | ||||
-rw-r--r-- | src/gui/math3d/qvector4d.h | 3 |
8 files changed, 0 insertions, 37 deletions
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index efde362..4c6230a 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -74,13 +74,6 @@ QT_BEGIN_NAMESPACE and \a scalar. */ -/*! - \fn QQuaternion::QQuaternion(int scalar, int xpos, int ypos, int zpos) - - Constructs a quaternion with the vector (\a xpos, \a ypos, \a zpos) - and \a scalar. -*/ - #ifndef QT_NO_VECTOR3D /*! diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index f0cb308..a03b53b 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -60,7 +60,6 @@ class Q_GUI_EXPORT QQuaternion public: QQuaternion(); QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos); - QQuaternion(int scalar, int xpos, int ypos, int zpos); #ifndef QT_NO_VECTOR3D QQuaternion(qreal scalar, const QVector3D& vector); #endif @@ -143,8 +142,6 @@ inline QQuaternion::QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos inline QQuaternion::QQuaternion(float scalar, float xpos, float ypos, float zpos, int) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {} -inline QQuaternion::QQuaternion(int scalar, int xpos, int ypos, int zpos) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {} - inline bool QQuaternion::isNull() const { return qIsNull(xp) && qIsNull(yp) && qIsNull(zp) && qIsNull(wp); diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp index 31e5be6..54e1712 100644 --- a/src/gui/math3d/qvector2d.cpp +++ b/src/gui/math3d/qvector2d.cpp @@ -75,12 +75,6 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QVector2D::QVector2D(int xpos, int ypos) - - Constructs a vector with coordinates (\a xpos, \a ypos). -*/ - -/*! \fn QVector2D::QVector2D(const QPoint& point) Constructs a vector with x and y coordinates from a 2D \a point. diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 5e15de6..b027df4 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -61,7 +61,6 @@ class Q_GUI_EXPORT QVector2D public: QVector2D(); QVector2D(qreal xpos, qreal ypos); - QVector2D(int xpos, int ypos); explicit QVector2D(const QPoint& point); explicit QVector2D(const QPointF& point); #ifndef QT_NO_VECTOR3D @@ -130,8 +129,6 @@ inline QVector2D::QVector2D(float xpos, float ypos, int) : xp(xpos), yp(ypos) {} inline QVector2D::QVector2D(qreal xpos, qreal ypos) : xp(xpos), yp(ypos) {} -inline QVector2D::QVector2D(int xpos, int ypos) : xp(xpos), yp(ypos) {} - inline QVector2D::QVector2D(const QPoint& point) : xp(point.x()), yp(point.y()) {} inline QVector2D::QVector2D(const QPointF& point) : xp(point.x()), yp(point.y()) {} diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 814753d..0613aa8 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -79,12 +79,6 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QVector3D::QVector3D(int xpos, int ypos, int zpos) - - Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos). -*/ - -/*! \fn QVector3D::QVector3D(const QPoint& point) Constructs a vector with x and y coordinates from a 2D \a point, and a diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 4771d5a..02873f2 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -63,7 +63,6 @@ class Q_GUI_EXPORT QVector3D public: QVector3D(); QVector3D(qreal xpos, qreal ypos, qreal zpos); - QVector3D(int xpos, int ypos, int zpos); explicit QVector3D(const QPoint& point); explicit QVector3D(const QPointF& point); #ifndef QT_NO_VECTOR2D @@ -149,8 +148,6 @@ inline QVector3D::QVector3D(qreal xpos, qreal ypos, qreal zpos) : xp(xpos), yp(y inline QVector3D::QVector3D(float xpos, float ypos, float zpos, int) : xp(xpos), yp(ypos), zp(zpos) {} -inline QVector3D::QVector3D(int xpos, int ypos, int zpos) : xp(xpos), yp(ypos), zp(zpos) {} - inline QVector3D::QVector3D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} inline QVector3D::QVector3D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index d19665a..8fafbfd 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -77,12 +77,6 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QVector4D::QVector4D(int xpos, int ypos, int zpos, int wpos) - - Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos, \a wpos). -*/ - -/*! \fn QVector4D::QVector4D(const QPoint& point) Constructs a vector with x and y coordinates from a 2D \a point, and diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index 12efc95..8e673f3 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -63,7 +63,6 @@ class Q_GUI_EXPORT QVector4D public: QVector4D(); QVector4D(qreal xpos, qreal ypos, qreal zpos, qreal wpos); - QVector4D(int xpos, int ypos, int zpos, int wpos); explicit QVector4D(const QPoint& point); explicit QVector4D(const QPointF& point); #ifndef QT_NO_VECTOR2D @@ -146,8 +145,6 @@ inline QVector4D::QVector4D(qreal xpos, qreal ypos, qreal zpos, qreal wpos) : xp inline QVector4D::QVector4D(float xpos, float ypos, float zpos, float wpos, int) : xp(xpos), yp(ypos), zp(zpos), wp(wpos) {} -inline QVector4D::QVector4D(int xpos, int ypos, int zpos, int wpos) : xp(xpos), yp(ypos), zp(zpos), wp(wpos) {} - inline QVector4D::QVector4D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} inline QVector4D::QVector4D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} |