From 141515b5db92fa71b48162cb91c7f1c05cc2c93c Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Sat, 30 Jul 2011 20:38:42 +0200 Subject: [PATCH] [Positioning] operator=() return non-const reference Change the return type of all operator=() from const reference to non-const reference. --- owlps-positioning/src/accesspoint.cc | 2 +- owlps-positioning/src/accesspoint.hh | 2 +- owlps-positioning/src/area.cc | 2 +- owlps-positioning/src/area.hh | 2 +- owlps-positioning/src/building.cc | 2 +- owlps-positioning/src/building.hh | 2 +- owlps-positioning/src/calibrationrequest.cc | 7 ++++--- owlps-positioning/src/calibrationrequest.hh | 2 +- owlps-positioning/src/direction.cc | 4 ++-- owlps-positioning/src/direction.hh | 4 ++-- owlps-positioning/src/measurement.cc | 2 +- owlps-positioning/src/measurement.hh | 2 +- owlps-positioning/src/mobile.cc | 2 +- owlps-positioning/src/mobile.hh | 2 +- owlps-positioning/src/point3d.cc | 2 +- owlps-positioning/src/point3d.hh | 2 +- owlps-positioning/src/referencepoint.cc | 3 +-- owlps-positioning/src/referencepoint.hh | 2 +- owlps-positioning/src/request.cc | 2 +- owlps-positioning/src/request.hh | 2 +- owlps-positioning/src/result.cc | 2 +- owlps-positioning/src/result.hh | 2 +- owlps-positioning/src/resultlist.cc | 2 +- owlps-positioning/src/resultlist.hh | 2 +- owlps-positioning/src/timestamp.cc | 2 +- owlps-positioning/src/timestamp.hh | 11 +++++------ owlps-positioning/src/waypoint.cc | 2 +- owlps-positioning/src/waypoint.hh | 2 +- owlps-positioning/src/wifidevice.cc | 2 +- owlps-positioning/src/wifidevice.hh | 2 +- 30 files changed, 39 insertions(+), 40 deletions(-) diff --git a/owlps-positioning/src/accesspoint.cc b/owlps-positioning/src/accesspoint.cc index 364bcab..025f8a3 100644 --- a/owlps-positioning/src/accesspoint.cc +++ b/owlps-positioning/src/accesspoint.cc @@ -8,7 +8,7 @@ using namespace std ; /* *** Operators *** */ -const AccessPoint& AccessPoint::operator=(const AccessPoint &source) +AccessPoint& AccessPoint::operator=(const AccessPoint &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/accesspoint.hh b/owlps-positioning/src/accesspoint.hh index 5919766..7c3ab70 100644 --- a/owlps-positioning/src/accesspoint.hh +++ b/owlps-positioning/src/accesspoint.hh @@ -69,7 +69,7 @@ public: /** @name Operators */ //@{ - const AccessPoint& operator=(const AccessPoint &source) ; + AccessPoint& operator=(const AccessPoint &source) ; bool operator==(const AccessPoint &source) const ; bool operator!=(const AccessPoint &source) const ; //@} diff --git a/owlps-positioning/src/area.cc b/owlps-positioning/src/area.cc index ce02aa7..05eb191 100644 --- a/owlps-positioning/src/area.cc +++ b/owlps-positioning/src/area.cc @@ -119,7 +119,7 @@ void Area::reorder_coordinates() /* *** Operators *** */ -const Area& Area::operator=(const Area &source) +Area& Area::operator=(const Area &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/area.hh b/owlps-positioning/src/area.hh index 2f15513..8e96d64 100644 --- a/owlps-positioning/src/area.hh +++ b/owlps-positioning/src/area.hh @@ -55,7 +55,7 @@ public: /** @name Operators */ //@{ - const Area& operator=(const Area &source) ; + Area& operator=(const Area &source) ; bool operator==(const Area &source) const ; bool operator!=(const Area &source) const ; //@} diff --git a/owlps-positioning/src/building.cc b/owlps-positioning/src/building.cc index d2b8ec9..5ddcca9 100644 --- a/owlps-positioning/src/building.cc +++ b/owlps-positioning/src/building.cc @@ -73,7 +73,7 @@ void Building::add_area(Area *&area) /* *** Operators *** */ -const Building& Building::operator=(const Building &source) +Building& Building::operator=(const Building &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/building.hh b/owlps-positioning/src/building.hh index 63acd16..3c8dbee 100644 --- a/owlps-positioning/src/building.hh +++ b/owlps-positioning/src/building.hh @@ -48,7 +48,7 @@ public : /** @name Operators */ //@{ - const Building& operator=(const Building &source) ; + Building& operator=(const Building &source) ; bool operator==(const Building &source) const ; bool operator!=(const Building &source) const ; //@} diff --git a/owlps-positioning/src/calibrationrequest.cc b/owlps-positioning/src/calibrationrequest.cc index 0a37080..ba7841e 100644 --- a/owlps-positioning/src/calibrationrequest.cc +++ b/owlps-positioning/src/calibrationrequest.cc @@ -54,8 +54,8 @@ void CalibrationRequest::clear() /* *** Operators *** */ -const CalibrationRequest& -CalibrationRequest::operator=(const CalibrationRequest &source) +CalibrationRequest& CalibrationRequest:: +operator=(const CalibrationRequest &source) { if (this == &source) return *this ; @@ -68,7 +68,8 @@ CalibrationRequest::operator=(const CalibrationRequest &source) } -bool CalibrationRequest::operator==(const CalibrationRequest &source) const +bool CalibrationRequest:: +operator==(const CalibrationRequest &source) const { if (this == &source) return true ; diff --git a/owlps-positioning/src/calibrationrequest.hh b/owlps-positioning/src/calibrationrequest.hh index 0f0147f..a8bfd34 100644 --- a/owlps-positioning/src/calibrationrequest.hh +++ b/owlps-positioning/src/calibrationrequest.hh @@ -48,7 +48,7 @@ public: /** @name Operators */ //@{ - const CalibrationRequest& operator=(const CalibrationRequest &source) ; + CalibrationRequest& operator=(const CalibrationRequest &source) ; bool operator==(const CalibrationRequest &source) const ; bool operator!=(const CalibrationRequest &source) const ; //@} diff --git a/owlps-positioning/src/direction.cc b/owlps-positioning/src/direction.cc index 8d4da53..7c1915f 100644 --- a/owlps-positioning/src/direction.cc +++ b/owlps-positioning/src/direction.cc @@ -36,14 +36,14 @@ inline bool Direction::is_valid() const /* *** Operators *** */ -const Direction& Direction::operator=(const Direction &source) +Direction& Direction::operator=(const Direction &source) { direction = source.direction ; return *this ; } -const Direction& Direction::operator=(const char source) +Direction& Direction::operator=(const char source) { direction = source ; assert_valid() ; diff --git a/owlps-positioning/src/direction.hh b/owlps-positioning/src/direction.hh index 0cecb17..e9e9e80 100644 --- a/owlps-positioning/src/direction.hh +++ b/owlps-positioning/src/direction.hh @@ -27,8 +27,8 @@ public: /** @name Operators */ //@{ - const Direction& operator=(const Direction &source) ; - const Direction& operator=(const char source) ; + Direction& operator=(const Direction &source) ; + Direction& operator=(const char source) ; bool operator==(const Direction &source) const ; bool operator!=(const Direction &source) const ; operator bool(void) const ; diff --git a/owlps-positioning/src/measurement.cc b/owlps-positioning/src/measurement.cc index 75e912e..73a4354 100644 --- a/owlps-positioning/src/measurement.cc +++ b/owlps-positioning/src/measurement.cc @@ -124,7 +124,7 @@ void Measurement::update_average_ss() /* *** Operators *** */ -const Measurement& Measurement::operator=(const Measurement &m) +Measurement& Measurement::operator=(const Measurement &m) { if (this == &m) return *this ; diff --git a/owlps-positioning/src/measurement.hh b/owlps-positioning/src/measurement.hh index 3b28d5b..9f2b82d 100644 --- a/owlps-positioning/src/measurement.hh +++ b/owlps-positioning/src/measurement.hh @@ -68,7 +68,7 @@ public: /** @name Operators */ //@{ - const Measurement& operator=(const Measurement &m) ; + Measurement& operator=(const Measurement &m) ; bool operator==(const Measurement &m) const ; bool operator!=(const Measurement &m) const ; operator bool(void) const ; diff --git a/owlps-positioning/src/mobile.cc b/owlps-positioning/src/mobile.cc index 075f11f..3f4e235 100644 --- a/owlps-positioning/src/mobile.cc +++ b/owlps-positioning/src/mobile.cc @@ -5,7 +5,7 @@ /* *** Operators *** */ -const Mobile& Mobile::operator=(const Mobile &m) +Mobile& Mobile::operator=(const Mobile &m) { if (this == &m) return *this ; diff --git a/owlps-positioning/src/mobile.hh b/owlps-positioning/src/mobile.hh index b235a4d..11f8f8a 100644 --- a/owlps-positioning/src/mobile.hh +++ b/owlps-positioning/src/mobile.hh @@ -28,7 +28,7 @@ public: /** @name Operators */ //@{ - const Mobile& operator=(const Mobile &m) ; + Mobile& operator=(const Mobile &m) ; bool operator==(const Mobile &m) const ; bool operator!=(const Mobile &m) const ; //@} diff --git a/owlps-positioning/src/point3d.cc b/owlps-positioning/src/point3d.cc index 10c7652..045725d 100644 --- a/owlps-positioning/src/point3d.cc +++ b/owlps-positioning/src/point3d.cc @@ -93,7 +93,7 @@ double Point3D::angle(const Point3D &b, const Point3D &c) const /* *** Operators *** */ -const Point3D& Point3D::operator=(const Point3D &source) +Point3D& Point3D::operator=(const Point3D &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/point3d.hh b/owlps-positioning/src/point3d.hh index 54c536d..45ba518 100644 --- a/owlps-positioning/src/point3d.hh +++ b/owlps-positioning/src/point3d.hh @@ -67,7 +67,7 @@ public: /** @name Operators */ //@{ - const Point3D& operator=(const Point3D &source) ; + Point3D& operator=(const Point3D &source) ; bool operator==(const Point3D &source) const ; bool operator!=(const Point3D &source) const ; bool operator<(const Point3D &source) const ; diff --git a/owlps-positioning/src/referencepoint.cc b/owlps-positioning/src/referencepoint.cc index 37abd58..5805e37 100644 --- a/owlps-positioning/src/referencepoint.cc +++ b/owlps-positioning/src/referencepoint.cc @@ -272,8 +272,7 @@ float ReferencePoint::friis_indexes_for_ap( /* *** Operators *** */ -const ReferencePoint& ReferencePoint:: -operator=(const ReferencePoint &source) +ReferencePoint& ReferencePoint::operator=(const ReferencePoint &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/referencepoint.hh b/owlps-positioning/src/referencepoint.hh index 71ee8dd..d0546be 100644 --- a/owlps-positioning/src/referencepoint.hh +++ b/owlps-positioning/src/referencepoint.hh @@ -75,7 +75,7 @@ public: /** @name Operators */ //@{ - const ReferencePoint& operator=(const ReferencePoint &source) ; + ReferencePoint& operator=(const ReferencePoint &source) ; bool operator==(const ReferencePoint &source) const ; bool operator!=(const ReferencePoint &source) const ; //@} diff --git a/owlps-positioning/src/request.cc b/owlps-positioning/src/request.cc index ccffeb0..6b2be2c 100644 --- a/owlps-positioning/src/request.cc +++ b/owlps-positioning/src/request.cc @@ -79,7 +79,7 @@ float Request::ss_square_distance(const Request &source) const /* *** Operators *** */ -const Request& Request::operator=(const Request &source) +Request& Request::operator=(const Request &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/request.hh b/owlps-positioning/src/request.hh index ac04aef..f834081 100644 --- a/owlps-positioning/src/request.hh +++ b/owlps-positioning/src/request.hh @@ -94,7 +94,7 @@ public: /** @name Operators */ //@{ - const Request& operator=(const Request &source) ; + Request& operator=(const Request &source) ; bool operator==(const Request &comp) const ; bool operator!=(const Request &comp) const ; operator bool(void) const ; diff --git a/owlps-positioning/src/result.cc b/owlps-positioning/src/result.cc index 1ece518..1837919 100644 --- a/owlps-positioning/src/result.cc +++ b/owlps-positioning/src/result.cc @@ -50,7 +50,7 @@ void Result::compute_error(const Point3D &real_position) /* *** Operators *** */ -const Result& Result::operator=(const Result &source) +Result& Result::operator=(const Result &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/result.hh b/owlps-positioning/src/result.hh index 108b660..fd724ea 100644 --- a/owlps-positioning/src/result.hh +++ b/owlps-positioning/src/result.hh @@ -49,7 +49,7 @@ public: /** @name Operators */ //@{ - const Result& operator=(const Result &source) ; + Result& operator=(const Result &source) ; bool operator==(const Result &source) const ; bool operator!=(const Result &source) const ; //@} diff --git a/owlps-positioning/src/resultlist.cc b/owlps-positioning/src/resultlist.cc index c530c66..836d300 100644 --- a/owlps-positioning/src/resultlist.cc +++ b/owlps-positioning/src/resultlist.cc @@ -21,7 +21,7 @@ ResultList::~ResultList() /* *** Operators *** */ -const ResultList& ResultList::operator=(const ResultList &source) +ResultList& ResultList::operator=(const ResultList &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/resultlist.hh b/owlps-positioning/src/resultlist.hh index ee20901..6a03e80 100644 --- a/owlps-positioning/src/resultlist.hh +++ b/owlps-positioning/src/resultlist.hh @@ -38,7 +38,7 @@ public: /** @name Operators */ //@{ - const ResultList& operator=(const ResultList &source) ; + ResultList& operator=(const ResultList &source) ; bool operator==(const ResultList &source) const ; bool operator!=(const ResultList &source) const ; //@} diff --git a/owlps-positioning/src/timestamp.cc b/owlps-positioning/src/timestamp.cc index 498f91e..d826d38 100644 --- a/owlps-positioning/src/timestamp.cc +++ b/owlps-positioning/src/timestamp.cc @@ -144,7 +144,7 @@ bool Timestamp::greater_than(const struct timespec &source) const /* *** Operators *** */ -const Timestamp& Timestamp::operator=(const Timestamp &source) +Timestamp& Timestamp::operator=(const Timestamp &source) { if (this == &source) return *this ; diff --git a/owlps-positioning/src/timestamp.hh b/owlps-positioning/src/timestamp.hh index b64b031..dcbd23a 100644 --- a/owlps-positioning/src/timestamp.hh +++ b/owlps-positioning/src/timestamp.hh @@ -62,9 +62,9 @@ public: /** @name Operators */ //@{ - const Timestamp& operator=(const Timestamp &source) ; - const Timestamp& operator=(const struct timespec &source) ; - const Timestamp& operator=(const uint64_t source) ; //< deprecated + Timestamp& operator=(const Timestamp &source) ; + Timestamp& operator=(const struct timespec &source) ; + Timestamp& operator=(const uint64_t source) ; //< deprecated bool operator==(const Timestamp &source) const ; bool operator==(const struct timespec &source) const ; bool operator==(const uint64_t source) const ; //< deprecated @@ -109,15 +109,14 @@ inline void Timestamp::clear(void) /* *** Operators *** */ -inline const Timestamp& Timestamp:: -operator=(const struct timespec &source) +inline Timestamp& Timestamp::operator=(const struct timespec &source) { set(source) ; return *this ; } -inline const Timestamp& Timestamp::operator=(const uint64_t source) +inline Timestamp& Timestamp::operator=(const uint64_t source) { set(source) ; return *this ; diff --git a/owlps-positioning/src/waypoint.cc b/owlps-positioning/src/waypoint.cc index 506c86c..0b723d8 100644 --- a/owlps-positioning/src/waypoint.cc +++ b/owlps-positioning/src/waypoint.cc @@ -53,7 +53,7 @@ Waypoint::~Waypoint() /* *** Operators *** */ -const Waypoint& Waypoint::operator=(const Waypoint &wp) +Waypoint& Waypoint::operator=(const Waypoint &wp) { if (this == &wp) return *this ; diff --git a/owlps-positioning/src/waypoint.hh b/owlps-positioning/src/waypoint.hh index 7ea0a61..ac294ec 100644 --- a/owlps-positioning/src/waypoint.hh +++ b/owlps-positioning/src/waypoint.hh @@ -53,7 +53,7 @@ public: /** @name Operators */ //@{ - const Waypoint& operator=(const Waypoint &wp) ; + Waypoint& operator=(const Waypoint &wp) ; bool operator==(const Waypoint &wp) const ; bool operator!=(const Waypoint &wp) const ; operator std::string(void) const ; diff --git a/owlps-positioning/src/wifidevice.cc b/owlps-positioning/src/wifidevice.cc index 1b0ffd6..aff2b7c 100644 --- a/owlps-positioning/src/wifidevice.cc +++ b/owlps-positioning/src/wifidevice.cc @@ -7,7 +7,7 @@ using namespace std ; /* *** Operators *** */ -const WifiDevice& WifiDevice::operator=(const WifiDevice &wd) +WifiDevice& WifiDevice::operator=(const WifiDevice &wd) { if (this == &wd) return *this ; diff --git a/owlps-positioning/src/wifidevice.hh b/owlps-positioning/src/wifidevice.hh index 6777fb5..fc11b3a 100644 --- a/owlps-positioning/src/wifidevice.hh +++ b/owlps-positioning/src/wifidevice.hh @@ -52,7 +52,7 @@ public: /** @name Operators */ //@{ - const WifiDevice& operator=(const WifiDevice &wd) ; + WifiDevice& operator=(const WifiDevice &wd) ; bool operator==(const WifiDevice &wd) const ; bool operator!=(const WifiDevice &wl) const ; //@}