From 3fceaba2fe06f7740fb645997bf07f1aef75e873 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Thu, 4 Feb 2016 10:01:34 -0800 Subject: [PATCH] Remove extra qualifications to getShapeKey from overlay headers --- interface/src/ui/overlays/Circle3DOverlay.h | 2 +- interface/src/ui/overlays/Cube3DOverlay.h | 2 +- interface/src/ui/overlays/Grid3DOverlay.h | 2 +- interface/src/ui/overlays/Image3DOverlay.h | 2 +- interface/src/ui/overlays/Line3DOverlay.h | 2 +- interface/src/ui/overlays/Rectangle3DOverlay.h | 2 +- interface/src/ui/overlays/Sphere3DOverlay.h | 2 +- interface/src/ui/overlays/Web3DOverlay.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/src/ui/overlays/Circle3DOverlay.h b/interface/src/ui/overlays/Circle3DOverlay.h index 6c6ab965d0..7050da3368 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.h +++ b/interface/src/ui/overlays/Circle3DOverlay.h @@ -25,7 +25,7 @@ public: Circle3DOverlay(const Circle3DOverlay* circle3DOverlay); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Circle3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual void setProperties(const QScriptValue& properties); virtual QScriptValue getProperty(const QString& property); diff --git a/interface/src/ui/overlays/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h index 1ef667ff4a..30b6646362 100644 --- a/interface/src/ui/overlays/Cube3DOverlay.h +++ b/interface/src/ui/overlays/Cube3DOverlay.h @@ -24,7 +24,7 @@ public: Cube3DOverlay(const Cube3DOverlay* cube3DOverlay); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Cube3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual Cube3DOverlay* createClone() const; diff --git a/interface/src/ui/overlays/Grid3DOverlay.h b/interface/src/ui/overlays/Grid3DOverlay.h index e254ad88fe..f9744f3954 100644 --- a/interface/src/ui/overlays/Grid3DOverlay.h +++ b/interface/src/ui/overlays/Grid3DOverlay.h @@ -25,7 +25,7 @@ public: Grid3DOverlay(const Grid3DOverlay* grid3DOverlay); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Grid3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual void setProperties(const QScriptValue& properties); virtual QScriptValue getProperty(const QString& property); diff --git a/interface/src/ui/overlays/Image3DOverlay.h b/interface/src/ui/overlays/Image3DOverlay.h index 9ec4f7e29c..0b0b245872 100644 --- a/interface/src/ui/overlays/Image3DOverlay.h +++ b/interface/src/ui/overlays/Image3DOverlay.h @@ -31,7 +31,7 @@ public: virtual void update(float deltatime); - virtual const render::ShapeKey Image3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; // setters void setURL(const QString& url); diff --git a/interface/src/ui/overlays/Line3DOverlay.h b/interface/src/ui/overlays/Line3DOverlay.h index 361f83e3b0..b40ff78231 100644 --- a/interface/src/ui/overlays/Line3DOverlay.h +++ b/interface/src/ui/overlays/Line3DOverlay.h @@ -24,7 +24,7 @@ public: Line3DOverlay(const Line3DOverlay* line3DOverlay); ~Line3DOverlay(); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Line3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual AABox getBounds() const; // getters diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.h b/interface/src/ui/overlays/Rectangle3DOverlay.h index d2a40a899b..cde4ad2f53 100644 --- a/interface/src/ui/overlays/Rectangle3DOverlay.h +++ b/interface/src/ui/overlays/Rectangle3DOverlay.h @@ -24,7 +24,7 @@ public: Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay); ~Rectangle3DOverlay(); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Rectangle3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual void setProperties(const QScriptValue& properties); virtual Rectangle3DOverlay* createClone() const; diff --git a/interface/src/ui/overlays/Sphere3DOverlay.h b/interface/src/ui/overlays/Sphere3DOverlay.h index ff8dfab778..ec2efa9f04 100644 --- a/interface/src/ui/overlays/Sphere3DOverlay.h +++ b/interface/src/ui/overlays/Sphere3DOverlay.h @@ -24,7 +24,7 @@ public: Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Sphere3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual Sphere3DOverlay* createClone() const; }; diff --git a/interface/src/ui/overlays/Web3DOverlay.h b/interface/src/ui/overlays/Web3DOverlay.h index ef1c44108f..b1715dff46 100644 --- a/interface/src/ui/overlays/Web3DOverlay.h +++ b/interface/src/ui/overlays/Web3DOverlay.h @@ -25,7 +25,7 @@ public: virtual ~Web3DOverlay(); virtual void render(RenderArgs* args); - virtual const render::ShapeKey Web3DOverlay::getShapeKey() override; + virtual const render::ShapeKey getShapeKey() override; virtual void update(float deltatime);