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 4ce8b81937..f02cce994b 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;
     }