From adf436c937a53d8a7367ebfddac3f766e96f4290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sun, 13 Dec 2020 01:11:15 +0100 Subject: [PATCH] refactor(Core): apply clang-tidy modernize-pass-by-value (#3823) --- src/common/Database/Transaction.h | 4 +++- src/server/game/Addons/AddonMgr.h | 9 +++++---- src/server/game/Mails/Mail.h | 5 +++-- src/server/game/Server/WorldSession.h | 6 ++++-- src/tools/map_extractor/dbcfile.cpp | 8 +++++--- src/tools/map_extractor/dbcfile.h | 5 +++-- src/tools/vmap4_extractor/dbcfile.cpp | 5 +++-- src/tools/vmap4_extractor/dbcfile.h | 5 +++-- src/tools/vmap4_extractor/wmo.cpp | 11 ++++++----- src/tools/vmap4_extractor/wmo.h | 2 +- 10 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/common/Database/Transaction.h b/src/common/Database/Transaction.h index 9d241ddbb..b8c014f00 100644 --- a/src/common/Database/Transaction.h +++ b/src/common/Database/Transaction.h @@ -7,6 +7,8 @@ #ifndef _TRANSACTION_H #define _TRANSACTION_H +#include + #include "SQLOperation.h" //- Forward declare (don't include header to prevent circular includes) @@ -48,7 +50,7 @@ class TransactionTask : public SQLOperation friend class DatabaseWorker; public: - TransactionTask(SQLTransaction trans) : m_trans(trans) { } ; + TransactionTask(SQLTransaction trans) : m_trans(std::move(trans)) { } ; ~TransactionTask() override = default; protected: diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index cf50a459e..9c324d822 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -8,13 +8,14 @@ #define _ADDONMGR_H #include "Define.h" -#include #include +#include +#include struct AddonInfo { - AddonInfo(const std::string& name, uint8 enabled, uint32 crc, uint8 state, bool crcOrPubKey) - : Name(name), Enabled(enabled), CRC(crc), State(state), UsePublicKeyOrCRC(crcOrPubKey) {} + AddonInfo(std::string name, uint8 enabled, uint32 crc, uint8 state, bool crcOrPubKey) + : Name(std::move(name)), Enabled(enabled), CRC(crc), State(state), UsePublicKeyOrCRC(crcOrPubKey) {} std::string Name; uint8 Enabled; @@ -25,7 +26,7 @@ struct AddonInfo struct SavedAddon { - SavedAddon(const std::string& name, uint32 crc) : Name(name) + SavedAddon(std::string name, uint32 crc) : Name(std::move(name)) { CRC = crc; } diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 205628bda..4613a2ad8 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -9,6 +9,7 @@ #include "Common.h" #include +#include struct AuctionEntry; struct CalendarEvent; @@ -110,8 +111,8 @@ public: // Constructors explicit MailDraft(uint16 mailTemplateId, bool need_items = true) : m_mailTemplateId(mailTemplateId), m_mailTemplateItemsNeed(need_items), m_money(0), m_COD(0) {} - MailDraft(std::string const& subject, std::string const& body) - : m_mailTemplateId(0), m_mailTemplateItemsNeed(false), m_subject(subject), m_body(body), m_money(0), m_COD(0) {} + MailDraft(std::string subject, std::string body) + : m_mailTemplateId(0), m_mailTemplateItemsNeed(false), m_subject(std::move(subject)), m_body(std::move(body)), m_money(0), m_COD(0) {} public: // Accessors [[nodiscard]] uint16 GetMailTemplateId() const { return m_mailTemplateId; } [[nodiscard]] std::string const& GetSubject() const { return m_subject; } diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index ab49ec533..64543337c 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -11,6 +11,8 @@ #ifndef __WORLDSESSION_H #define __WORLDSESSION_H +#include + #include "Common.h" #include "SharedDefines.h" #include "AddonMgr.h" @@ -159,8 +161,8 @@ class CharacterCreateInfo friend class Player; protected: - CharacterCreateInfo(std::string const& name, uint8 race, uint8 cclass, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId, - WorldPacket& data) : Name(name), Race(race), Class(cclass), Gender(gender), Skin(skin), Face(face), HairStyle(hairStyle), HairColor(hairColor), FacialHair(facialHair), + CharacterCreateInfo(std::string name, uint8 race, uint8 cclass, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId, + WorldPacket& data) : Name(std::move(name)), Race(race), Class(cclass), Gender(gender), Skin(skin), Face(face), HairStyle(hairStyle), HairColor(hairColor), FacialHair(facialHair), OutfitId(outfitId), Data(data), CharCount(0) {} diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp index e41d74766..2106c5af2 100644 --- a/src/tools/map_extractor/dbcfile.cpp +++ b/src/tools/map_extractor/dbcfile.cpp @@ -7,10 +7,12 @@ #define _CRT_SECURE_NO_DEPRECATE #include "dbcfile.h" -#include "mpq_libmpq04.h" -DBCFile::DBCFile(const std::string& filename): - filename(filename), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) +#include "mpq_libmpq04.h" +#include + +DBCFile::DBCFile(std::string filename): + filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) { } diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index d35864e29..ffef3f488 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -8,11 +8,12 @@ #define DBCFILE_H #include #include +#include class DBCFile { public: - DBCFile(const std::string& filename); + DBCFile(std::string filename); ~DBCFile(); // Open database. It must be openened before it can be used. @@ -22,7 +23,7 @@ public: class Exception { public: - Exception(const std::string& message): message(message) + Exception(std::string message): message(std::move(message)) { } virtual ~Exception() = default; const std::string& getMessage() {return message;} diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp index 875926d4d..57a847755 100644 --- a/src/tools/vmap4_extractor/dbcfile.cpp +++ b/src/tools/vmap4_extractor/dbcfile.cpp @@ -10,9 +10,10 @@ #undef max #include +#include -DBCFile::DBCFile(const std::string& filename): - filename(filename), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) +DBCFile::DBCFile(std::string filename): + filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) { } diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h index 4d8b6ded1..3c09a298c 100644 --- a/src/tools/vmap4_extractor/dbcfile.h +++ b/src/tools/vmap4_extractor/dbcfile.h @@ -9,11 +9,12 @@ #include #include +#include class DBCFile { public: - DBCFile(const std::string& filename); + DBCFile(std::string filename); ~DBCFile(); // Open database. It must be openened before it can be used. @@ -25,7 +26,7 @@ public: class Exception { public: - Exception(const std::string& message): message(message) + Exception(std::string message): message(std::move(message)) { } virtual ~Exception() = default; const std::string& getMessage() {return message;} diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index c1a3876f2..99fc32ac2 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -4,14 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "vmapexport.h" #include "wmo.h" #include "vec3d.h" +#include "vmapexport.h" +#include #include #include -#include -#include #include +#include +#include #undef min #undef max #include "mpq_libmpq04.h" @@ -124,8 +125,8 @@ bool WMORoot::ConvertToVMAPRootWmo(FILE* pOutfile) return true; } -WMOGroup::WMOGroup(const std::string& filename) : - filename(filename), MOPY(nullptr), MOVI(nullptr), MoviEx(nullptr), MOVT(nullptr), MOBA(nullptr), MobaEx(nullptr), +WMOGroup::WMOGroup(std::string filename) : + filename(std::move(filename)), MOPY(nullptr), MOVI(nullptr), MoviEx(nullptr), MOVT(nullptr), MOBA(nullptr), MobaEx(nullptr), hlq(nullptr), LiquEx(nullptr), LiquBytes(nullptr), groupName(0), descGroupName(0), mogpFlags(0), moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), nBatchC(0), fogIdx(0), liquidType(0), groupWMOID(0), mopy_size(0), moba_size(0), LiquEx_size(0), diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index a9df008f0..a19b104de 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -98,7 +98,7 @@ public: int nTriangles; // number when loaded uint32 liquflags; - WMOGroup(std::string const& filename); + WMOGroup(std::string filename); ~WMOGroup(); bool open();