From 6022b2ce779f51a4bf0940492cb0be1a48ab337a Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 11 Sep 2023 15:55:46 +0300 Subject: [PATCH] Improve parameter names. --- td/telegram/files/FileStats.cpp | 6 +++--- td/telegram/files/FileStats.h | 2 +- tdutils/td/utils/BufferedFd.h | 8 ++++---- test/secret.cpp | 26 +++++++++++++------------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/td/telegram/files/FileStats.cpp b/td/telegram/files/FileStats.cpp index 6e74314e4..62c0af2a9 100644 --- a/td/telegram/files/FileStats.cpp +++ b/td/telegram/files/FileStats.cpp @@ -134,13 +134,13 @@ void FileStats::apply_dialog_ids(const vector &dialog_ids) { } td_api::object_ptr FileStats::get_storage_statistics_by_chat_object( - DialogId dialog_id, const FileStats::StatByType &stat_by_type_) { + DialogId dialog_id, const FileStats::StatByType &stat_by_type) { auto stats = make_tl_object(dialog_id.get(), 0, 0, Auto()); FileStats::StatByType aggregated_stats; for (int32 i = 0; i < MAX_FILE_TYPE; i++) { auto file_type = narrow_cast(get_main_file_type(static_cast(i))); - aggregated_stats[file_type].size += stat_by_type_[i].size; - aggregated_stats[file_type].cnt += stat_by_type_[i].cnt; + aggregated_stats[file_type].size += stat_by_type[i].size; + aggregated_stats[file_type].cnt += stat_by_type[i].cnt; } for (int32 i = 0; i < MAX_FILE_TYPE; i++) { diff --git a/td/telegram/files/FileStats.h b/td/telegram/files/FileStats.h index 9801b5eee..2a3393ee9 100644 --- a/td/telegram/files/FileStats.h +++ b/td/telegram/files/FileStats.h @@ -83,7 +83,7 @@ class FileStats { static FileTypeStat get_nontemp_stat(const StatByType &by_type); static td_api::object_ptr get_storage_statistics_by_chat_object( - DialogId dialog_id, const StatByType &stat_by_type_); + DialogId dialog_id, const StatByType &stat_by_type); friend StringBuilder &operator<<(StringBuilder &sb, const FileStats &file_stats); diff --git a/tdutils/td/utils/BufferedFd.h b/tdutils/td/utils/BufferedFd.h index 17bef41ff..02c1715a2 100644 --- a/tdutils/td/utils/BufferedFd.h +++ b/tdutils/td/utils/BufferedFd.h @@ -24,7 +24,7 @@ template class BufferedFdBase : public FdT { public: BufferedFdBase() = default; - explicit BufferedFdBase(FdT &&fd_); + explicit BufferedFdBase(FdT &&fd); // TODO: make move constructor and move assignment safer Result flush_read(size_t max_read = std::numeric_limits::max()) TD_WARN_UNUSED_RESULT; @@ -65,7 +65,7 @@ class BufferedFd final : public BufferedFdBase { public: BufferedFd(); - explicit BufferedFd(FdT &&fd_); + explicit BufferedFd(FdT &&fd); BufferedFd(BufferedFd &&) noexcept; BufferedFd &operator=(BufferedFd &&) noexcept; BufferedFd(const BufferedFd &) = delete; @@ -93,7 +93,7 @@ class BufferedFd final : public BufferedFdBase { /*** BufferedFd ***/ template -BufferedFdBase::BufferedFdBase(FdT &&fd_) : FdT(std::move(fd_)) { +BufferedFdBase::BufferedFdBase(FdT &&fd) : FdT(std::move(fd)) { } template @@ -166,7 +166,7 @@ BufferedFd::BufferedFd() { } template -BufferedFd::BufferedFd(FdT &&fd_) : Parent(std::move(fd_)) { +BufferedFd::BufferedFd(FdT &&fd) : Parent(std::move(fd)) { init(); } diff --git a/test/secret.cpp b/test/secret.cpp index 1488b6f34..141d9c6f4 100644 --- a/test/secret.cpp +++ b/test/secret.cpp @@ -67,7 +67,7 @@ class messages_getDhConfig { messages_getDhConfig() = default; - messages_getDhConfig(int32 version_, int32 random_length_); + messages_getDhConfig(int32 version, int32 random_length); static const int32 ID = 651135312; @@ -226,8 +226,8 @@ class messages_dhConfig final { messages_dhConfig() = default; - messages_dhConfig(int32 g_, BufferSlice &&p_, int32 version_, BufferSlice &&random_) - : g_(g_), p_(std::move(p_)), version_(version_), random_(std::move(random_)) { + messages_dhConfig(int32 g, BufferSlice &&p, int32 version, BufferSlice &&random) + : g_(g), p_(std::move(p)), version_(version), random_(std::move(random)) { } static const int32 ID = 740433629; @@ -263,15 +263,15 @@ class encryptedChat final { encryptedChat() = default; - encryptedChat(int32 id_, int64 access_hash_, int32 date_, int64 admin_id_, int64 participant_id_, - BufferSlice &&g_a_or_b_, int64 key_fingerprint_) - : id_(id_) - , access_hash_(access_hash_) - , date_(date_) - , admin_id_(admin_id_) - , participant_id_(participant_id_) - , g_a_or_b_(std::move(g_a_or_b_)) - , key_fingerprint_(key_fingerprint_) { + encryptedChat(int32 id, int64 access_hash, int32 date, int64 admin_id, int64 participant_id, BufferSlice &&g_a_or_b, + int64 key_fingerprint) + : id_(id) + , access_hash_(access_hash) + , date_(date) + , admin_id_(admin_id) + , participant_id_(participant_id) + , g_a_or_b_(std::move(g_a_or_b)) + , key_fingerprint_(key_fingerprint) { } static const int32 ID = -94974410; @@ -308,7 +308,7 @@ class messages_sentEncryptedMessage final { messages_sentEncryptedMessage() = default; - explicit messages_sentEncryptedMessage(int32 date_) : date_(date_) { + explicit messages_sentEncryptedMessage(int32 date) : date_(date_) { } static const int32 ID = 1443858741;