From 2507dce1477e6d302838c546cfc1cf8cddd0b446 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 26 Aug 2009 09:17:33 +1000 Subject: Fix bad merge of QVector3D. --- src/gui/math3d/qvector3d.cpp | 8 -------- src/gui/math3d/qvector3d.h | 2 -- 2 files changed, 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); -- cgit v0.12