diff options
author | 2018-12-05 12:13:34 -0800 | |
---|---|---|
committer | 2018-12-05 12:13:34 -0800 | |
commit | 91f568305a97a6d5b6f54cc0d091a29c76a8348d (patch) | |
tree | 413fca78f40c156fab067536b0760fb62919be3a | |
parent | 49a945a212ff6ecda29030ceb3aa614e52812cd2 (diff) |
Fix -Wshadow-field warnings.
Test: build
Change-Id: I15c7a530ab7c4ba038c49b7ba48dcf76422a2b5f
-rw-r--r-- | libs/ui/Rect.cpp | 10 | ||||
-rw-r--r-- | libs/ui/include/ui/Rect.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/ui/Rect.cpp b/libs/ui/Rect.cpp index 045db31087..13fed3a239 100644 --- a/libs/ui/Rect.cpp +++ b/libs/ui/Rect.cpp @@ -72,11 +72,11 @@ Rect& Rect::offsetBy(int32_t x, int32_t y) { return *this; } -Rect& Rect::inset(int32_t left, int32_t top, int32_t right, int32_t bottom) { - this->left += left; - this->top += top; - this->right -= right; - this->bottom -= bottom; +Rect& Rect::inset(int32_t _left, int32_t _top, int32_t _right, int32_t _bottom) { + this->left += _left; + this->top += _top; + this->right -= _right; + this->bottom -= _bottom; return *this; } diff --git a/libs/ui/include/ui/Rect.h b/libs/ui/include/ui/Rect.h index 9edb510ee9..e9da087347 100644 --- a/libs/ui/include/ui/Rect.h +++ b/libs/ui/include/ui/Rect.h @@ -178,7 +178,7 @@ public: /** * Insets the rectangle on all sides specified by the insets. */ - Rect& inset(int32_t left, int32_t top, int32_t right, int32_t bottom); + Rect& inset(int32_t _left, int32_t _top, int32_t _right, int32_t _bottom); bool intersect(const Rect& with, Rect* result) const; |