diff options
35 files changed, 48 insertions, 56 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index 4dd9eca036..581320cfd5 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -39,7 +39,7 @@ namespace VMAP public: IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) { } - virtual ~IVMapManager() { } + virtual ~IVMapManager() = default; virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; diff --git a/src/common/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h index 30a05bf671..322644bf7a 100644 --- a/src/common/Database/DatabaseWorkerPool.h +++ b/src/common/Database/DatabaseWorkerPool.h @@ -38,7 +38,7 @@ public: /* Activity state */ DatabaseWorkerPool(); - ~DatabaseWorkerPool() { } + ~DatabaseWorkerPool() = default; bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads); diff --git a/src/common/Database/MySQLConnection.h b/src/common/Database/MySQLConnection.h index 164b29fcca..aabc714516 100644 --- a/src/common/Database/MySQLConnection.h +++ b/src/common/Database/MySQLConnection.h @@ -27,7 +27,7 @@ enum ConnectionFlags struct MySQLConnectionInfo { - MySQLConnectionInfo() { } + MySQLConnectionInfo() = default; MySQLConnectionInfo(const std::string& infoString) { Tokenizer tokens(infoString, ';'); diff --git a/src/common/Database/QueryHolder.h b/src/common/Database/QueryHolder.h index 712207cf0e..3a7fdf016e 100644 --- a/src/common/Database/QueryHolder.h +++ b/src/common/Database/QueryHolder.h @@ -16,7 +16,7 @@ private: typedef std::pair<SQLElementData, SQLResultSetUnion> SQLResultPair; std::vector<SQLResultPair> m_queries; public: - SQLQueryHolder() { } + SQLQueryHolder() = default; ~SQLQueryHolder(); bool SetQuery(size_t index, const char* sql); bool SetPQuery(size_t index, const char* format, ...) ATTR_PRINTF(3, 4); diff --git a/src/common/Database/Transaction.h b/src/common/Database/Transaction.h index 0b033da0eb..5425f4498f 100644 --- a/src/common/Database/Transaction.h +++ b/src/common/Database/Transaction.h @@ -49,7 +49,7 @@ class TransactionTask : public SQLOperation public: TransactionTask(SQLTransaction trans) : m_trans(trans) { } ; - ~TransactionTask() override { }; + ~TransactionTask() override = default; protected: bool Execute() override; diff --git a/src/common/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h index 116509dae6..27040c59c9 100644 --- a/src/common/Dynamic/LinkedReference/RefManager.h +++ b/src/common/Dynamic/LinkedReference/RefManager.h @@ -15,7 +15,7 @@ template <class TO, class FROM> class RefManager : public LinkedListHead { public: typedef LinkedListHead::Iterator< Reference<TO, FROM>> iterator; - RefManager() { } + RefManager() = default; virtual ~RefManager() { clearReferences(); } Reference<TO, FROM>* getFirst() { return ((Reference<TO, FROM>*) LinkedListHead::getFirst()); } diff --git a/src/common/Dynamic/LinkedReference/Reference.h b/src/common/Dynamic/LinkedReference/Reference.h index aedfcb19eb..0e855183e1 100644 --- a/src/common/Dynamic/LinkedReference/Reference.h +++ b/src/common/Dynamic/LinkedReference/Reference.h @@ -28,7 +28,7 @@ protected: virtual void sourceObjectDestroyLink() = 0; public: Reference() { iRefTo = nullptr; iRefFrom = nullptr; } - virtual ~Reference() { } + virtual ~Reference() = default; // Create new link void link(TO* toObj, FROM* fromObj) diff --git a/src/common/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h index 2a6feeb230..2c81802d2d 100644 --- a/src/common/Packets/ByteBuffer.h +++ b/src/common/Packets/ByteBuffer.h @@ -22,7 +22,7 @@ class ByteBufferException : public std::exception { public: - ~ByteBufferException() noexcept override { } + ~ByteBufferException() noexcept override = default; [[nodiscard]] char const* what() const noexcept override { return msg_.c_str(); } @@ -37,15 +37,14 @@ class ByteBufferPositionException : public ByteBufferException { public: ByteBufferPositionException(bool add, size_t pos, size_t size, size_t valueSize); - ~ByteBufferPositionException() noexcept override { } + ~ByteBufferPositionException() noexcept override = default; }; class ByteBufferSourceException : public ByteBufferException { public: ByteBufferSourceException(size_t pos, size_t size, size_t valueSize); - - ~ByteBufferSourceException() noexcept override { } + ~ByteBufferSourceException() noexcept override = default; }; class ByteBuffer diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h index 14f250f069..a89d4d1a9c 100644 --- a/src/common/Threading/LockedQueue.h +++ b/src/common/Threading/LockedQueue.h @@ -36,9 +36,7 @@ namespace ACE_Based } //! Destroy a LockedQueue. - virtual ~LockedQueue() - { - } + virtual ~LockedQueue() = default; //! Adds an item to the queue. void add(const T& item) diff --git a/src/common/Threading/Threading.h b/src/common/Threading/Threading.h index 8d1c7a186c..9671dee0e6 100644 --- a/src/common/Threading/Threading.h +++ b/src/common/Threading/Threading.h @@ -18,7 +18,7 @@ namespace acore class Runnable { public: - virtual ~Runnable() {} + virtual ~Runnable() = default; virtual void run() = 0; void incReference() { ++m_refs; } diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h index 8f364490d7..5866869209 100644 --- a/src/common/Utilities/EventProcessor.h +++ b/src/common/Utilities/EventProcessor.h @@ -22,7 +22,7 @@ public: m_addTime = 0; m_execTime = 0; } - virtual ~BasicEvent() { } // override destructor to perform some actions on event removal + virtual ~BasicEvent() = default; // override destructor to perform some actions on event removal // this method executes when the event is triggered // return false if event does not want to be deleted diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 3b1cfc3f91..231b86d872 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -188,7 +188,7 @@ AuthSocket::AuthSocket(RealmSocket& socket) : } // Close patch file descriptor before leaving -AuthSocket::~AuthSocket() { } +AuthSocket::~AuthSocket() = default; // Accept the connection void AuthSocket::OnAccept() diff --git a/src/server/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h index 13802271df..cb31b8ccc9 100644 --- a/src/server/authserver/Server/RealmAcceptor.h +++ b/src/server/authserver/Server/RealmAcceptor.h @@ -16,7 +16,7 @@ class RealmAcceptor : public ACE_Acceptor<RealmSocket, ACE_SOCK_Acceptor> { public: - RealmAcceptor() { } + RealmAcceptor() = default; virtual ~RealmAcceptor() { if (reactor()) diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index db468e77bc..627c8943cb 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -295,8 +295,8 @@ private: class AchievementGlobalMgr { - AchievementGlobalMgr() {} - ~AchievementGlobalMgr() {} + AchievementGlobalMgr() = default; + ~AchievementGlobalMgr() = default; public: static AchievementGlobalMgr* instance(); diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index c1687d3a6e..3b7423ef9f 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -246,7 +246,7 @@ struct BattlegroundScore DamageDone(0), HealingDone(0), player(player) { } - virtual ~BattlegroundScore() { } //virtual destructor is used when deleting score from scores map + virtual ~BattlegroundScore() = default; //virtual destructor is used when deleting score from scores map uint32 KillingBlows; uint32 Deaths; diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 9a049ba23a..5564251509 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -29,7 +29,7 @@ class TempSummon : public Creature { public: explicit TempSummon(SummonPropertiesEntry const* properties, uint64 owner, bool isWorldObject); - ~TempSummon() override {} + ~TempSummon() override = default; void Update(uint32 time) override; virtual void InitStats(uint32 lifetime); virtual void InitSummon(); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index bc17f6df18..c49fd205c0 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -958,7 +958,7 @@ class PlayerTaxi { public: PlayerTaxi(); - ~PlayerTaxi() {} + ~PlayerTaxi() = default; // Nodes void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level); void LoadTaxiMask(std::string const& data); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index af8eefb519..9b73d3a1cb 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1077,7 +1077,7 @@ typedef std::unordered_map<uint32 /*category*/, GlobalCooldown> GlobalCooldownLi class GlobalCooldownMgr // Shared by Player and CharmInfo { public: - GlobalCooldownMgr() {} + GlobalCooldownMgr() = default; public: bool HasGlobalCooldown(SpellInfo const* spellInfo) const; @@ -1303,7 +1303,7 @@ struct SpellProcEventEntry; // used only private class MMapTargetData { public: - MMapTargetData() {} + MMapTargetData() = default; MMapTargetData(uint32 endTime, const Position* o, const Position* t) { _endTime = endTime; diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index f2105f04c4..f0d341bfaa 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -95,8 +95,8 @@ typedef std::map<int8, VehicleSeat> SeatMap; class TransportBase { protected: - TransportBase() { } - virtual ~TransportBase() { } + TransportBase() = default; + virtual ~TransportBase() = default; public: /// This method transforms supplied transport offsets into global coordinates diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index a3bc7b74d7..0b5cc53101 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -83,7 +83,7 @@ class GameEventMgr { private: GameEventMgr(); - ~GameEventMgr() {}; + ~GameEventMgr() = default;; public: static GameEventMgr* instance(); diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index c7acc5667a..33dbfe4ea9 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -62,7 +62,7 @@ public: private: //Non instanceable only static - HashMapHolder() {} + HashMapHolder() = default; static LockType i_lock; static MapType m_objectMap; diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 7df9190a8d..e191ce3fa5 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -17,7 +17,7 @@ class WorldObject; struct CellArea { - CellArea() {} + CellArea() = default; CellArea(CellCoord low, CellCoord high) : low_bound(low), high_bound(high) {} bool operator!() const { return low_bound == high_bound; } diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index b6563518bd..b368cf8c13 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -40,7 +40,7 @@ public: /** destructor to clean up its resources. This includes unloading the grid if it has not been unload. */ - ~Grid() {} + ~Grid() = default; /** an object of interested enters the grid */ diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index ebba752b75..fc693d06bd 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -159,7 +159,7 @@ struct LootItem // Should be called for non-reference LootStoreItem entries only (reference = 0) explicit LootItem(LootStoreItem const& li); - LootItem() {} + LootItem() = default; // Basic checks for player/item compatibility - if false no chance to see the item in the loot bool AllowedForPlayer(Player const* player) const; @@ -233,7 +233,7 @@ class LootTemplate typedef std::vector<LootGroup*> LootGroups; public: - LootTemplate() { } + LootTemplate() = default; ~LootTemplate(); // Adds an entry to the group (at loading stage) @@ -268,7 +268,7 @@ private: class LootValidatorRef : public Reference<Loot, LootValidatorRef> { public: - LootValidatorRef() {} + LootValidatorRef() = default; void targetObjectDestroyLink() override {} void sourceObjectDestroyLink() override {} }; diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index c7d686635c..4c113661ca 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -27,7 +27,7 @@ namespace Movement FacingInfo(float o) : angle(o) {} FacingInfo(uint64 t) : target(t) {} - FacingInfo() {} + FacingInfo() = default; }; struct MoveSplineInitArgs diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index b7ab4677ef..abfdf886c2 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -139,7 +139,7 @@ namespace Movement [[nodiscard]] index_type computeIndexInBounds(length_type length) const; public: - explicit Spline() {} + explicit Spline() = default; /** Calculates the position for given t @param t - percent of spline's length, assumes that t in range [0, 1]. */ diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 71e495dc37..999db2fadc 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -164,9 +164,7 @@ protected: { } - virtual ~ScriptObject() - { - } + virtual ~ScriptObject() = default; private: @@ -177,9 +175,7 @@ template<class TObject> class UpdatableScript { protected: - UpdatableScript() - { - } + UpdatableScript() = default; public: diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 1bf22ee6f4..5e9b273a53 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -120,7 +120,7 @@ class PacketFilter { public: explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {} - virtual ~PacketFilter() {} + virtual ~PacketFilter() = default; virtual bool Process(WorldPacket* /*packet*/) { return true; } [[nodiscard]] virtual bool ProcessLogout() const { return true; } @@ -133,7 +133,7 @@ class MapSessionFilter : public PacketFilter { public: explicit MapSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {} - ~MapSessionFilter() override {} + ~MapSessionFilter() override = default; bool Process(WorldPacket* packet) override; //in Map::Update() we do not process player logout! @@ -146,7 +146,7 @@ class WorldSessionFilter : public PacketFilter { public: explicit WorldSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {} - ~WorldSessionFilter() override {} + ~WorldSessionFilter() override = default; bool Process(WorldPacket* packet) override; }; @@ -181,7 +181,7 @@ protected: uint8 CharCount; private: - virtual ~CharacterCreateInfo() {}; + virtual ~CharacterCreateInfo() = default;; }; struct PacketCounter diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index 921eece3c9..cbe5c0d64f 100644 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -55,7 +55,7 @@ class Weather public: Weather(uint32 zone, WeatherData const* weatherChances); - ~Weather() { }; + ~Weather() = default;; bool Update(uint32 diff); bool ReGenerate(); diff --git a/src/server/shared/Network/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp index 649bc7edc0..acaebbf91c 100644 --- a/src/server/shared/Network/RealmSocket.cpp +++ b/src/server/shared/Network/RealmSocket.cpp @@ -11,9 +11,10 @@ #include "RealmSocket.h" #include "Log.h" -RealmSocket::Session::Session() { } -RealmSocket::Session::~Session() { } +RealmSocket::Session::Session() = default; + +RealmSocket::Session::~Session() = default; RealmSocket::RealmSocket() : input_buffer_(4096), session_(nullptr), diff --git a/src/server/shared/Realms/RealmList.h b/src/server/shared/Realms/RealmList.h index 9e7d1c1f22..248c8dbd6a 100644 --- a/src/server/shared/Realms/RealmList.h +++ b/src/server/shared/Realms/RealmList.h @@ -46,7 +46,7 @@ public: typedef std::map<std::string, Realm> RealmMap; RealmList(); - ~RealmList() { } + ~RealmList() = default; static RealmList* instance(); diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index ddd937e313..d35864e298 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -24,8 +24,7 @@ public: public: Exception(const std::string& message): message(message) { } - virtual ~Exception() - { } + virtual ~Exception() = default; const std::string& getMessage() {return message;} private: std::string message; diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 3b32e8a847..c764a1683c 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -30,7 +30,7 @@ namespace MMAP MapTiles() : m_mapId(uint32(-1)), m_tiles(nullptr) {} MapTiles(uint32 id, std::set<uint32>* tiles) : m_mapId(id), m_tiles(tiles) {} - ~MapTiles() {} + ~MapTiles() = default; uint32 m_mapId; std::set<uint32>* m_tiles; diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index b9480b1fca..eb5cf2c37e 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -73,7 +73,7 @@ namespace MMAP char const* MAP_VERSION_MAGIC = "v1.8"; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid) { } - TerrainBuilder::~TerrainBuilder() { } + TerrainBuilder::~TerrainBuilder() = default; /**************************************************************************/ void TerrainBuilder::getLoopVars(Spot portion, int& loopStart, int& loopEnd, int& loopInc) diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h index ae2aa4095b..4d8b6ded1f 100644 --- a/src/tools/vmap4_extractor/dbcfile.h +++ b/src/tools/vmap4_extractor/dbcfile.h @@ -27,8 +27,7 @@ public: public: Exception(const std::string& message): message(message) { } - virtual ~Exception() - { } + virtual ~Exception() = default; const std::string& getMessage() {return message;} private: std::string message; |