summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2019-08-03 18:44:23 +0200
committerDavid Tardon <dtardon@redhat.com>2019-08-03 18:54:00 +0200
commit8f3932b2cf4d550787546feea93bf9c45278d36b (patch)
treea186ea41dfd065108f25c006ad3ab80a2e3fcf42
parent129afac556b38de50abdba5a3267ef88561418ac (diff)
WaE: implicitly-declared VSDCharStyle::operator= is deprecated
Change-Id: Iaa5ac6e94bb53afebc9a09c42134cd64583cfc43
-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 103f927..0268e6f 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -131,6 +131,30 @@ const VSDOptionalCharStyle &VSDOptionalCharStyle::operator=(const VSDOptionalCha
return *this;
}
+const VSDCharStyle &VSDCharStyle::operator=(const VSDCharStyle &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 2ef6a23..092e283 100644
--- a/src/lib/VSDStyles.h
+++ b/src/lib/VSDStyles.h
@@ -312,6 +312,7 @@ struct VSDCharStyle
smallcaps(style.smallcaps), superscript(style.superscript),
subscript(style.subscript), scaleWidth(style.scaleWidth) {}
~VSDCharStyle() {}
+ const VSDCharStyle &operator=(const VSDCharStyle &style);
void override(const VSDOptionalCharStyle &style, const VSDXTheme * /* theme */)
{
ASSIGN_OPTIONAL(style.font, font);