diff options
author | David Tardon <dtardon@redhat.com> | 2019-08-04 18:39:27 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2019-08-04 18:39:27 +0200 |
commit | 75360a312918780ed5e34a44e3b8b0da5716c5bc (patch) | |
tree | e003b2caba5697c4562108209085130c95867d3f | |
parent | 8480dedbe1a5fd27df4c0bfc0ecbb868ad081a8b (diff) |
un-constify return value of operator=
Change-Id: Ib72d1f92e6b080e5c2dd17cc57b2c7f48c917a77
-rw-r--r-- | src/lib/VSDParser.cpp | 2 | ||||
-rw-r--r-- | src/lib/VSDParser.h | 2 | ||||
-rw-r--r-- | src/lib/VSDStyles.cpp | 20 | ||||
-rw-r--r-- | src/lib/VSDStyles.h | 20 | ||||
-rw-r--r-- | src/lib/VSDTypes.cpp | 10 | ||||
-rw-r--r-- | src/lib/VSDTypes.h | 10 |
6 files changed, 32 insertions, 32 deletions
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp index 5ad8aa3..2305c79 100644 --- a/src/lib/VSDParser.cpp +++ b/src/lib/VSDParser.cpp @@ -26,7 +26,7 @@ namespace libvisio { -const Pointer &Pointer::operator=(const Pointer &ptr) +Pointer &Pointer::operator=(const Pointer &ptr) { if (this != &ptr) { diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h index e8fd64c..827ea6e 100644 --- a/src/lib/VSDParser.h +++ b/src/lib/VSDParser.h @@ -37,7 +37,7 @@ struct Pointer : Type(0), Offset(0), Length(0), Format(0), ListSize(0) {} Pointer(const Pointer &ptr) : Type(ptr.Type), Offset(ptr.Offset), Length(ptr.Length), Format(ptr.Format), ListSize(ptr.ListSize) {} - const Pointer &operator=(const Pointer &ptr); + Pointer &operator=(const Pointer &ptr); unsigned Type; unsigned Offset; unsigned Length; diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp index c04ea1a..88c0169 100644 --- a/src/lib/VSDStyles.cpp +++ b/src/lib/VSDStyles.cpp @@ -53,7 +53,7 @@ T getOptionalStyle(const std::map<unsigned, unsigned> &styleMasters, const std:: } -const VSDOptionalLineStyle &VSDOptionalLineStyle::operator=(const VSDOptionalLineStyle &style) +VSDOptionalLineStyle &VSDOptionalLineStyle::operator=(const VSDOptionalLineStyle &style) { if (this != &style) { @@ -70,7 +70,7 @@ const VSDOptionalLineStyle &VSDOptionalLineStyle::operator=(const VSDOptionalLin return *this; } -const VSDLineStyle &VSDLineStyle::operator=(const VSDLineStyle &style) +VSDLineStyle &VSDLineStyle::operator=(const VSDLineStyle &style) { if (this != &style) { @@ -87,7 +87,7 @@ const VSDLineStyle &VSDLineStyle::operator=(const VSDLineStyle &style) return *this; } -const VSDOptionalFillStyle &VSDOptionalFillStyle::operator=(const VSDOptionalFillStyle &style) +VSDOptionalFillStyle &VSDOptionalFillStyle::operator=(const VSDOptionalFillStyle &style) { if (this != &style) { @@ -107,7 +107,7 @@ const VSDOptionalFillStyle &VSDOptionalFillStyle::operator=(const VSDOptionalFil return *this; } -const VSDFillStyle &VSDFillStyle::operator=(const VSDFillStyle &style) +VSDFillStyle &VSDFillStyle::operator=(const VSDFillStyle &style) { if (this != &style) { @@ -127,7 +127,7 @@ const VSDFillStyle &VSDFillStyle::operator=(const VSDFillStyle &style) return *this; } -const VSDOptionalCharStyle &VSDOptionalCharStyle::operator=(const VSDOptionalCharStyle &style) +VSDOptionalCharStyle &VSDOptionalCharStyle::operator=(const VSDOptionalCharStyle &style) { if (this != &style) { @@ -151,7 +151,7 @@ const VSDOptionalCharStyle &VSDOptionalCharStyle::operator=(const VSDOptionalCha return *this; } -const VSDCharStyle &VSDCharStyle::operator=(const VSDCharStyle &style) +VSDCharStyle &VSDCharStyle::operator=(const VSDCharStyle &style) { if (this != &style) { @@ -175,7 +175,7 @@ const VSDCharStyle &VSDCharStyle::operator=(const VSDCharStyle &style) return *this; } -const VSDOptionalParaStyle &VSDOptionalParaStyle::operator=(const VSDOptionalParaStyle &style) +VSDOptionalParaStyle &VSDOptionalParaStyle::operator=(const VSDOptionalParaStyle &style) { if (this != &style) { @@ -197,7 +197,7 @@ const VSDOptionalParaStyle &VSDOptionalParaStyle::operator=(const VSDOptionalPar return *this; } -const VSDParaStyle &VSDParaStyle::operator=(const VSDParaStyle &style) +VSDParaStyle &VSDParaStyle::operator=(const VSDParaStyle &style) { if (this != &style) { @@ -219,7 +219,7 @@ const VSDParaStyle &VSDParaStyle::operator=(const VSDParaStyle &style) return *this; } -const VSDOptionalTextBlockStyle &VSDOptionalTextBlockStyle::operator=(const VSDOptionalTextBlockStyle &style) +VSDOptionalTextBlockStyle &VSDOptionalTextBlockStyle::operator=(const VSDOptionalTextBlockStyle &style) { if (this != &style) { @@ -236,7 +236,7 @@ const VSDOptionalTextBlockStyle &VSDOptionalTextBlockStyle::operator=(const VSDO return *this; } -const VSDTextBlockStyle &VSDTextBlockStyle::operator=(const VSDTextBlockStyle &style) +VSDTextBlockStyle &VSDTextBlockStyle::operator=(const VSDTextBlockStyle &style) { if (this != &style) { diff --git a/src/lib/VSDStyles.h b/src/lib/VSDStyles.h index dc229af..894bbd2 100644 --- a/src/lib/VSDStyles.h +++ b/src/lib/VSDStyles.h @@ -37,7 +37,7 @@ struct VSDOptionalLineStyle endMarker(style.endMarker), cap(style.cap), rounding(style.rounding), qsLineColour(style.qsLineColour), qsLineMatrix(style.qsLineMatrix) {} ~VSDOptionalLineStyle() {} - const VSDOptionalLineStyle &operator=(const VSDOptionalLineStyle &style); + VSDOptionalLineStyle &operator=(const VSDOptionalLineStyle &style); void override(const VSDOptionalLineStyle &style) { ASSIGN_OPTIONAL(style.width, width); @@ -77,7 +77,7 @@ struct VSDLineStyle rounding(style.rounding), qsLineColour(style.qsLineColour), qsLineMatrix(style.qsLineMatrix) {} ~VSDLineStyle() {} - const VSDLineStyle &operator=(const VSDLineStyle &style); + VSDLineStyle &operator=(const VSDLineStyle &style); void override(const VSDOptionalLineStyle &style, const VSDXTheme *theme) { ASSIGN_OPTIONAL(style.width, width); @@ -130,7 +130,7 @@ struct VSDOptionalFillStyle qsFillColour(style.qsFillColour), qsShadowColour(style.qsShadowColour), qsFillMatrix(style.qsFillMatrix) {} ~VSDOptionalFillStyle() {} - const VSDOptionalFillStyle &operator=(const VSDOptionalFillStyle &style); + VSDOptionalFillStyle &operator=(const VSDOptionalFillStyle &style); void override(const VSDOptionalFillStyle &style) { ASSIGN_OPTIONAL(style.pattern, pattern); @@ -181,7 +181,7 @@ struct VSDFillStyle qsFillColour(style.qsFillColour), qsShadowColour(style.qsShadowColour), qsFillMatrix(style.qsFillMatrix) {} ~VSDFillStyle() {} - const VSDFillStyle &operator=(const VSDFillStyle &style); + VSDFillStyle &operator=(const VSDFillStyle &style); void override(const VSDOptionalFillStyle &style, const VSDXTheme *theme) { ASSIGN_OPTIONAL(style.pattern, pattern); @@ -251,7 +251,7 @@ struct VSDOptionalCharStyle allcaps(style.allcaps), initcaps(style.initcaps), smallcaps(style.smallcaps), superscript(style.superscript), subscript(style.subscript), scaleWidth(style.scaleWidth) {} ~VSDOptionalCharStyle() {} - const VSDOptionalCharStyle &operator=(const VSDOptionalCharStyle &style); + VSDOptionalCharStyle &operator=(const VSDOptionalCharStyle &style); void override(const VSDOptionalCharStyle &style) { ASSIGN_OPTIONAL(style.font, font); @@ -313,7 +313,7 @@ struct VSDCharStyle smallcaps(style.smallcaps), superscript(style.superscript), subscript(style.subscript), scaleWidth(style.scaleWidth) {} ~VSDCharStyle() {} - const VSDCharStyle &operator=(const VSDCharStyle &style); + VSDCharStyle &operator=(const VSDCharStyle &style); void override(const VSDOptionalCharStyle &style, const VSDXTheme * /* theme */) { ASSIGN_OPTIONAL(style.font, font); @@ -373,7 +373,7 @@ struct VSDOptionalParaStyle bulletFontSize(style.bulletFontSize), textPosAfterBullet(style.textPosAfterBullet), flags(style.flags) {} ~VSDOptionalParaStyle() {} - const VSDOptionalParaStyle &operator=(const VSDOptionalParaStyle &style); + VSDOptionalParaStyle &operator=(const VSDOptionalParaStyle &style); void override(const VSDOptionalParaStyle &style) { ASSIGN_OPTIONAL(style.indFirst, indFirst); @@ -423,7 +423,7 @@ struct VSDParaStyle bullet(style.bullet), bulletStr(style.bulletStr), bulletFont(style.bulletFont), bulletFontSize(style.bulletFontSize), textPosAfterBullet(style.textPosAfterBullet), flags(style.flags) {} ~VSDParaStyle() {} - const VSDParaStyle &operator=(const VSDParaStyle &style); + VSDParaStyle &operator=(const VSDParaStyle &style); void override(const VSDOptionalParaStyle &style, const VSDXTheme * /* theme */) { ASSIGN_OPTIONAL(style.indFirst, indFirst); @@ -475,7 +475,7 @@ struct VSDOptionalTextBlockStyle isTextBkgndFilled(style.isTextBkgndFilled), textBkgndColour(style.textBkgndColour), defaultTabStop(style.defaultTabStop), textDirection(style.textDirection) {} ~VSDOptionalTextBlockStyle() {} - const VSDOptionalTextBlockStyle &operator=(const VSDOptionalTextBlockStyle &style); + VSDOptionalTextBlockStyle &operator=(const VSDOptionalTextBlockStyle &style); void override(const VSDOptionalTextBlockStyle &style) { ASSIGN_OPTIONAL(style.leftMargin, leftMargin); @@ -514,7 +514,7 @@ struct VSDTextBlockStyle bottomMargin(style.bottomMargin), verticalAlign(style.verticalAlign), isTextBkgndFilled(style.isTextBkgndFilled), textBkgndColour(style.textBkgndColour), defaultTabStop(style.defaultTabStop), textDirection(style.textDirection) {} ~VSDTextBlockStyle() {} - const VSDTextBlockStyle &operator=(const VSDTextBlockStyle &style); + VSDTextBlockStyle &operator=(const VSDTextBlockStyle &style); void override(const VSDOptionalTextBlockStyle &style, const VSDXTheme * /* theme */) { ASSIGN_OPTIONAL(style.leftMargin, leftMargin); diff --git a/src/lib/VSDTypes.cpp b/src/lib/VSDTypes.cpp index 7b75fac..e7ddc6e 100644 --- a/src/lib/VSDTypes.cpp +++ b/src/lib/VSDTypes.cpp @@ -12,7 +12,7 @@ namespace libvisio { -const XForm &XForm::operator=(const XForm &xform) +XForm &XForm::operator=(const XForm &xform) { if (this != &xform) { @@ -31,7 +31,7 @@ const XForm &XForm::operator=(const XForm &xform) return *this; } -const NURBSData &NURBSData::operator=(const NURBSData &data) +NURBSData &NURBSData::operator=(const NURBSData &data) { if (this != &data) { @@ -46,7 +46,7 @@ const NURBSData &NURBSData::operator=(const NURBSData &data) return *this; } -const VSDName &VSDName::operator=(const VSDName &name) +VSDName &VSDName::operator=(const VSDName &name) { if (this != &name) { @@ -56,14 +56,14 @@ const VSDName &VSDName::operator=(const VSDName &name) return *this; } -const VSDMisc &VSDMisc::operator=(const VSDMisc &misc) +VSDMisc &VSDMisc::operator=(const VSDMisc &misc) { if (this != &misc) m_hideText = misc.m_hideText; return *this; } -const VSDBullet &VSDBullet::operator=(const VSDBullet &bullet) +VSDBullet &VSDBullet::operator=(const VSDBullet &bullet) { if (this != &bullet) { diff --git a/src/lib/VSDTypes.h b/src/lib/VSDTypes.h index 75b9fdd..83be800 100644 --- a/src/lib/VSDTypes.h +++ b/src/lib/VSDTypes.h @@ -38,7 +38,7 @@ struct XForm XForm(const XForm &xform) : pinX(xform.pinX), pinY(xform.pinY), height(xform.height), width(xform.width), pinLocX(xform.pinLocX), pinLocY(xform.pinLocY), angle(xform.angle), flipX(xform.flipX), flipY(xform.flipY), x(xform.x), y(xform.y) {} - const XForm &operator=(const XForm &xform); + XForm &operator=(const XForm &xform); }; struct XForm1D @@ -117,7 +117,7 @@ struct NURBSData knots(data.knots), weights(data.weights), points(data.points) {} - const NURBSData &operator=(const NURBSData &data); + NURBSData &operator=(const NURBSData &data); }; struct PolylineData @@ -184,7 +184,7 @@ public: m_format(format) {} VSDName() : m_data(), m_format(VSD_TEXT_ANSI) {} VSDName(const VSDName &name) : m_data(name.m_data), m_format(name.m_format) {} - const VSDName &operator=(const VSDName &name); + VSDName &operator=(const VSDName &name); bool empty() const { return !m_data.size(); @@ -214,7 +214,7 @@ struct VSDMisc bool m_hideText; VSDMisc() : m_hideText(false) {} VSDMisc(const VSDMisc &misc) : m_hideText(misc.m_hideText) {} - const VSDMisc &operator=(const VSDMisc &misc); + VSDMisc &operator=(const VSDMisc &misc); }; struct VSDTabStop @@ -253,7 +253,7 @@ struct VSDBullet m_bulletFont(bullet.m_bulletFont), m_bulletFontSize(bullet.m_bulletFontSize), m_textPosAfterBullet(bullet.m_textPosAfterBullet) {} - const VSDBullet &operator=(const VSDBullet &bullet); + VSDBullet &operator=(const VSDBullet &bullet); inline bool operator==(const VSDBullet &bullet) const { return ((m_bulletStr == bullet.m_bulletStr) && |