diff --git a/deprecated/qtsegmentcontrol.cpp b/deprecated/qtsegmentcontrol.cpp index 128d39f18..fd9f74b45 100644 --- a/deprecated/qtsegmentcontrol.cpp +++ b/deprecated/qtsegmentcontrol.cpp @@ -49,16 +49,6 @@ public: : position(OnlyOneSegment), selectedPosition(NotAdjacent) { } QtStyleOptionSegmentControlSegment(const QtStyleOptionSegmentControlSegment &other) : QStyleOption(Version, Type) { *this = other; } - QtStyleOptionSegmentControlSegment& operator=(const QtStyleOptionSegmentControlSegment &other) - { - QStyleOption::operator=(other); - text = other.text; - icon = other.icon; - iconSize = other.iconSize; - position = other.position; - selectedPosition = other.selectedPosition; - return *this; - } protected: QtStyleOptionSegmentControlSegment(int version); diff --git a/src/Core/Measures.h b/src/Core/Measures.h index 27d5d4826..a853072b4 100644 --- a/src/Core/Measures.h +++ b/src/Core/Measures.h @@ -41,15 +41,11 @@ public: for (int i = 0; iwhen = other.when; this->comment = other.comment; this->source = other.source; this->originalSource = other.originalSource; for (int i = 0; ivalues[i] = other.values[i]; - return *this; } ~Measure() {} diff --git a/src/FileIO/LocationInterpolation.h b/src/FileIO/LocationInterpolation.h index bef8a9691..4dc7dc2e2 100644 --- a/src/FileIO/LocationInterpolation.h +++ b/src/FileIO/LocationInterpolation.h @@ -41,7 +41,6 @@ public: v3(double a, double b, double c) : m_t(a, b, c) {}; v3(const v3& o) : m_t(o.m_t) {} - v3& operator=(const v3& o) { m_t = o.m_t; return *this; } double x() const { return std::get<0>(m_t); } double y() const { return std::get<1>(m_t); } diff --git a/src/FileIO/RideFile.h b/src/FileIO/RideFile.h index c368f0225..bf803e991 100644 --- a/src/FileIO/RideFile.h +++ b/src/FileIO/RideFile.h @@ -572,17 +572,13 @@ public: string[i]=""; } } - XDataPoint(const XDataPoint &other) { - *this = other; - } - XDataPoint& operator=(const XDataPoint &other) { + XDataPoint (const XDataPoint &other) { this->secs=other.secs; this->km=other.km; for(int i=0; inumber[i]= other.number[i]; this->string[i]= other.string[i]; } - return *this; } double secs, km; @@ -593,8 +589,7 @@ public: class XDataSeries { public: XDataSeries() {} - XDataSeries(const XDataSeries& other) { *this = other; } - XDataSeries& operator=(const XDataSeries &other) { + XDataSeries(XDataSeries &other) { name = other.name; valuename = other.valuename; unitname = other.unitname; @@ -604,7 +599,6 @@ public: foreach (XDataPoint *p, other.datapoints) { datapoints.push_back(new XDataPoint(*p)); } - return *this; } ~XDataSeries() { foreach(XDataPoint *p, datapoints) delete p; }