From 9bc95a0fc120f142b821afe33777dae978a5fba3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 5 Oct 2015 15:17:10 -0700
Subject: [PATCH] fix override warnings in assignment-client

---
 assignment-client/src/entities/EntityServer.h | 26 +++++++++----------
 libraries/octree/src/OctreeHeadlessViewer.h   |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 114e0e1726..065834cbc2 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -26,28 +26,28 @@ public:
     ~EntityServer();
 
     // Subclasses must implement these methods
-    virtual OctreeQueryNode* createOctreeQueryNode();
-    virtual char getMyNodeType() const { return NodeType::EntityServer; }
-    virtual PacketType getMyQueryMessageType() const { return PacketType::EntityQuery; }
-    virtual const char* getMyServerName() const { return MODEL_SERVER_NAME; }
-    virtual const char* getMyLoggingServerTargetName() const { return MODEL_SERVER_LOGGING_TARGET_NAME; }
-    virtual const char* getMyDefaultPersistFilename() const { return LOCAL_MODELS_PERSIST_FILE; }
-    virtual PacketType getMyEditNackType() const { return PacketType::EntityEditNack; }
-    virtual QString getMyDomainSettingsKey() const { return QString("entity_server_settings"); }
+    virtual OctreeQueryNode* createOctreeQueryNode() override ;
+    virtual char getMyNodeType() const override { return NodeType::EntityServer; }
+    virtual PacketType getMyQueryMessageType() const override { return PacketType::EntityQuery; }
+    virtual const char* getMyServerName() const override { return MODEL_SERVER_NAME; }
+    virtual const char* getMyLoggingServerTargetName() const override { return MODEL_SERVER_LOGGING_TARGET_NAME; }
+    virtual const char* getMyDefaultPersistFilename() const override { return LOCAL_MODELS_PERSIST_FILE; }
+    virtual PacketType getMyEditNackType() const override { return PacketType::EntityEditNack; }
+    virtual QString getMyDomainSettingsKey() const override { return QString("entity_server_settings"); }
 
     // subclass may implement these method
-    virtual void beforeRun();
-    virtual bool hasSpecialPacketsToSend(const SharedNodePointer& node);
-    virtual int sendSpecialPackets(const SharedNodePointer& node, OctreeQueryNode* queryNode, int& packetsSent);
+    virtual void beforeRun() override;
+    virtual bool hasSpecialPacketsToSend(const SharedNodePointer& node) override;
+    virtual int sendSpecialPackets(const SharedNodePointer& node, OctreeQueryNode* queryNode, int& packetsSent) override;
 
-    virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode);
+    virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) override;
     virtual bool readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override;
 
 public slots:
     void pruneDeletedEntities();
 
 protected:
-    virtual OctreePointer createTree();
+    virtual OctreePointer createTree() override;
 
 private slots:
     void handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h
index 5a17f48a19..605db15cd2 100644
--- a/libraries/octree/src/OctreeHeadlessViewer.h
+++ b/libraries/octree/src/OctreeHeadlessViewer.h
@@ -30,9 +30,9 @@ class OctreeHeadlessViewer : public OctreeRenderer {
 public:
     OctreeHeadlessViewer();
     virtual ~OctreeHeadlessViewer() {};
-    virtual void renderElement(OctreeElementPointer element, RenderArgs* args) { /* swallow these */ }
+    virtual void renderElement(OctreeElementPointer element, RenderArgs* args) override { /* swallow these */ }
 
-    virtual void init();
+    virtual void init() override ;
     virtual void render(RenderArgs* renderArgs) override { /* swallow these */ }
 
     void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; }
@@ -58,7 +58,7 @@ public slots:
 
     // getters for LOD and PPS
     float getVoxelSizeScale() const { return _voxelSizeScale; }
-    int getBoundaryLevelAdjust() const { return _boundaryLevelAdjust; }
+    int getBoundaryLevelAdjust() const override { return _boundaryLevelAdjust; }
     int getMaxPacketsPerSecond() const { return _maxPacketsPerSecond; }
 
     unsigned getOctreeElementsCount() const { return _tree->getOctreeElementsCount(); }