Fix 'virtual' is redundant since function is already declared as 'ove…

…rride' warnings
mangosone · Aug 21, 2024 · 3a05a82 · 3a05a82
1 parent d3c2be7
commit 3a05a82
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 80 deletions.
diff --git a/src/game/BattleGround/BattleGroundAA.h b/src/game/BattleGround/BattleGroundAA.h
@@ -43,6 +43,6 @@ class BattleGroundAA : public BattleGround
         BattleGroundAA();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundAB.h b/src/game/BattleGround/BattleGroundAB.h
@@ -237,7 +237,7 @@ class BattleGroundAB : public BattleGround
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
         /**
          * @brief
          *
@@ -256,7 +256,7 @@ class BattleGroundAB : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
         /**
          * @brief
          *
@@ -269,7 +269,7 @@ class BattleGroundAB : public BattleGround
          * @param player
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
 
         /* Scorekeeping */
         /**
@@ -279,15 +279,15 @@ class BattleGroundAB : public BattleGround
          * @param type
          * @param value
          */
-        virtual void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
 
         /**
          * @brief
          *
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
 
         /* Nodes occupying */
         /**
@@ -296,14 +296,14 @@ class BattleGroundAB : public BattleGround
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
 
         /* Premature finish */
         /**
          * @brief
          *
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
     private:
         /* Gameobject spawning/despawning */

diff --git a/src/game/BattleGround/BattleGroundAV.h b/src/game/BattleGround/BattleGroundAV.h
@@ -405,20 +405,20 @@ class BattleGroundAV : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 
         /**
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
         /**
          * @brief  world states
          *
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
 
         /**
          * @brief
@@ -431,7 +431,7 @@ class BattleGroundAV : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
 
         /*general stuff*/
         /**
@@ -457,7 +457,7 @@ class BattleGroundAV : public BattleGround
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
         /**
          * @brief
          *
@@ -501,14 +501,14 @@ class BattleGroundAV : public BattleGround
          * @param plr
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* plr) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* plr) override;
 
         /**
          * @brief
          *
          * @return Team
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
         /**
          * @brief

diff --git a/src/game/BattleGround/BattleGroundBE.h b/src/game/BattleGround/BattleGroundBE.h
@@ -42,11 +42,11 @@ class BattleGroundBE : public BattleGround
         BattleGroundBE();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
         bool HandlePlayerUnderMap(Player* plr) override;
 

diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h
@@ -247,8 +247,8 @@ class BattleGroundEY : public BattleGround
         void Update(uint32 diff) override;
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         /* BG Flags */
         ObjectGuid const& GetFlagCarrierGuid() const { return m_flagCarrier; }
@@ -265,19 +265,19 @@ class BattleGroundEY : public BattleGround
         bool HandleAreaTrigger(Player* source, uint32 trigger) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
 
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
-        virtual void Reset() override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        void Reset() override;
         void UpdateTeamScore(Team team);
         void EndBattleGround(Team winner) override;
         void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
         void SetDroppedFlagGuid(ObjectGuid guid)     { m_DroppedFlagGuid = guid;}
         void ClearDroppedFlagGuid()                  { m_DroppedFlagGuid.Clear();}
         ObjectGuid const& GetDroppedFlagGuid() const { return m_DroppedFlagGuid;}
 
         /* Battleground Events */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
-        virtual void EventPlayerDroppedFlag(Player* source) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerDroppedFlag(Player* source) override;
 
         virtual Team GetPrematureWinner() override;
 

diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
@@ -345,13 +345,13 @@ class BGQueueInviteEvent : public BasicEvent
          * @param p_time
          * @return bool
          */
-        virtual bool Execute(uint64 e_time, uint32 p_time) override;
+        bool Execute(uint64 e_time, uint32 p_time) override;
         /**
          * @brief
          *
          * @param e_time
          */
-        virtual void Abort(uint64 e_time) override;
+        void Abort(uint64 e_time) override;
     private:
         ObjectGuid m_PlayerGuid; /**< TODO */
         uint32 m_BgInstanceGUID; /**< TODO */
