Core/Misc: reduced amount of string memory allocations (Step II)

2 files changed, 29 insertions, 29 deletions

diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index dd1fb7cc6b6..9e4c7828b1b 100755
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -260,18 +260,18 @@ private:
         Member(uint32 guildId, uint64 guid, uint8 rankId) : m_guildId(guildId), m_guid(guid), m_logoutTime(::time(NULL)), m_rankId(rankId) { }
 
         void SetStats(Player* player);
-        void SetStats(const std::string& name, uint8 level, uint8 _class, uint32 zoneId, uint32 accountId);
+        void SetStats(std::string const& name, uint8 level, uint8 _class, uint32 zoneId, uint32 accountId);
         bool CheckStats() const;
 
-        void SetPublicNote(const std::string& publicNote);
-        void SetOfficerNote(const std::string& officerNote);
+        void SetPublicNote(std::string const& publicNote);
+        void SetOfficerNote(std::string const& officerNote);
 
         bool LoadFromDB(Field* fields);
         void SaveToDB(SQLTransaction& trans) const;
         void WritePacket(WorldPacket& data) const;
 
         uint64 GetGUID() const { return m_guid; }
-        std::string GetName() const { return m_name; }
+        std::string const& GetName() const { return m_name; }
         uint32 GetAccountId() const { return m_accountId; }
         uint8 GetRankId() const { return m_rankId; }
 
@@ -414,7 +414,7 @@ private:
     {
     public:
         RankInfo(uint32 guildId) : m_guildId(guildId), m_rankId(GUILD_RANK_NONE), m_rights(GR_RIGHT_EMPTY), m_bankMoneyPerDay(0) { }
-        RankInfo(uint32 guildId, uint8 rankId, const std::string& name, uint32 rights, uint32 money) :
+        RankInfo(uint32 guildId, uint8 rankId, std::string const& name, uint32 rights, uint32 money) :
             m_guildId(guildId), m_rankId(rankId), m_name(name), m_rights(rights), m_bankMoneyPerDay(money) { }
 
         void LoadFromDB(Field* fields);
@@ -423,8 +423,8 @@ private:
 
         uint8 GetId() const { return m_rankId; }
 
-        std::string GetName() const { return m_name; }
-        void SetName(const std::string& name);
+        std::string const& GetName() const { return m_name; }
+        void SetName(std::string const& name);
 
         uint32 GetRights() const { return m_rights; }
         void SetRights(uint32 rights);
@@ -471,8 +471,8 @@ private:
             data << m_icon;
         }
 
-        void SetInfo(const std::string& name, const std::string& icon);
-        void SetText(const std::string& text);
+        void SetInfo(std::string const& name, std::string const& icon);
+        void SetText(std::string const& text);
         void SendText(const Guild* guild, WorldSession* session) const;
 
         inline Item* GetItem(uint8 slotId) const { return slotId < GUILD_BANK_MAX_SLOTS ?  m_items[slotId] : NULL; }
@@ -579,39 +579,39 @@ private:
     typedef std::vector<BankTab*> BankTabs;
 
 public:
-    static void SendCommandResult(WorldSession* session, GuildCommandType type, GuildCommandError errCode, const std::string& param = "");
+    static void SendCommandResult(WorldSession* session, GuildCommandType type, GuildCommandError errCode, std::string const& param = "");
     static void SendSaveEmblemResult(WorldSession* session, GuildEmblemError errCode);
 
     Guild();
     ~Guild();
 
-    bool Create(Player* pLeader, const std::string& name);
+    bool Create(Player* pLeader, std::string const& name);
     void Disband();
 
     // Getters
     uint32 GetId() const { return m_id; }
     uint64 GetLeaderGUID() const { return m_leaderGuid; }
-    const std::string& GetName() const { return m_name; }
-    const std::string& GetMOTD() const { return m_motd; }
-    const std::string& GetInfo() const { return m_info; }
+    std::string const& GetName() const { return m_name; }
+    std::string const& GetMOTD() const { return m_motd; }
+    std::string const& GetInfo() const { return m_info; }
 
     // Handle client commands
     void HandleRoster(WorldSession* session = NULL);          // NULL = broadcast
     void HandleQuery(WorldSession* session);
