From 9a5d2ffade725241564de22a849ca726a4689950 Mon Sep 17 00:00:00 2001 From: David Miguel Susano Pinto Date: Thu, 4 Jan 2024 00:19:35 +0000 Subject: [PATCH] Correct names of variables in wxPoint and wxRealPoint arithmetic operators. The arithmetic operators for wxPoint and wxRealPoint are quite repetitive and were made by copy-paste from the wxSize operators. Because of that, some of the names are a bit misleading which this commit changes. The changes are: 1. replace s/sz with p/pt for point variables (likely 's' comes from copied code used for wxSize variables) 2. replace 'i' with 'f' for floating point types (likely 'i' comes from copied code used for integer types) 3. replace 'factor' with 'divisor' for division operations (factors are the multiplication operands, not division) --- include/wx/gdicmn.h | 112 +++++++++++++++++++++--------------------- interface/wx/gdicmn.h | 14 +++--- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index ae0287ac8d..5467575e2c 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -494,74 +494,74 @@ inline wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2) } -inline wxRealPoint operator/(const wxRealPoint& s, int i) +inline wxRealPoint operator/(const wxRealPoint& p, int i) { - return wxRealPoint(s.x / i, s.y / i); + return wxRealPoint(p.x / i, p.y / i); } -inline wxRealPoint operator*(const wxRealPoint& s, int i) +inline wxRealPoint operator*(const wxRealPoint& p, int i) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator*(int i, const wxRealPoint& s) +inline wxRealPoint operator*(int i, const wxRealPoint& p) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator/(const wxRealPoint& s, unsigned int i) +inline wxRealPoint operator/(const wxRealPoint& p, unsigned int i) { - return wxRealPoint(s.x / i, s.y / i); + return wxRealPoint(p.x / i, p.y / i); } -inline wxRealPoint operator*(const wxRealPoint& s, unsigned int i) +inline wxRealPoint operator*(const wxRealPoint& p, unsigned int i) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator*(unsigned int i, const wxRealPoint& s) +inline wxRealPoint operator*(unsigned int i, const wxRealPoint& p) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator/(const wxRealPoint& s, long i) +inline wxRealPoint operator/(const wxRealPoint& p, long i) { - return wxRealPoint(s.x / i, s.y / i); + return wxRealPoint(p.x / i, p.y / i); } -inline wxRealPoint operator*(const wxRealPoint& s, long i) +inline wxRealPoint operator*(const wxRealPoint& p, long i) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator*(long i, const wxRealPoint& s) +inline wxRealPoint operator*(long i, const wxRealPoint& p) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator/(const wxRealPoint& s, unsigned long i) +inline wxRealPoint operator/(const wxRealPoint& p, unsigned long i) { - return wxRealPoint(s.x / i, s.y / i); + return wxRealPoint(p.x / i, p.y / i); } -inline wxRealPoint operator*(const wxRealPoint& s, unsigned long i) +inline wxRealPoint operator*(const wxRealPoint& p, unsigned long i) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator*(unsigned long i, const wxRealPoint& s) +inline wxRealPoint operator*(unsigned long i, const wxRealPoint& p) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * i, p.y * i); } -inline wxRealPoint operator*(const wxRealPoint& s, double i) +inline wxRealPoint operator*(const wxRealPoint& p, double f) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * f, p.y * f); } -inline wxRealPoint operator*(double i, const wxRealPoint& s) +inline wxRealPoint operator*(double f, const wxRealPoint& p) { - return wxRealPoint(s.x * i, s.y * i); + return wxRealPoint(p.x * f, p.y * f); } inline wxRealPoint operator/(const wxRealPoint& p, double f) @@ -654,74 +654,74 @@ inline wxPoint operator-(const wxPoint& p) return wxPoint(-p.x, -p.y); } -inline wxPoint operator/(const wxPoint& s, int i) +inline wxPoint operator/(const wxPoint& p, int i) { - return wxPoint(s.x / i, s.y / i); + return wxPoint(p.x / i, p.y / i); } -inline wxPoint operator*(const wxPoint& s, int i) +inline wxPoint operator*(const wxPoint& p, int i) { - return wxPoint(s.x * i, s.y * i); + return wxPoint(p.x * i, p.y * i); } -inline wxPoint operator*(int i, const wxPoint& s) +inline wxPoint operator*(int i, const wxPoint& p) { - return wxPoint(s.x * i, s.y * i); + return wxPoint(p.x * i, p.y * i); } -inline wxPoint operator/(const wxPoint& s, unsigned int i) +inline wxPoint operator/(const wxPoint& p, unsigned int i) { - return wxPoint(s.x / i, s.y / i); + return wxPoint(p.x / i, p.y / i); } -inline wxPoint operator*(const wxPoint& s, unsigned int i) +inline wxPoint operator*(const wxPoint& p, unsigned int i) { - return wxPoint(s.x * i, s.y * i); + return wxPoint(p.x * i, p.y * i); } -inline wxPoint operator*(unsigned int i, const wxPoint& s) +inline wxPoint operator*(unsigned int i, const wxPoint& p) { - return wxPoint(s.x * i, s.y * i); + return wxPoint(p.x * i, p.y * i); } -inline wxPoint operator/(const wxPoint& s, long i) +inline wxPoint operator/(const wxPoint& p, long i) { - return wxPoint(s.x / i, s.y / i); + return wxPoint(p.x / i, p.y / i); } -inline wxPoint operator*(const wxPoint& s, long i) +inline wxPoint operator*(const wxPoint& p, long i) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * i), int(p.y * i)); } -inline wxPoint operator*(long i, const wxPoint& s) +inline wxPoint operator*(long i, const wxPoint& p) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * i), int(p.y * i)); } -inline wxPoint operator/(const wxPoint& s, unsigned long i) +inline wxPoint operator/(const wxPoint& p, unsigned long i) { - return wxPoint(s.x / i, s.y / i); + return wxPoint(p.x / i, p.y / i); } -inline wxPoint operator*(const wxPoint& s, unsigned long i) +inline wxPoint operator*(const wxPoint& p, unsigned long i) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * i), int(p.y * i)); } -inline wxPoint operator*(unsigned long i, const wxPoint& s) +inline wxPoint operator*(unsigned long i, const wxPoint& p) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * i), int(p.y * i)); } -inline wxPoint operator*(const wxPoint& s, double i) +inline wxPoint operator*(const wxPoint& p, double f) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * f), int(p.y * f)); } -inline wxPoint operator*(double i, const wxPoint& s) +inline wxPoint operator*(double f, const wxPoint& p) { - return wxPoint(int(s.x * i), int(s.y * i)); + return wxPoint(int(p.x * f), int(p.y * f)); } inline wxPoint operator/(const wxPoint& p, double f) diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index 53fcc348dc..9305d54a31 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -227,13 +227,13 @@ public: wxRealPoint& operator +=(const wxSize& sz); wxRealPoint& operator -=(const wxSize& sz); - wxRealPoint operator /(const wxRealPoint& sz, int factor); + wxRealPoint operator /(const wxRealPoint& sz, int divisor); wxRealPoint operator *(const wxRealPoint& sz, int factor); - wxRealPoint operator *(int factor, const wxRealPoint& sz); - wxRealPoint& operator /=(int factor); + wxRealPoint operator *(int factor, const wxRealPoint& pt); + wxRealPoint& operator /=(int divisor); wxRealPoint& operator *=(int factor); - wxRealPoint operator /(const wxRealPoint& pt, double factor); + wxRealPoint operator /(const wxRealPoint& pt, double divisor); ///@} /** @@ -733,13 +733,13 @@ public: wxPoint& operator +=(const wxSize& sz); wxPoint& operator -=(const wxSize& sz); - wxPoint operator /(const wxPoint& sz, int factor); + wxPoint operator /(const wxPoint& sz, int divisor); wxPoint operator *(const wxPoint& sz, int factor); wxPoint operator *(int factor, const wxPoint& sz); - wxPoint& operator /=(int factor); + wxPoint& operator /=(int divisor); wxPoint& operator *=(int factor); - wxPoint operator /(const wxPoint& pt, double factor); + wxPoint operator /(const wxPoint& pt, double divisor); ///@}