summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/pickboundingvolumeutils.cpp
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-20 20:57:27 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-09-25 10:42:42 +0000
commit43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch)
tree2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/render/jobs/pickboundingvolumeutils.cpp
parentc9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/jobs/pickboundingvolumeutils.cpp')
-rw-r--r--src/render/jobs/pickboundingvolumeutils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index 5a32f0203..cc81de812 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -176,7 +176,7 @@ private:
void visit(uint andx, const QVector3D &a,
uint bndx, const QVector3D &b,
- uint cndx, const QVector3D &c) Q_DECL_OVERRIDE;
+ uint cndx, const QVector3D &c) override;
bool intersectsSegmentTriangle(uint andx, const QVector3D &a,
uint bndx, const QVector3D &b,
uint cndx, const QVector3D &c);
@@ -238,7 +238,7 @@ private:
float m_pickWorldSpaceTolerance;
void visit(uint andx, const QVector3D &a,
- uint bndx, const QVector3D &b) Q_DECL_OVERRIDE;
+ uint bndx, const QVector3D &b) override;
bool intersectsSegmentSegment(uint andx, const QVector3D &a,
uint bndx, const QVector3D &b);
bool rayToLineSegment(const QVector3D& lineStart,const QVector3D& lineEnd,
@@ -358,7 +358,7 @@ private:
uint m_pointIndex;
float m_pickWorldSpaceTolerance;
- void visit(uint ndx, const QVector3D &p) Q_DECL_OVERRIDE;
+ void visit(uint ndx, const QVector3D &p) override;
double pointToRayDistance(const QVector3D &a, QVector3D &p)
{