summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2019-08-03 18:39:40 +0200
committerDavid Tardon <dtardon@redhat.com>2019-08-03 18:53:59 +0200
commit129afac556b38de50abdba5a3267ef88561418ac (patch)
treeae371059449835bcc63e41136cf9fd218df2ed28
parent4136243660429bc2f9775847e3992b7446f2805b (diff)
WaE: implicitly-declared VSDOptionalCharStyle::operator= is deprecated
Change-Id: I1729b9229bc01062486f9e124c3d3f13f6aaacf8
-rw-r--r--src/lib/VSDStyles.cpp24
-rw-r--r--src/lib/VSDStyles.h1
2 files changed, 25 insertions, 0 deletions
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index ee48226..103f927 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -107,6 +107,30 @@ const VSDFillStyle &VSDFillStyle::operator=(const VSDFillStyle &style)
return *this;
}
+const VSDOptionalCharStyle &VSDOptionalCharStyle::operator=(const VSDOptionalCharStyle &style)
+{
+ if (this != &style)
+ {
+ charCount = style.charCount;
+ font = style.font;
+ colour = style.colour;
+ size = style.size;
+ bold = style.bold;
+ italic = style.italic;
+ underline = style.underline;
+ doubleunderline = style.doubleunderline;
+ strikeout = style.strikeout;
+ doublestrikeout = style.doublestrikeout;
+ allcaps = style.allcaps;
+ initcaps = style.initcaps;
+ smallcaps = style.smallcaps;
+ superscript = style.superscript;
+ subscript = style.subscript;
+ scaleWidth = style.scaleWidth;
+ }
+ return *this;
+}
+
}
libvisio::VSDStyles::VSDStyles() :
diff --git a/src/lib/VSDStyles.h b/src/lib/VSDStyles.h
index b793cbb..2ef6a23 100644
--- a/src/lib/VSDStyles.h
+++ b/src/lib/VSDStyles.h
@@ -250,6 +250,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);
void override(const VSDOptionalCharStyle &style)
{
ASSIGN_OPTIONAL(style.font, font);