From cb758ca6b4256391a68b2d603b2a8e21854483e9 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 4 Dec 2015 08:55:43 -0800 Subject: [PATCH] Fix override warnings on XCode 7 --- assignment-client/src/entities/EntityServer.h | 6 ++-- .../impl/endpoints/ActionEndpoint.h | 4 +-- .../impl/endpoints/InputEndpoint.h | 6 ++-- .../controllers/impl/filters/PulseFilter.h | 2 +- .../controllers/impl/filters/ScaleFilter.h | 2 +- .../src/RenderableModelEntityItem.h | 30 +++++++++---------- .../recording/src/recording/impl/ArrayClip.h | 4 +-- .../src/recording/impl/PointerClip.h | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h index 89b445c449..241c4c4d4f 100644 --- a/assignment-client/src/entities/EntityServer.h +++ b/assignment-client/src/entities/EntityServer.h @@ -50,10 +50,10 @@ public: virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) override; virtual void readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override; - virtual QString serverSubclassStats(); + virtual QString serverSubclassStats() override; - virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode); - virtual void trackViewerGone(const QUuid& viewerNode); + virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode) override; + virtual void trackViewerGone(const QUuid& viewerNode) override; public slots: void pruneDeletedEntities(); diff --git a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h index e07dc9e4c8..1073dc6593 100644 --- a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h +++ b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h @@ -23,10 +23,10 @@ class ActionEndpoint : public Endpoint { public: ActionEndpoint(const Input& id = Input::INVALID_INPUT) : Endpoint(id) { } - virtual float peek() const { return _currentValue; } + virtual float peek() const override { return _currentValue; } virtual void apply(float newValue, const Pointer& source) override; - virtual Pose peekPose() const { return _currentPose; } + virtual Pose peekPose() const override { return _currentPose; } virtual void apply(const Pose& value, const Pointer& source) override; virtual void reset() override; diff --git a/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.h b/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.h index 663168bedc..7e4560dcf9 100644 --- a/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.h +++ b/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.h @@ -28,9 +28,9 @@ public: virtual Pose pose() override; virtual void apply(const Pose& value, const Pointer& source) override { } - virtual bool writeable() const { return false; } - virtual bool readable() const { return !_read; } - virtual void reset() { _read = false; } + virtual bool writeable() const override { return false; } + virtual bool readable() const override { return !_read; } + virtual void reset() override { _read = false; } private: bool _read { false }; diff --git a/libraries/controllers/src/controllers/impl/filters/PulseFilter.h b/libraries/controllers/src/controllers/impl/filters/PulseFilter.h index dbe2eba81b..271f4a04f6 100644 --- a/libraries/controllers/src/controllers/impl/filters/PulseFilter.h +++ b/libraries/controllers/src/controllers/impl/filters/PulseFilter.h @@ -23,7 +23,7 @@ public: virtual float apply(float value) const override; - virtual bool parseParameters(const QJsonValue& parameters); + virtual bool parseParameters(const QJsonValue& parameters) override; private: static const float DEFAULT_LAST_EMIT_TIME; diff --git a/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h b/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h index 39c5edd4e5..670da53fe8 100644 --- a/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h +++ b/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h @@ -23,7 +23,7 @@ public: virtual float apply(float value) const override { return value * _scale; } - virtual bool parseParameters(const QJsonValue& parameters); + virtual bool parseParameters(const QJsonValue& parameters) override; private: float _scale = 1.0f; diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h index c4e36c240a..b791373bde 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.h +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h @@ -30,42 +30,42 @@ public: virtual void setDimensions(const glm::vec3& value) override; - virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const; - virtual bool setProperties(const EntityItemProperties& properties); + virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override; + virtual bool setProperties(const EntityItemProperties& properties) override; virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args, EntityPropertyFlags& propertyFlags, bool overwriteLocalData, - bool& somethingChanged); + bool& somethingChanged) override; - virtual void somethingChangedNotification() { + virtual void somethingChangedNotification() override { // FIX ME: this is overly aggressive. We only really need to simulate() if something about // the world space transform has changed and/or if some animation is occurring. _needsInitialSimulation = true; } virtual bool readyToAddToScene(RenderArgs* renderArgs = nullptr); - virtual bool addToScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges); - virtual void removeFromScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges); + virtual bool addToScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; + virtual void removeFromScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; - virtual void render(RenderArgs* args); - virtual bool supportsDetailedRayIntersection() const { return true; } + virtual void render(RenderArgs* args) override; + virtual bool supportsDetailedRayIntersection() const override { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, bool& keepSearching, OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal, - void** intersectedObject, bool precisionPicking) const; + void** intersectedObject, bool precisionPicking) const override; Model* getModel(EntityTreeRenderer* renderer); - virtual bool needsToCallUpdate() const; - virtual void update(const quint64& now); + virtual bool needsToCallUpdate() const override; + virtual void update(const quint64& now) override; - virtual void setCompoundShapeURL(const QString& url); + virtual void setCompoundShapeURL(const QString& url) override; - bool isReadyToComputeShape(); - void computeShapeInfo(ShapeInfo& info); + virtual bool isReadyToComputeShape() override; + virtual void computeShapeInfo(ShapeInfo& info) override; - virtual bool contains(const glm::vec3& point) const; + virtual bool contains(const glm::vec3& point) const override; private: void remapTextures(); diff --git a/libraries/recording/src/recording/impl/ArrayClip.h b/libraries/recording/src/recording/impl/ArrayClip.h index 10b3580228..165842d24a 100644 --- a/libraries/recording/src/recording/impl/ArrayClip.h +++ b/libraries/recording/src/recording/impl/ArrayClip.h @@ -32,7 +32,7 @@ public: return _frames.size(); } - Clip::Pointer duplicate() const { + virtual Clip::Pointer duplicate() const override { auto result = newClip(); Locker lock(_mutex); for (size_t i = 0; i < _frames.size(); ++i) { @@ -41,7 +41,7 @@ public: return result; } - virtual void seekFrameTime(Frame::Time offset) { + virtual void seekFrameTime(Frame::Time offset) override { Locker lock(_mutex); auto itr = std::lower_bound(_frames.begin(), _frames.end(), offset, [](const T& a, Frame::Time b)->bool { diff --git a/libraries/recording/src/recording/impl/PointerClip.h b/libraries/recording/src/recording/impl/PointerClip.h index f5c0dd6bc4..48d4e4cbc8 100644 --- a/libraries/recording/src/recording/impl/PointerClip.h +++ b/libraries/recording/src/recording/impl/PointerClip.h @@ -45,7 +45,7 @@ public: // FIXME move to frame? static const qint64 MINIMUM_FRAME_SIZE = sizeof(FrameType) + sizeof(Frame::Time) + sizeof(FrameSize); protected: - void reset(); + void reset() override; virtual FrameConstPointer readFrame(size_t index) const override; QJsonDocument _header; uchar* _data { nullptr };