Core/Misc: Kill copy/move constructors for singleton classes

6 files changed, 25 insertions, 5 deletions

diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp
index 181ce3e081a..26f7185e956 100644
--- a/src/server/game/DungeonFinding/LFGGroupData.cpp
+++ b/src/server/game/DungeonFinding/LFGGroupData.cpp
@@ -25,8 +25,9 @@ LfgGroupData::LfgGroupData(): m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NONE
     m_Leader(), m_Dungeon(0), m_KicksLeft(LFG_GROUP_MAX_KICKS), m_VoteKickActive(false)
 { }
 
-LfgGroupData::~LfgGroupData()
-{ }
+LfgGroupData::LfgGroupData(LfgGroupData&& other) noexcept = default;
+LfgGroupData& LfgGroupData::operator=(LfgGroupData&& right) noexcept = default;
+LfgGroupData::~LfgGroupData() = default;
 
 bool LfgGroupData::IsLfgGroup()
 {
diff --git a/src/server/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h
index 092c8b0a445..f8e891d8700 100644
--- a/src/server/game/DungeonFinding/LFGGroupData.h
+++ b/src/server/game/DungeonFinding/LFGGroupData.h
@@ -35,6 +35,10 @@ class TC_GAME_API LfgGroupData
 {
     public:
         LfgGroupData();
+        LfgGroupData(LfgGroupData const&) = delete;
+        LfgGroupData(LfgGroupData&& other) noexcept;
+        LfgGroupData& operator=(LfgGroupData const&) = delete;
+        LfgGroupData& operator=(LfgGroupData&& right) noexcept;
         ~LfgGroupData();
 
         bool IsLfgGroup();
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp
index 62e5456676d..5133f29b517 100644
--- a/src/server/game/DungeonFinding/LFGPlayerData.cpp
+++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp
@@ -24,7 +24,9 @@ LfgPlayerData::LfgPlayerData(): m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NO
     m_Team(0), m_Group(), m_Roles(0), m_NumberOfPartyMembersAtJoin(0)
 { }
 
-LfgPlayerData::~LfgPlayerData() { }
+LfgPlayerData::LfgPlayerData(LfgPlayerData&& other) noexcept = default;
+LfgPlayerData& LfgPlayerData::operator=(LfgPlayerData&& right) noexcept = default;
+LfgPlayerData::~LfgPlayerData() = default;
 
 void LfgPlayerData::SetTicket(WorldPackets::LFG::RideTicket const& ticket)
 {
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h
index 95603b16180..7e835343ba3 100644
--- a/src/server/game/DungeonFinding/LFGPlayerData.h
+++ b/src/server/game/DungeonFinding/LFGPlayerData.h
@@ -31,6 +31,10 @@ class TC_GAME_API LfgPlayerData
 {
     public:
         LfgPlayerData();
+        LfgPlayerData(LfgPlayerData const&) = delete;
+        LfgPlayerData(LfgPlayerData&& other) noexcept;
+        LfgPlayerData& operator=(LfgPlayerData const&) = delete;
+        LfgPlayerData& operator=(LfgPlayerData&& right) noexcept;
         ~LfgPlayerData();
 
         // General
diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp
index eb688347527..65e6324ea50 100644
--- a/src/server/game/DungeonFinding/LFGQueue.cpp
+++ b/src/server/game/DungeonFinding/LFGQueue.cpp
@@ -83,6 +83,11 @@ LfgQueueData::LfgQueueData() : joinTime(GameTime::GetGameTime()), tanks(LFG_TANK
 healers(LFG_HEALERS_NEEDED), dps(LFG_DPS_NEEDED)
 { }
 
+LFGQueue::LFGQueue() = default;
+LFGQueue::LFGQueue(LFGQueue&& other) noexcept = default;
+LFGQueue& LFGQueue::operator=(LFGQueue&& right) noexcept = default;
+LFGQueue::~LFGQueue() = default;
+
 std::string LFGQueue::GetDetailedMatchRoles(GuidList const& check) const
 {
     if (check.empty())
diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h
index da970ea6fcb..b153b035021 100644
--- a/src/server/game/DungeonFinding/LFGQueue.h
+++ b/src/server/game/DungeonFinding/LFGQueue.h
@@ -85,6 +85,12 @@ typedef std::map<ObjectGuid, LfgQueueData> LfgQueueDataContainer;
 class TC_GAME_API LFGQueue
 {
     public:
+        LFGQueue();
+        LFGQueue(LFGQueue const&) = delete;
+        LFGQueue(LFGQueue&& other) noexcept;
+        LFGQueue& operator=(LFGQueue const&) = delete;
+        LFGQueue& operator=(LFGQueue&& right) noexcept;
+        ~LFGQueue();
 
         // Add/Remove from queue
         std::string GetDetailedMatchRoles(GuidList const& check) const;
@@ -111,8 +117,6 @@ class TC_GAME_API LFGQueue
         std::string DumpCompatibleInfo(bool full = false) const;
 
     private:
-        void SetQueueUpdateData(std::string const& strGuids, LfgRolesMap const& proposalRoles);
-
         void AddToNewQueue(ObjectGuid guid);
         void AddToCurrentQueue(ObjectGuid guid);
         void AddToFrontCurrentQueue(ObjectGuid guid);