fix for override warnings with clang on OS X

interface/src/Application.h

@@ -91,7 +91,7 @@ class Application;
 
 class Application : public QApplication, public AbstractViewStateInterface, public AbstractScriptingServicesInterface, public AbstractUriHandler {
     Q_OBJECT
-    
+
     // TODO? Get rid of those
     friend class OctreePacketProcessor;
     friend class PluginContainerProxy;
@@ -104,7 +104,7 @@ public:
     Application(int& argc, char** argv, QElapsedTimer& startup_time);
     ~Application();
 
-    void postLambdaEvent(std::function<void()> f);
+    void postLambdaEvent(std::function<void()> f) override;
 
     void loadScripts();
     QString getPreviousScriptLocation();
@@ -115,8 +115,8 @@ public:
     void paintGL();
     void resizeGL();
 
-    bool event(QEvent* event);
-    bool eventFilter(QObject* object, QEvent* event);
+    bool event(QEvent* event) override;
+    bool eventFilter(QObject* object, QEvent* event) override;
 
     glm::uvec2 getCanvasSize() const;
     glm::uvec2 getUiSize() const;
@@ -135,7 +135,7 @@ public:
     // passes, mirror window passes, etc
     ViewFrustum* getDisplayViewFrustum();
     const ViewFrustum* getDisplayViewFrustum() const;
-    ViewFrustum* getShadowViewFrustum() { return &_shadowViewFrustum; }
+    ViewFrustum* getShadowViewFrustum() override { return &_shadowViewFrustum; }
     const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; }
     EntityTreeRenderer* getEntities() { return DependencyManager::get<EntityTreeRenderer>().data(); }
     QUndoStack* getUndoStack() { return &_undoStack; }
@@ -157,7 +157,7 @@ public:
     Overlays& getOverlays() { return _overlays; }
 
     bool isForeground() const { return _isForeground; }
-    
+
     uint32_t getFrameCount() { return _frameCount; }
     float getFps() const { return _fps; }
     float getTargetFrameRate(); // frames/second
@@ -172,19 +172,19 @@ public:
     ToolWindow* getToolWindow() { return _toolWindow ; }
 
     virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
-    virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine);
+    virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override;
 
     QImage renderAvatarBillboard(RenderArgs* renderArgs);
 
-    virtual ViewFrustum* getCurrentViewFrustum() { return getDisplayViewFrustum(); }
-    virtual QThread* getMainThread() { return thread(); }
-    virtual float getSizeScale() const;
-    virtual int getBoundaryLevelAdjust() const;
-    virtual PickRay computePickRay(float x, float y) const;
-    virtual glm::vec3 getAvatarPosition() const;
-    virtual void overrideEnvironmentData(const EnvironmentData& newData) { _environment.override(newData); }
-    virtual void endOverrideEnvironmentData() { _environment.endOverride(); }
-    virtual qreal getDevicePixelRatio();
+    virtual ViewFrustum* getCurrentViewFrustum() override { return getDisplayViewFrustum(); }
+    virtual QThread* getMainThread() override { return thread(); }
+    virtual float getSizeScale() const override;
+    virtual int getBoundaryLevelAdjust() const override;
+    virtual PickRay computePickRay(float x, float y) const override;
+    virtual glm::vec3 getAvatarPosition() const override;
+    virtual void overrideEnvironmentData(const EnvironmentData& newData) override { _environment.override(newData); }
+    virtual void endOverrideEnvironmentData() override { _environment.endOverride(); }
+    virtual qreal getDevicePixelRatio() override;
 
     void setActiveDisplayPlugin(const QString& pluginName);
 
@@ -226,9 +226,9 @@ public:
     void setMaxOctreePacketsPerSecond(int maxOctreePPS);
     int getMaxOctreePacketsPerSecond();
 
-    render::ScenePointer getMain3DScene() { return _main3DScene; }
+    render::ScenePointer getMain3DScene() override { 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; }
 
     const QRect& getMirrorViewRect() const { return _mirrorViewRect; }
@@ -289,7 +289,7 @@ public slots:
 
     void resetSensors(bool andReload = false);
     void setActiveFaceTracker();
-    
+
 #ifdef HAVE_IVIEWHMD
     void setActiveEyeTracker();
     void calibrateEyeTracker1Point();
@@ -306,11 +306,11 @@ public slots:
     void reloadResourceCaches();
 
     void crashApplication();
-    
+
     void rotationModeChanged();
-    
+
     void runTests();
-    
+
 private slots:
     void clearDomainOctreeDetails();
     void idle(uint64_t now);
@@ -325,19 +325,19 @@ private slots:
     void faceTrackerMuteToggled();
 
     void activeChanged(Qt::ApplicationState state);
-    
+
     void domainSettingsReceived(const QJsonObject& domainSettingsObject);
     void handleDomainConnectionDeniedPacket(QSharedPointer<ReceivedMessage> message);
-    
+
     void notifyPacketVersionMismatch();
-    
+
     void loadSettings();
     void saveSettings();