-    void HandleSetMOTD(WorldSession* session, const std::string& motd);
-    void HandleSetInfo(WorldSession* session, const std::string& info);
+    void HandleSetMOTD(WorldSession* session, std::string const& motd);
+    void HandleSetInfo(WorldSession* session, std::string const& info);
     void HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo);
-    void HandleSetLeader(WorldSession* session, const std::string& name);
-    void HandleSetBankTabInfo(WorldSession* session, uint8 tabId, const std::string& name, const std::string& icon);
-    void HandleSetMemberNote(WorldSession* session, const std::string& name, const std::string& note, bool officer);
-    void HandleSetRankInfo(WorldSession* session, uint8 rankId, const std::string& name, uint32 rights, uint32 moneyPerDay, GuildBankRightsAndSlotsVec rightsAndSlots);
+    void HandleSetLeader(WorldSession* session, std::string const& name);
+    void HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string const& name, std::string const& icon);
+    void HandleSetMemberNote(WorldSession* session, std::string const& name, std::string const& note, bool officer);
+    void HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string const& name, uint32 rights, uint32 moneyPerDay, GuildBankRightsAndSlotsVec rightsAndSlots);
     void HandleBuyBankTab(WorldSession* session, uint8 tabId);
-    void HandleInviteMember(WorldSession* session, const std::string& name);
+    void HandleInviteMember(WorldSession* session, std::string const& name);
     void HandleAcceptMember(WorldSession* session);
     void HandleLeaveMember(WorldSession* session);
-    void HandleRemoveMember(WorldSession* session, const std::string& name);
-    void HandleUpdateMemberRank(WorldSession* session, const std::string& name, bool demote);
-    void HandleAddNewRank(WorldSession* session, const std::string& name);
+    void HandleRemoveMember(WorldSession* session, std::string const& name);
+    void HandleUpdateMemberRank(WorldSession* session, std::string const& name, bool demote);
+    void HandleAddNewRank(WorldSession* session, std::string const& name);
     void HandleRemoveLowestRank(WorldSession* session);
     void HandleMemberDepositMoney(WorldSession* session, uint32 amount);
     bool HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool repair = false);
@@ -641,7 +641,7 @@ public:
     bool Validate();
 
     // Broadcasts
-    void BroadcastToGuild(WorldSession* session, bool officerOnly, const std::string& msg, uint32 language = LANG_UNIVERSAL) const;
+    void BroadcastToGuild(WorldSession* session, bool officerOnly, std::string const& msg, uint32 language = LANG_UNIVERSAL) const;
     void BroadcastPacketToRank(WorldPacket* packet, uint8 rankId) const;
     void BroadcastPacket(WorldPacket* packet) const;
 
@@ -665,7 +665,7 @@ public:
     void SwapItemsWithInventory(Player* player, bool toChar, uint8 tabId, uint8 slotId, uint8 playerBag, uint8 playerSlotId, uint32 splitedAmount);
 
     // Bank tabs
-    void SetBankTabText(uint8 tabId, const std::string& text);
+    void SetBankTabText(uint8 tabId, std::string const& text);
 
 protected:
     uint32 m_id;
@@ -708,7 +708,7 @@ private:
         Members::iterator itr = m_members.find(GUID_LOPART(guid));
         return itr != m_members.end() ? itr->second : NULL;
     }
-    inline Member* GetMember(WorldSession* session, const std::string& name)
+    inline Member* GetMember(WorldSession* session, std::string const& name)
     {
         for (Members::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
             if (itr->second->GetName() == name)
@@ -731,7 +731,7 @@ private:
     // Creates default guild ranks with names in given locale
     void _CreateDefaultGuildRanks(LocaleConstant loc);
     // Creates new rank
-    void _CreateRank(const std::string& name, uint32 rights);
+    void _CreateRank(std::string const& name, uint32 rights);
     // Update account number when member added/removed from guild
     void _UpdateAccountsNumber();
     bool _IsLeader(Player* player) const;
diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index 9654fced227..1f2413581d8 100644
--- a/src/server/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
@@ -32,7 +32,7 @@ public:
 
     Guild* GetGuildByLeader(uint64 guid) const;
     Guild* GetGuildById(uint32 guildId) const;
-    Guild* GetGuildByName(const std::string& guildName) const;
+    Guild* GetGuildByName(std::string const& guildName) const;
     std::string GetGuildNameById(uint32 guildId) const;
 
     void LoadGuilds();