From a07d7494f011b104e56f9d0527e5d43b3072a9b4 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 10 Dec 2015 17:08:34 -0800 Subject: [PATCH] More OS X warning cleanup --- interface/src/avatar/Avatar.h | 26 +++++------ .../display-plugins/OpenGLDisplayPlugin.cpp | 5 +- .../src/RenderableModelEntityItem.h | 2 +- libraries/entities/src/EntityItem.h | 2 +- libraries/entities/src/EntityTree.h | 46 +++++++++---------- libraries/octree/src/JurisdictionListener.h | 2 +- libraries/octree/src/JurisdictionSender.h | 2 +- libraries/physics/src/CharacterController.h | 4 +- 8 files changed, 45 insertions(+), 44 deletions(-) diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 09685c318e..4e775ad425 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -100,25 +100,25 @@ public: /// Returns the distance to use as a LOD parameter. float getLODDistance() const; - virtual bool isMyAvatar() const { return false; } + virtual bool isMyAvatar() const override { return false; } - virtual QVector getJointRotations() const; - virtual glm::quat getJointRotation(int index) const; - virtual glm::vec3 getJointTranslation(int index) const; - virtual int getJointIndex(const QString& name) const; - virtual QStringList getJointNames() const; + virtual QVector getJointRotations() const override; + virtual glm::quat getJointRotation(int index) const override; + virtual glm::vec3 getJointTranslation(int index) const override; + virtual int getJointIndex(const QString& name) const override; + virtual QStringList getJointNames() const override; virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override; virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override; - virtual void setFaceModelURL(const QUrl& faceModelURL); - virtual void setSkeletonModelURL(const QUrl& skeletonModelURL); - virtual void setAttachmentData(const QVector& attachmentData); - virtual void setBillboard(const QByteArray& billboard); + virtual void setFaceModelURL(const QUrl& faceModelURL) override; + virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override; + virtual void setAttachmentData(const QVector& attachmentData) override; + virtual void setBillboard(const QByteArray& billboard) override; void setShowDisplayName(bool showDisplayName); - virtual int parseDataFromBuffer(const QByteArray& buffer); + virtual int parseDataFromBuffer(const QByteArray& buffer) override; static void renderJointConnectingCone( gpu::Batch& batch, glm::vec3 position1, glm::vec3 position2, float radius1, float radius2, const glm::vec4& color); @@ -144,7 +144,7 @@ public: void scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const; void slamPosition(const glm::vec3& position); - virtual void updateAttitude() { _skeletonModel.updateAttitude(); } + virtual void updateAttitude() override { _skeletonModel.updateAttitude(); } // Call this when updating Avatar position with a delta. This will allow us to // _accurately_ measure position changes and compute the resulting velocity @@ -217,7 +217,7 @@ protected: virtual bool shouldRenderHead(const RenderArgs* renderArgs) const; virtual void fixupModelsInScene(); - virtual void updateJointMappings(); + virtual void updateJointMappings() override; render::ItemID _renderItemID; diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 880e4a16b3..58fd53e39d 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -15,7 +15,8 @@ #include #include -#include + +#include #include #include @@ -104,7 +105,7 @@ public: // take the latest texture and present it _context->makeCurrent(); - if (QOpenGLContext::currentContext() == _context->contextHandle()) { + if (isCurrentContext(_context->contextHandle())) { currentPlugin->present(); _context->doneCurrent(); } else { diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h index 0aaa7a0977..143113146e 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.h +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h @@ -29,7 +29,7 @@ public: virtual ~RenderableModelEntityItem(); virtual void setDimensions(const glm::vec3& value) override; - virtual void setModelURL(const QString& url); + virtual void setModelURL(const QString& url) override; virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override; virtual bool setProperties(const EntityItemProperties& properties) override; diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index a1fc89c5e0..244198f7b8 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -389,7 +389,7 @@ protected: const QByteArray getActionDataInternal() const; void setActionDataInternal(QByteArray actionData); - virtual void locationChanged(); + virtual void locationChanged() override; EntityTypes::EntityType _type; quint64 _lastSimulated; // last time this entity called simulate(), this includes velocity, angular velocity, // and physics changes diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index e893c69259..5e54e562a0 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -58,7 +58,7 @@ public: void createRootElement(); /// Implements our type specific root element factory - virtual OctreeElementPointer createNewElement(unsigned char* octalCode = NULL); + virtual OctreeElementPointer createNewElement(unsigned char* octalCode = NULL) override; /// Type safe version of getRoot() EntityTreeElementPointer getRoot() { @@ -68,15 +68,15 @@ public: return std::static_pointer_cast(_rootElement); } - virtual void eraseAllOctreeElements(bool createNewRoot = true); + virtual void eraseAllOctreeElements(bool createNewRoot = true) override; // These methods will allow the OctreeServer to send your tree inbound edit packets of your // own definition. Implement these to allow your octree based server to support editing - virtual bool getWantSVOfileVersions() const { return true; } - virtual PacketType expectedDataPacketType() const { return PacketType::EntityData; } - virtual bool canProcessVersion(PacketVersion thisVersion) const + virtual bool getWantSVOfileVersions() const override { return true; } + virtual PacketType expectedDataPacketType() const override { return PacketType::EntityData; } + virtual bool canProcessVersion(PacketVersion thisVersion) const override { return thisVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS; } - virtual bool handlesEditPacketType(PacketType packetType) const; + virtual bool handlesEditPacketType(PacketType packetType) const override; void fixupTerseEditLogging(EntityItemProperties& properties, QList& changedProperties); virtual int processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength, const SharedNodePointer& senderNode) override; @@ -89,18 +89,18 @@ public: bool* accurateResult = NULL, bool precisionPicking = false); - virtual bool rootElementHasData() const { return true; } + virtual bool rootElementHasData() const override { return true; } // the root at least needs to store the number of entities in the packet/buffer - virtual int minimumRequiredRootDataBytes() const { return sizeof(uint16_t); } - virtual bool suppressEmptySubtrees() const { return false; } - virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const; - virtual bool mustIncludeAllChildData() const { return false; } + virtual int minimumRequiredRootDataBytes() const override { return sizeof(uint16_t); } + virtual bool suppressEmptySubtrees() const override { return false; } + virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const override; + virtual bool mustIncludeAllChildData() const override { return false; } - virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const + virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const override { return thisVersion >= VERSION_ENTITIES_HAS_FILE_BREAKS; } - virtual void update(); + virtual void update() override; // The newer API... void postAddEntity(EntityItemPointer entityItem); @@ -177,8 +177,8 @@ public: EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID) /*const*/; void setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element); void debugDumpMap(); - virtual void dumpTree(); - virtual void pruneTree(); + virtual void dumpTree() override; + virtual void pruneTree() override; QVector sendEntities(EntityEditPacketSender* packetSender, EntityTreePointer localTree, float x, float y, float z); @@ -198,12 +198,12 @@ public: void remapIDs(); - bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues); - bool readFromMap(QVariantMap& entityDescription); + virtual bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues) override; + virtual bool readFromMap(QVariantMap& entityDescription) override; float getContentsLargestDimension(); - virtual void resetEditStats() { + virtual void resetEditStats() override { _totalEditMessages = 0; _totalUpdates = 0; _totalCreates = 0; @@ -214,11 +214,11 @@ public: _totalLoggingTime = 0; } - virtual quint64 getAverageDecodeTime() const { return _totalEditMessages == 0 ? 0 : _totalDecodeTime / _totalEditMessages; } - virtual quint64 getAverageLookupTime() const { return _totalEditMessages == 0 ? 0 : _totalLookupTime / _totalEditMessages; } - virtual quint64 getAverageUpdateTime() const { return _totalUpdates == 0 ? 0 : _totalUpdateTime / _totalUpdates; } - virtual quint64 getAverageCreateTime() const { return _totalCreates == 0 ? 0 : _totalCreateTime / _totalCreates; } - virtual quint64 getAverageLoggingTime() const { return _totalEditMessages == 0 ? 0 : _totalLoggingTime / _totalEditMessages; } + virtual quint64 getAverageDecodeTime() const override { return _totalEditMessages == 0 ? 0 : _totalDecodeTime / _totalEditMessages; } + virtual quint64 getAverageLookupTime() const override { return _totalEditMessages == 0 ? 0 : _totalLookupTime / _totalEditMessages; } + virtual quint64 getAverageUpdateTime() const override { return _totalUpdates == 0 ? 0 : _totalUpdateTime / _totalUpdates; } + virtual quint64 getAverageCreateTime() const override { return _totalCreates == 0 ? 0 : _totalCreateTime / _totalCreates; } + virtual quint64 getAverageLoggingTime() const override { return _totalEditMessages == 0 ? 0 : _totalLoggingTime / _totalEditMessages; } void trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytesRead); quint64 getAverageEditDeltas() const diff --git a/libraries/octree/src/JurisdictionListener.h b/libraries/octree/src/JurisdictionListener.h index 0c713ca27f..7aee1659ff 100644 --- a/libraries/octree/src/JurisdictionListener.h +++ b/libraries/octree/src/JurisdictionListener.h @@ -32,7 +32,7 @@ public: JurisdictionListener(NodeType_t type = NodeType::EntityServer); - virtual bool process(); + virtual bool process() override; NodeToJurisdictionMap* getJurisdictions() { return &_jurisdictions; } diff --git a/libraries/octree/src/JurisdictionSender.h b/libraries/octree/src/JurisdictionSender.h index a0a3b5b4dd..b2d738cd36 100644 --- a/libraries/octree/src/JurisdictionSender.h +++ b/libraries/octree/src/JurisdictionSender.h @@ -32,7 +32,7 @@ public: void setJurisdiction(JurisdictionMap* map) { _jurisdictionMap = map; } - virtual bool process(); + virtual bool process() override; NodeType_t getNodeType() const { return _nodeType; } void setNodeType(NodeType_t type) { _nodeType = type; } diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h index 6edbabdab8..88c02d0940 100644 --- a/libraries/physics/src/CharacterController.h +++ b/libraries/physics/src/CharacterController.h @@ -43,7 +43,7 @@ public: virtual void updateShapeIfNecessary() = 0; // overrides from btCharacterControllerInterface - virtual void setWalkDirection(const btVector3 &walkDirection) { assert(false); } + virtual void setWalkDirection(const btVector3 &walkDirection) override { assert(false); } virtual void setVelocityForTimeInterval(const btVector3 &velocity, btScalar timeInterval) override { assert(false); } virtual void reset(btCollisionWorld* collisionWorld) override { } virtual void warp(const btVector3& origin) override { } @@ -57,7 +57,7 @@ public: virtual void playerStep(btCollisionWorld *collisionWorld, btScalar dt) override; virtual bool canJump() const override { assert(false); return false; } // never call this virtual void jump() override; - virtual bool onGround() const; + virtual bool onGround() const override; void preSimulation(); void postSimulation();