ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8579 from jordan-woyak/rvalue-cleanups 

Common/Core: Minor rvalue reference related cleanups.
This commit is contained in:
Tilka 2020-01-25 21:09:22 +00:00 committed by GitHub
parent 14ebdf0e9d 732032cdb2
commit a632bc7324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/IniFile.cpp
View File

@ -185,13 +185,7 @@ bool IniFile::Exists(std::string_view section_name, std::string_view key) const
return section->Exists(key);
}
void IniFile::SetLines(std::string_view section_name, const std::vector<std::string>& lines)
{
Section* section = GetOrCreateSection(section_name);
section->SetLines(lines);
}
void IniFile::SetLines(std::string_view section_name, std::vector<std::string>&& lines)
void IniFile::SetLines(std::string_view section_name, std::vector<std::string> lines)
{
Section* section = GetOrCreateSection(section_name);
section->SetLines(std::move(lines));

3
Source/Core/Common/IniFile.h
View File

@ -143,8 +143,7 @@ public:
bool GetKeys(std::string_view section_name, std::vector<std::string>* keys) const;
void SetLines(std::string_view section_name, const std::vector<std::string>& lines);
void SetLines(std::string_view section_name, std::vector<std::string>&& lines);
void SetLines(std::string_view section_name, std::vector<std::string> lines);
bool GetLines(std::string_view section_name, std::vector<std::string>* lines,
bool remove_comments = true) const;

25
Source/Core/Core/IOS/ES/Formats.cpp
View File

@ -79,11 +79,7 @@ bool operator!=(const Content& lhs, const Content& rhs)
return !operator==(lhs, rhs);
}
SignedBlobReader::SignedBlobReader(const std::vector<u8>& bytes) : m_bytes(bytes)
{
}
SignedBlobReader::SignedBlobReader(std::vector<u8>&& bytes) : m_bytes(std::move(bytes))
SignedBlobReader::SignedBlobReader(std::vector<u8> bytes) : m_bytes(std::move(bytes))
{
}
@ -92,12 +88,7 @@ const std::vector<u8>& SignedBlobReader::GetBytes() const
return m_bytes;
}
void SignedBlobReader::SetBytes(const std::vector<u8>& bytes)
{
m_bytes = bytes;
}
void SignedBlobReader::SetBytes(std::vector<u8>&& bytes)
void SignedBlobReader::SetBytes(std::vector<u8> bytes)
{
m_bytes = std::move(bytes);
}
@ -213,11 +204,7 @@ bool IsValidTMDSize(size_t size)
return size <= 0x49e4;
}
TMDReader::TMDReader(const std::vector<u8>& bytes) : SignedBlobReader(bytes)
{
}
TMDReader::TMDReader(std::vector<u8>&& bytes) : SignedBlobReader(std::move(bytes))
TMDReader::TMDReader(std::vector<u8> bytes) : SignedBlobReader(std::move(bytes))
{
}
@ -376,11 +363,7 @@ bool TMDReader::FindContentById(u32 id, Content* content) const
return false;
}
TicketReader::TicketReader(const std::vector<u8>& bytes) : SignedBlobReader(bytes)
{
}
TicketReader::TicketReader(std::vector<u8>&& bytes) : SignedBlobReader(std::move(bytes))
TicketReader::TicketReader(std::vector<u8> bytes) : SignedBlobReader(std::move(bytes))
{
}

12
Source/Core/Core/IOS/ES/Formats.h
View File

@ -155,12 +155,10 @@ class SignedBlobReader
{
public:
SignedBlobReader() = default;
explicit SignedBlobReader(const std::vector<u8>& bytes);
explicit SignedBlobReader(std::vector<u8>&& bytes);
explicit SignedBlobReader(std::vector<u8> bytes);
const std::vector<u8>& GetBytes() const;
void SetBytes(const std::vector<u8>& bytes);
void SetBytes(std::vector<u8>&& bytes);
void SetBytes(std::vector<u8> bytes);
/// Get the SHA1 hash for this signed blob (starting at the issuer).
std::array<u8, 20> GetSha1() const;
@ -187,8 +185,7 @@ class TMDReader final : public SignedBlobReader
{
public:
TMDReader() = default;
explicit TMDReader(const std::vector<u8>& bytes);
explicit TMDReader(std::vector<u8>&& bytes);
explicit TMDReader(std::vector<u8> bytes);
bool IsValid() const;
@ -224,8 +221,7 @@ class TicketReader final : public SignedBlobReader
{
public:
TicketReader() = default;
explicit TicketReader(const std::vector<u8>& bytes);
explicit TicketReader(std::vector<u8>&& bytes);
explicit TicketReader(std::vector<u8> bytes);
bool IsValid() const;

7
Source/Core/Core/SysConf.cpp
View File

@ -217,12 +217,7 @@ SysConf::Entry::Entry(Type type_, const std::string& name_) : type(type_), name(
bytes.resize(GetNonArrayEntrySize(type));
}
SysConf::Entry::Entry(Type type_, const std::string& name_, const std::vector<u8>& bytes_)
: type(type_), name(name_), bytes(bytes_)
{
}
SysConf::Entry::Entry(Type type_, const std::string& name_, std::vector<u8>&& bytes_)
SysConf::Entry::Entry(Type type_, const std::string& name_, std::vector<u8> bytes_)
: type(type_), name(name_), bytes(std::move(bytes_))
{
}

3
Source/Core/Core/SysConf.h
View File

@ -47,8 +47,7 @@ public:
};
Entry(Type type_, const std::string& name_);
Entry(Type type_, const std::string& name_, const std::vector<u8>& bytes_);
Entry(Type type_, const std::string& name_, std::vector<u8>&& bytes_);
Entry(Type type_, const std::string& name_, std::vector<u8> bytes_);
// Intended for use with the non array types.
template <typename T>