diff options
Diffstat (limited to 'sources/shiboken6/tests/libsample/point.cpp')
-rw-r--r-- | sources/shiboken6/tests/libsample/point.cpp | 79 |
1 files changed, 30 insertions, 49 deletions
diff --git a/sources/shiboken6/tests/libsample/point.cpp b/sources/shiboken6/tests/libsample/point.cpp index 397dea3e6..b8630eb1e 100644 --- a/sources/shiboken6/tests/libsample/point.cpp +++ b/sources/shiboken6/tests/libsample/point.cpp @@ -1,21 +1,19 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include <iostream> #include "point.h" -using namespace std; +#include <iostream> -Point::Point(int x, int y) : m_x(x), m_y(y) +Point::Point(int x, int y) noexcept : m_x(x), m_y(y) { } -Point::Point(double x, double y) : m_x(x), m_y(y) +Point::Point(double x, double y) noexcept : m_x(x), m_y(y) { } -void -Point::midpoint(const Point& other, Point* midpoint) const +void Point::midpoint(const Point &other, Point *midpoint) const { if (!midpoint) return; @@ -23,108 +21,91 @@ Point::midpoint(const Point& other, Point* midpoint) const midpoint->setY((m_y + other.m_y) / 2.0); } -Point* -Point::copy() const +Point *Point::copy() const { - Point* pt = new Point(); + Point *pt = new Point(); pt->m_x = m_x; pt->m_y = m_y; return pt; } -void -Point::show() +void Point::show() const { - cout << "(x: " << m_x << ", y: " << m_y << ")"; + std::cout << "(x: " << m_x << ", y: " << m_y << ")"; } -bool -Point::operator==(const Point& other) +bool Point::operator==(const Point &other) { return m_x == other.m_x && m_y == other.m_y; } -Point -Point::operator+(const Point& other) +Point Point::operator+(const Point &other) { - return Point(m_x + other.m_x, m_y + other.m_y); + return {m_x + other.m_x, m_y + other.m_y}; } -Point -Point::operator-(const Point& other) +Point Point::operator-(const Point &other) { - return Point(m_x - other.m_x, m_y - other.m_y); + return {m_x - other.m_x, m_y - other.m_y}; } -Point& -Point::operator+=(Point &other) +Point &Point::operator+=(Point &other) { m_x += other.m_x; m_y += other.m_y; return *this; } -Point& -Point::operator-=(Point &other) +Point &Point::operator-=(Point &other) { m_x -= other.m_x; m_y -= other.m_y; return *this; } -Point -operator*(const Point& pt, double mult) +Point operator*(const Point &pt, double mult) { return Point(pt.m_x * mult, pt.m_y * mult); } -Point -operator*(const Point& pt, int mult) +Point operator*(const Point &pt, int mult) { - return Point(((int) pt.m_x) * mult, ((int) pt.m_y) * mult); + return {int(pt.m_x) * mult, int(pt.m_y) * mult}; } -Point -operator*(double mult, const Point& pt) +Point operator*(double mult, const Point &pt) { - return Point(pt.m_x * mult, pt.m_y * mult); + return {pt.m_x * mult, pt.m_y * mult}; } -Point -operator*(int mult, const Point& pt) +Point operator*(int mult, const Point &pt) { - return Point(((int) pt.m_x) * mult, ((int) pt.m_y) * mult); + return {int(pt.m_x) * mult, int(pt.m_y) * mult}; } -Point -operator-(const Point& pt) +Point operator-(const Point &pt) { - return Point(-pt.m_x, -pt.m_y); + return {-pt.m_x, -pt.m_y}; } -bool -operator!(const Point& pt) +bool operator!(const Point &pt) { - return (pt.m_x == 0.0 && pt.m_y == 0.0); + return pt.m_x == 0.0 && pt.m_y == 0.0; } -Point -Point::operator/(int operand) +Point Point::operator/(int operand) { - return Point(m_x/operand, m_y/operand); + return {m_x/operand, m_y/operand}; } -Complex -transmutePointIntoComplex(const Point& point) +Complex transmutePointIntoComplex(const Point &point) { Complex cpx(point.x(), point.y()); return cpx; } -Point -transmuteComplexIntoPoint(const Complex& cpx) +Point transmuteComplexIntoPoint(const Complex &cpx) { Point pt(cpx.real(), cpx.imag()); return pt; } - |