diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:17:33 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:17:33 (GMT) |
| commit | 2507dce1477e6d302838c546cfc1cf8cddd0b446 (patch) | |
| tree | d0581e7f20f1099ab778ba905d5df3fd797497d6 | |
| parent | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (diff) | |
| download | Qt-2507dce1477e6d302838c546cfc1cf8cddd0b446.zip Qt-2507dce1477e6d302838c546cfc1cf8cddd0b446.tar.gz Qt-2507dce1477e6d302838c546cfc1cf8cddd0b446.tar.bz2 | |
Fix bad merge of QVector3D.
| -rw-r--r-- | src/gui/math3d/qvector3d.cpp | 8 | ||||
| -rw-r--r-- | src/gui/math3d/qvector3d.h | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 790d39b8..5033b76 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -284,14 +284,6 @@ void QVector3D::normalize() */ /*! - Returns the vector as a QVariant -*/ -QVector3D::operator QVariant () const -{ - return QVariant(QVariant::Vector3D, this); -} - -/*! Returns the dot product of \a v1 and \a v2. */ qreal QVector3D::dotProduct(const QVector3D& v1, const QVector3D& v2) diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index de62bf3..d1370fb 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -95,8 +95,6 @@ public: QVector3D &operator*=(const QVector3D& vector); QVector3D &operator/=(qreal divisor); - operator QVariant() const; - static qreal dotProduct(const QVector3D& v1, const QVector3D& v2); static QVector3D crossProduct(const QVector3D& v1, const QVector3D& v2); static QVector3D normal(const QVector3D& v1, const QVector3D& v2); |