Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 17:44:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for override warnings with clang on OS X

Browse source
This commit is contained in:
Stephen Birarda 2016-01-07 14:35:30 -08:00
parent 718e994050
commit 275fa1c5c7
6 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
interface/src/Application.h
View file

@ -104,7 +104,7 @@ public:
Application(int& argc, char** argv, QElapsedTimer& startup_time); Application(int& argc, char** argv, QElapsedTimer& startup_time);
~Application(); ~Application();
void postLambdaEvent(std::function<void()> f); void postLambdaEvent(std::function<void()> f) override;
void loadScripts(); void loadScripts();
QString getPreviousScriptLocation(); QString getPreviousScriptLocation();
@ -115,8 +115,8 @@ public:
void paintGL(); void paintGL();
void resizeGL(); void resizeGL();
bool event(QEvent* event); bool event(QEvent* event) override;
bool eventFilter(QObject* object, QEvent* event); bool eventFilter(QObject* object, QEvent* event) override;
glm::uvec2 getCanvasSize() const; glm::uvec2 getCanvasSize() const;
glm::uvec2 getUiSize() const; glm::uvec2 getUiSize() const;
@ -135,7 +135,7 @@ public:
// passes, mirror window passes, etc // passes, mirror window passes, etc
ViewFrustum* getDisplayViewFrustum(); ViewFrustum* getDisplayViewFrustum();
const ViewFrustum* getDisplayViewFrustum() const; const ViewFrustum* getDisplayViewFrustum() const;
ViewFrustum* getShadowViewFrustum() { return &_shadowViewFrustum; } ViewFrustum* getShadowViewFrustum() override { return &_shadowViewFrustum; }
const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; } const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; }
EntityTreeRenderer* getEntities() { return DependencyManager::get<EntityTreeRenderer>().data(); } EntityTreeRenderer* getEntities() { return DependencyManager::get<EntityTreeRenderer>().data(); }
QUndoStack* getUndoStack() { return &_undoStack; } QUndoStack* getUndoStack() { return &_undoStack; }
@ -172,19 +172,19 @@ public:
ToolWindow* getToolWindow() { return _toolWindow ; } ToolWindow* getToolWindow() { return _toolWindow ; }
virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; } virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine); virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override;
QImage renderAvatarBillboard(RenderArgs* renderArgs); QImage renderAvatarBillboard(RenderArgs* renderArgs);
virtual ViewFrustum* getCurrentViewFrustum() { return getDisplayViewFrustum(); } virtual ViewFrustum* getCurrentViewFrustum() override { return getDisplayViewFrustum(); }
virtual QThread* getMainThread() { return thread(); } virtual QThread* getMainThread() override { return thread(); }
virtual float getSizeScale() const; virtual float getSizeScale() const override;
virtual int getBoundaryLevelAdjust() const; virtual int getBoundaryLevelAdjust() const override;
virtual PickRay computePickRay(float x, float y) const; virtual PickRay computePickRay(float x, float y) const override;
virtual glm::vec3 getAvatarPosition() const; virtual glm::vec3 getAvatarPosition() const override;
virtual void overrideEnvironmentData(const EnvironmentData& newData) { _environment.override(newData); } virtual void overrideEnvironmentData(const EnvironmentData& newData) override { _environment.override(newData); }
virtual void endOverrideEnvironmentData() { _environment.endOverride(); } virtual void endOverrideEnvironmentData() override { _environment.endOverride(); }
virtual qreal getDevicePixelRatio(); virtual qreal getDevicePixelRatio() override;
void setActiveDisplayPlugin(const QString& pluginName); void setActiveDisplayPlugin(const QString& pluginName);
@ -226,9 +226,9 @@ public:
void setMaxOctreePacketsPerSecond(int maxOctreePPS); void setMaxOctreePacketsPerSecond(int maxOctreePPS);
int getMaxOctreePacketsPerSecond(); int getMaxOctreePacketsPerSecond();
render::ScenePointer getMain3DScene() { return _main3DScene; } render::ScenePointer getMain3DScene() override { return _main3DScene; }
render::ScenePointer getMain3DScene() const { return _main3DScene; } render::ScenePointer getMain3DScene() const { return _main3DScene; }
render::EnginePointer getRenderEngine() { return _renderEngine; } render::EnginePointer getRenderEngine() override { return _renderEngine; }
gpu::ContextPointer getGPUContext() const { return _gpuContext; } gpu::ContextPointer getGPUContext() const { return _gpuContext; }
const QRect& getMirrorViewRect() const { return _mirrorViewRect; } const QRect& getMirrorViewRect() const { return _mirrorViewRect; }

2
interface/src/avatar/AvatarActionHold.h
View file

@ -30,7 +30,7 @@ public:
virtual void updateActionWorker(float deltaTimeStep) override; virtual void updateActionWorker(float deltaTimeStep) override;
QByteArray serialize() const; QByteArray serialize() const override;
virtual void deserialize(QByteArray serializedArguments) override; virtual void deserialize(QByteArray serializedArguments) override;
virtual bool shouldSuppressLocationEdits() override { return _active && !_ownerEntity.expired(); } virtual bool shouldSuppressLocationEdits() override { return _active && !_ownerEntity.expired(); }

4
libraries/entities-renderer/src/RenderableEntityItem.h
View file

@ -73,8 +73,8 @@ private:
#define SIMPLE_RENDERABLE() \ #define SIMPLE_RENDERABLE() \
public: \ public: \
virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) { return _renderHelper.addToScene(self, scene, pendingChanges); } \ virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override { return _renderHelper.addToScene(self, scene, pendingChanges); } \
virtual void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) { _renderHelper.removeFromScene(self, scene, pendingChanges); } \ virtual void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override { _renderHelper.removeFromScene(self, scene, pendingChanges); } \
private: \ private: \
SimpleRenderableEntityItem _renderHelper; SimpleRenderableEntityItem _renderHelper;

4
libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
View file

@ -28,9 +28,9 @@ public:
static void createPipeline(); static void createPipeline();
RenderablePolyLineEntityItem(const EntityItemID& entityItemID); RenderablePolyLineEntityItem(const EntityItemID& entityItemID);
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
virtual void update(const quint64& now) override; virtual void update(const quint64& now) override;
virtual bool needsToCallUpdate() const { return true; }; virtual bool needsToCallUpdate() const override { return true; };
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();

4
libraries/physics/src/ObjectAction.h
View file

@ -40,8 +40,8 @@ public:
virtual void updateActionWorker(float deltaTimeStep) = 0; virtual void updateActionWorker(float deltaTimeStep) = 0;
// these are from btActionInterface // these are from btActionInterface
virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep); virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) override;
virtual void debugDraw(btIDebugDraw* debugDrawer); virtual void debugDraw(btIDebugDraw* debugDrawer) override;
virtual QByteArray serialize() const override = 0; virtual QByteArray serialize() const override = 0;
virtual void deserialize(QByteArray serializedArguments) override = 0; virtual void deserialize(QByteArray serializedArguments) override = 0;