Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove extra qualifications to getShapeKey from overlay headers

Browse source
This commit is contained in:
Zach Pomerantz 2016-02-04 10:01:34 -08:00
parent 53bd595b77
commit 3fceaba2fe
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Circle3DOverlay.h
View file

@ -25,7 +25,7 @@ public:
Circle3DOverlay(const Circle3DOverlay* circle3DOverlay); Circle3DOverlay(const Circle3DOverlay* circle3DOverlay);
virtual void render(RenderArgs* args); 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 void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property); virtual QScriptValue getProperty(const QString& property);

2
interface/src/ui/overlays/Cube3DOverlay.h
View file

@ -24,7 +24,7 @@ public:
Cube3DOverlay(const Cube3DOverlay* cube3DOverlay); Cube3DOverlay(const Cube3DOverlay* cube3DOverlay);
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual const render::ShapeKey Cube3DOverlay::getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
virtual Cube3DOverlay* createClone() const; virtual Cube3DOverlay* createClone() const;

2
interface/src/ui/overlays/Grid3DOverlay.h
View file

@ -25,7 +25,7 @@ public:
Grid3DOverlay(const Grid3DOverlay* grid3DOverlay); Grid3DOverlay(const Grid3DOverlay* grid3DOverlay);
virtual void render(RenderArgs* args); 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 void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property); virtual QScriptValue getProperty(const QString& property);

2
interface/src/ui/overlays/Image3DOverlay.h
View file

@ -31,7 +31,7 @@ public:
virtual void update(float deltatime); virtual void update(float deltatime);
virtual const render::ShapeKey Image3DOverlay::getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
// setters // setters
void setURL(const QString& url); void setURL(const QString& url);

2
interface/src/ui/overlays/Line3DOverlay.h
View file

@ -24,7 +24,7 @@ public:
Line3DOverlay(const Line3DOverlay* line3DOverlay); Line3DOverlay(const Line3DOverlay* line3DOverlay);
~Line3DOverlay(); ~Line3DOverlay();
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual const render::ShapeKey Line3DOverlay::getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
virtual AABox getBounds() const; virtual AABox getBounds() const;
// getters // getters

2
interface/src/ui/overlays/Rectangle3DOverlay.h
View file

@ -24,7 +24,7 @@ public:
Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay); Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay);
~Rectangle3DOverlay(); ~Rectangle3DOverlay();
virtual void render(RenderArgs* args); 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 void setProperties(const QScriptValue& properties);
virtual Rectangle3DOverlay* createClone() const; virtual Rectangle3DOverlay* createClone() const;

2
interface/src/ui/overlays/Sphere3DOverlay.h
View file

@ -24,7 +24,7 @@ public:
Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay); Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay);
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual const render::ShapeKey Sphere3DOverlay::getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
virtual Sphere3DOverlay* createClone() const; virtual Sphere3DOverlay* createClone() const;
}; };

2
interface/src/ui/overlays/Web3DOverlay.h
View file

@ -25,7 +25,7 @@ public:
virtual ~Web3DOverlay(); virtual ~Web3DOverlay();
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual const render::ShapeKey Web3DOverlay::getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;
virtual void update(float deltatime); virtual void update(float deltatime);