From 7bb9134fd3aaa3fa1b2b7487a8148145187e03bb Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 18 Feb 2023 19:03:29 +0100 Subject: [PATCH] Avoid unqualified calls to `std::move` --- io/passwordfile.cpp | 16 ++++++++-------- util/opensslrandomdevice.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/io/passwordfile.cpp b/io/passwordfile.cpp index f1bcb90..da03ae3 100644 --- a/io/passwordfile.cpp +++ b/io/passwordfile.cpp @@ -89,12 +89,12 @@ PasswordFile::PasswordFile(const PasswordFile &other) * \brief Moves the password file. */ PasswordFile::PasswordFile(PasswordFile &&other) - : m_path(move(other.m_path)) - , m_password(move(other.m_password)) - , m_rootEntry(move(other.m_rootEntry)) - , m_extendedHeader(move(other.m_extendedHeader)) - , m_encryptedExtendedHeader(move(other.m_encryptedExtendedHeader)) - , m_file(move(other.m_file)) + : m_path(std::move(other.m_path)) + , m_password(std::move(other.m_password)) + , m_rootEntry(std::move(other.m_rootEntry)) + , m_extendedHeader(std::move(other.m_extendedHeader)) + , m_encryptedExtendedHeader(std::move(other.m_encryptedExtendedHeader)) + , m_file(std::move(other.m_file)) , m_freader(BinaryReader(&m_file)) , m_fwriter(BinaryWriter(&m_file)) , m_version(other.m_version) @@ -294,7 +294,7 @@ void PasswordFile::load() msg += ERR_error_string(errorCode, nullptr); errorCode = ERR_get_error(); } - throw CryptoException(move(msg)); + throw CryptoException(std::move(msg)); } if (ctx) { @@ -550,7 +550,7 @@ void PasswordFile::write(PasswordFileSaveFlags options) msg += ERR_error_string(errorCode, nullptr); errorCode = ERR_get_error(); } - throw CryptoException(move(msg)); + throw CryptoException(std::move(msg)); } if (ctx) { diff --git a/util/opensslrandomdevice.cpp b/util/opensslrandomdevice.cpp index 30f3450..9c0b189 100644 --- a/util/opensslrandomdevice.cpp +++ b/util/opensslrandomdevice.cpp @@ -45,7 +45,7 @@ OpenSslRandomDevice::result_type OpenSslRandomDevice::operator()() const errorMsg += ERR_error_string(errorCode, nullptr); errorCode = ERR_get_error(); } - throw Io::CryptoException(move(errorMsg)); + throw Io::CryptoException(std::move(errorMsg)); } /*!