@@ -396,13 +396,13 @@ class BGQueueRemoveEvent : public BasicEvent
          * @param p_time
          * @return bool
          */
-        virtual bool Execute(uint64 e_time, uint32 p_time) override;
+        bool Execute(uint64 e_time, uint32 p_time) override;
         /**
          * @brief
          *
          * @param e_time
          */
-        virtual void Abort(uint64 e_time) override;
+        void Abort(uint64 e_time) override;
     private:
         ObjectGuid m_PlayerGuid; /**< TODO */
         uint32 m_BgInstanceGUID; /**< TODO */

diff --git a/src/game/BattleGround/BattleGroundNA.h b/src/game/BattleGround/BattleGroundNA.h
@@ -43,11 +43,11 @@ class BattleGroundNA : public BattleGround
         BattleGroundNA();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
         bool HandlePlayerUnderMap(Player* plr) override;
 };

diff --git a/src/game/BattleGround/BattleGroundRL.h b/src/game/BattleGround/BattleGroundRL.h
@@ -43,9 +43,9 @@ class BattleGroundRL : public BattleGround
         BattleGroundRL();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
         void HandleKillPlayer(Player* player, Player* killer) override;

diff --git a/src/game/BattleGround/BattleGroundWS.h b/src/game/BattleGround/BattleGroundWS.h
@@ -161,12 +161,12 @@ class BattleGroundWS : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
         /**
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
 
         /**
          * @brief BG Flags
@@ -244,20 +244,20 @@ class BattleGroundWS : public BattleGround
          *
          * @param source
          */
-        virtual void EventPlayerDroppedFlag(Player* source) override;
+        void EventPlayerDroppedFlag(Player* source) override;
         /**
          * @brief
          *
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
         /**
          * @brief
          *
          * @param source
          */
-        virtual void EventPlayerCapturedFlag(Player* source) override;
+        void EventPlayerCapturedFlag(Player* source) override;
 
         /**
          * @brief
@@ -284,7 +284,7 @@ class BattleGroundWS : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
         /**
          * @brief
          *
@@ -297,7 +297,7 @@ class BattleGroundWS : public BattleGround
          * @param player
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
 
         /**
          * @brief
@@ -346,12 +346,12 @@ class BattleGroundWS : public BattleGround
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
         /**
          * @brief
          *
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
     private:
         ObjectGuid m_flagCarrierAlliance; /**< TODO */

diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
@@ -139,9 +139,9 @@ class MapSessionFilter : public PacketFilter
         explicit MapSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {}
         ~MapSessionFilter() {}
 
-        virtual bool Process(WorldPacket* packet) override;
+        bool Process(WorldPacket* packet) override;
         // in Map::Update() we do not process player logout!
-        virtual bool ProcessLogout() const override
+        bool ProcessLogout() const override
         {
             return false;
         }
@@ -155,7 +155,7 @@ class WorldSessionFilter : public PacketFilter
         explicit WorldSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {}
         ~WorldSessionFilter() {}
 
-        virtual bool Process(WorldPacket* packet) override;
+        bool Process(WorldPacket* packet) override;
 };
 
 /// Player session in the World

diff --git a/src/game/Server/WorldSocket.h b/src/game/Server/WorldSocket.h
@@ -132,19 +132,19 @@ class WorldSocket : protected WorldHandler
         virtual ~WorldSocket(void);
 
         /// Called on open ,the void* is the acceptor.
-        virtual int open(void*) override;
+        int open(void*) override;
 
         /// Called on failures inside of the acceptor, don't call from your code.
-        virtual int close(u_long) override;
+        int close(u_long) override;
 
         /// Called when we can read from the socket.
-        virtual int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override;
+        int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
         /// Called when the socket can write.
-        virtual int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE) override;
+        int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
         /// Called when connection is closed or error happens.
-        virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE,
+        int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE,
                                  ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) override;
 
     private: