diff options
author | Lei Zhang <thestig@chromium.org> | 2015-06-13 00:31:30 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-06-13 00:31:30 -0700 |
commit | 4999f914be6c390bbc6d709c5b65d8955a827970 (patch) | |
tree | b98be7bda6310b5c4bd1c5de1018850b4a4a08aa /core/include/fxcrt | |
parent | 7dac05808121e6ac40a9911e71e6391c88432a62 (diff) | |
download | pdfium-4999f914be6c390bbc6d709c5b65d8955a827970.tar.xz |
Merge to XFA: Cleanup: Remove uses of "this->" in core/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1173223002.
(cherry picked from commit 2b5e0d5b20654d116045484868c9e015ed698124)
Review URL: https://codereview.chromium.org/1186673004.
Diffstat (limited to 'core/include/fxcrt')
-rw-r--r-- | core/include/fxcrt/fx_coordinates.h | 34 | ||||
-rw-r--r-- | core/include/fxcrt/fx_string.h | 4 |
2 files changed, 22 insertions, 16 deletions
diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h index c98ece9e07..779f1722b2 100644 --- a/core/include/fxcrt/fx_coordinates.h +++ b/core/include/fxcrt/fx_coordinates.h @@ -694,21 +694,24 @@ public: top += y; } - void Inflate(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top) + void Inflate(FX_FLOAT other_left, + FX_FLOAT other_bottom, + FX_FLOAT other_right, + FX_FLOAT other_top) { Normalize(); - this->left -= left; - this->bottom -= bottom; - this->right += right; - this->top += top; + left -= other_left; + bottom -= other_bottom; + right += other_right; + top += other_top; } - void Inflate(const CFX_FloatRect &rt) + void Inflate(const CFX_FloatRect &rt) { Inflate(rt.left, rt.bottom, rt.right, rt.top); } - void Deflate(FX_FLOAT x, FX_FLOAT y) + void Deflate(FX_FLOAT x, FX_FLOAT y) { Normalize(); left += x; @@ -717,21 +720,24 @@ public: top -= y; } - void Deflate(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top) + void Deflate(FX_FLOAT other_left, + FX_FLOAT other_bottom, + FX_FLOAT other_right, + FX_FLOAT other_top) { Normalize(); - this->left += left; - this->bottom += bottom; - this->right -= right; - this->top -= top; + left += other_left; + bottom += other_bottom; + right -= other_right; + top -= other_top; } - void Deflate(const CFX_FloatRect &rt) + void Deflate(const CFX_FloatRect &rt) { Deflate(rt.left, rt.bottom, rt.right, rt.top); } - void Translate(FX_FLOAT e, FX_FLOAT f) + void Translate(FX_FLOAT e, FX_FLOAT f) { left += e; right += e; diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 48e0e51879..8d73555814 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -184,7 +184,7 @@ public: // Move constructor. inline CFX_ByteString(CFX_ByteString&& other) { - this->m_pData = other.m_pData; + m_pData = other.m_pData; other.m_pData = nullptr; } @@ -630,7 +630,7 @@ public: // Move constructor. inline CFX_WideString(CFX_WideString&& other) { - this->m_pData = other.m_pData; + m_pData = other.m_pData; other.m_pData = nullptr; } |