-    
+
     void scriptFinished(const QString& scriptName, ScriptEngine* engine);
     void saveScripts();
     void reloadScript(const QString& scriptName, bool isUserLoaded = true);
-    
+
     bool acceptSnapshot(const QString& urlString);
     bool askToSetAvatarUrl(const QString& url);
     bool askToLoadScript(const QString& scriptFilenameOrURL);
@@ -356,13 +356,13 @@ private slots:
     void packetSent(quint64 length);
     void updateDisplayMode();
     void updateInputModes();
-    
+
 private:
     void initDisplay();
     void init();
 
     void cleanupBeforeQuit();
-    
+
     void emptyLocalCache();
 
     void update(float deltaTime);
@@ -382,45 +382,45 @@ private:
     void renderRearViewMirror(RenderArgs* renderArgs, const QRect& region, bool billboard = false);
 
     int sendNackPackets();
-    
+
     void takeSnapshot();
-    
+
     MyAvatar* getMyAvatar() const;
-    
+
     void checkSkeleton();
-    
+
     void initializeAcceptedFiles();
     int getRenderAmbientLight() const;
-    
+
     void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false, bool billboard = false);
-    
+
     bool importSVOFromURL(const QString& urlString);
-    
+
     bool nearbyEntitiesAreReadyForPhysics();
     int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode);
     void trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket);
-    
+
     void resizeEvent(QResizeEvent* size);
-    
+
     void keyPressEvent(QKeyEvent* event);
     void keyReleaseEvent(QKeyEvent* event);
-    
+
     void focusOutEvent(QFocusEvent* event);
     void focusInEvent(QFocusEvent* event);
-    
+
     void mouseMoveEvent(QMouseEvent* event, unsigned int deviceID = 0);
     void mousePressEvent(QMouseEvent* event, unsigned int deviceID = 0);
     void mouseDoublePressEvent(QMouseEvent* event, unsigned int deviceID = 0);
     void mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID = 0);
-    
+
     void touchBeginEvent(QTouchEvent* event);
     void touchEndEvent(QTouchEvent* event);
     void touchUpdateEvent(QTouchEvent* event);
-    
+
     void wheelEvent(QWheelEvent* event);
     void dropEvent(QDropEvent* event);
     void dragEnterEvent(QDragEnterEvent* event);
-    
+
 
     bool _dependencyManagerIsSetup;
 
@@ -510,7 +510,7 @@ private:
 
     quint64 _lastNackTime;
     quint64 _lastSendDownstreamAudioStats;
-    
+
     bool _aboutToQuit;
 
     Bookmarks* _bookmarks;
@@ -519,9 +519,9 @@ private:
 
     QThread _settingsThread;
     QTimer _settingsTimer;
-    
+
     GLCanvas* _glWidget{ nullptr };
-    
+
     typedef bool (Application::* AcceptURLMethod)(const QString &);
     static const QHash<QString, AcceptURLMethod> _acceptedExtensions;
 

interface/src/avatar/AvatarActionHold.h

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

libraries/entities-renderer/src/RenderableEntityItem.h

@@ -39,7 +39,7 @@ public:
 };
 
 namespace render {
-   template <> const ItemKey payloadGetKey(const RenderableEntityItemProxy::Pointer& payload); 
+   template <> const ItemKey payloadGetKey(const RenderableEntityItemProxy::Pointer& payload);
    template <> const Item::Bound payloadGetBound(const RenderableEntityItemProxy::Pointer& payload);
    template <> void payloadRender(const RenderableEntityItemProxy::Pointer& payload, RenderArgs* args);
 }
@@ -73,8 +73,8 @@ private:
 
 #define SIMPLE_RENDERABLE() \
 public: \
-    virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) { 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 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) override { _renderHelper.removeFromScene(self, scene, pendingChanges); } \
 private: \
     SimpleRenderableEntityItem _renderHelper;
 

libraries/entities-renderer/src/RenderablePolyLineEntityItem.h

@@ -27,19 +27,19 @@ public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
     static void createPipeline();
     RenderablePolyLineEntityItem(const EntityItemID& entityItemID);
-    
-    virtual void render(RenderArgs* args);
+
+    virtual void render(RenderArgs* args) override;
     virtual void update(const quint64& now) override;
-    virtual bool needsToCallUpdate() const { return true; };
-    
+    virtual bool needsToCallUpdate() const override { return true; };
+
     SIMPLE_RENDERABLE();
-    
+
     NetworkTexturePointer _texture;
 
     static gpu::PipelinePointer _pipeline;
     static gpu::Stream::FormatPointer _format;
     static int32_t PAINTSTROKE_GPU_SLOT;
-    
+
 protected:
     void updateGeometry();
     void updateVertices();

libraries/physics/src/ObjectAction.h

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

libraries/render-utils/src/AbstractViewStateInterface.h

@@ -40,7 +40,7 @@ public:
     virtual ViewFrustum* getShadowViewFrustum() = 0;
 
     virtual QThread* getMainThread() = 0;
-    
+
     virtual float getSizeScale() const = 0;
     virtual int getBoundaryLevelAdjust() const = 0;
     virtual PickRay computePickRay(float x, float y) const = 0;