From 07c76a9ad6c7956e073e50236c0a21ae94180aa1 Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 5 Aug 2022 16:48:49 +0200 Subject: [PATCH] renamed lsh/rhs to left/right --- include/orm/tiny/tinytypes.hpp | 5 +++-- src/orm/tiny/tinytypes.cpp | 8 ++++---- .../model_conn_indep/tst_model_connection_independent.cpp | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/orm/tiny/tinytypes.hpp b/include/orm/tiny/tinytypes.hpp index 567b8c3d4..577f921ea 100644 --- a/include/orm/tiny/tinytypes.hpp +++ b/include/orm/tiny/tinytypes.hpp @@ -50,7 +50,8 @@ namespace Relations }; /*! Comparison operator for the AttributeItem. */ - SHAREDLIB_EXPORT bool operator==(const AttributeItem &lhs, const AttributeItem &rhs); + SHAREDLIB_EXPORT bool + operator==(const AttributeItem &left, const AttributeItem &right); /*! Eager load relation item. */ struct WithItem @@ -61,7 +62,7 @@ namespace Relations /*! Comparison operator for the WithItem. */ [[maybe_unused]] - SHAREDLIB_EXPORT bool operator==(const WithItem &lhs, const WithItem &rhs); + SHAREDLIB_EXPORT bool operator==(const WithItem &left, const WithItem &right); /*! Tag for Model::getRelation() family methods to return Related type directly ( not container type ). */ diff --git a/src/orm/tiny/tinytypes.cpp b/src/orm/tiny/tinytypes.cpp index 5a2abaad3..2c49717d6 100644 --- a/src/orm/tiny/tinytypes.cpp +++ b/src/orm/tiny/tinytypes.cpp @@ -10,14 +10,14 @@ AttributeItem::operator UpdateItem() const return {key, value}; } -bool operator==(const AttributeItem &lhs, const AttributeItem &rhs) +bool operator==(const AttributeItem &left, const AttributeItem &right) { - return lhs.key == rhs.key && lhs.value == rhs.value; + return left.key == right.key && left.value == right.value; } -bool operator==(const WithItem &lhs, const WithItem &rhs) +bool operator==(const WithItem &left, const WithItem &right) { - return lhs.name == rhs.name; + return left.name == right.name; } } // namespace Orm::Tiny diff --git a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp index 31b20fb12..bbfac0639 100644 --- a/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp +++ b/tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp @@ -927,9 +927,9 @@ namespace QString name; /*! Comparison operator for the IdAndName. */ - inline bool operator==(const IdAndName &other) const noexcept + inline bool operator==(const IdAndName &right) const noexcept { - return id == other.id && name == other.name; + return id == right.id && name == right.name; } }; } // namespace