Fix compiler warnings in thirdparty/rtf2html/fmt_opts.h
Fixed warnings about deprecated implicit copy constructor, by removing unnecessary assignment operators.
This commit is contained in:
parent
95fcf4c196
commit
136ff7b934
|
@ -19,11 +19,6 @@ struct color {
|
|||
{
|
||||
return !(*this==clr);
|
||||
}
|
||||
color &operator=(const color &clr)
|
||||
{
|
||||
r=clr.r; g=clr.g; b=clr.b;
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::vector<color> colorvect;
|
||||
|
@ -44,11 +39,6 @@ struct font {
|
|||
{
|
||||
return !(*this==f);
|
||||
}
|
||||
font &operator=(const font &f)
|
||||
{
|
||||
family=f.family; name=f.name; pitch=f.pitch; charset=f.charset;
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::map<int, font> fontmap;
|
||||
|
@ -91,20 +81,6 @@ struct formatting_options
|
|||
{
|
||||
return !(*this==opt);
|
||||
}
|
||||
formatting_options &operator=(const formatting_options &opt)
|
||||
{
|
||||
chpBold=opt.chpBold; chpAllCaps=opt.chpAllCaps;
|
||||
chpItalic=opt.chpItalic;
|
||||
chpUnderline=opt.chpUnderline; chpVAlign=opt.chpVAlign;
|
||||
chpFontSize=opt.chpFontSize;
|
||||
chpFColor=opt.chpFColor; chpBColor=opt.chpBColor;
|
||||
chpHighlight=opt.chpHighlight; chpFont=opt.chpFont;
|
||||
chpVShift=opt.chpVShift;
|
||||
papLeft=opt.papLeft; papRight=opt.papRight;
|
||||
papFirst=opt.papFirst; papBefore=opt.papBefore; papAfter=opt.papAfter;
|
||||
papAlign=opt.papAlign; papInTbl=opt.papInTbl;
|
||||
return *this;
|
||||
}
|
||||
std::string get_par_str() const;
|
||||
static std::string get_style_id(const std::string &style);
|
||||
static std::string get_styles();
|
||||
|
|
Loading…
Reference in New Issue