anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some code factorization for the Change template

Browse Source 
The original motivation is to initialize the change_ member but do it only once.

This fixes coverity issue 23432.
This commit is contained in:
Jean-Marc Lasgouttes 2015-03-05 16:30:22 +01:00
parent a0fd54b2e7
commit f07ffaee84
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MetricsInfo.cpp
View File

@ -186,9 +186,8 @@ ArrayChanger::ArrayChanger(MetricsBase & mb)
/////////////////////////////////////////////////////////////////////////
ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape)
: Changer<FontInfo, FontShape>(font)
: Changer<FontInfo, FontShape>(font, font.shape())
{
save_ = orig_.shape();
orig_.setShape(shape);
}
@ -213,7 +212,6 @@ StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
{ 0, 0, -3, -5 },
{ 3, 3, 0, -2 },
{ 5, 5, 2, 0 } };
save_ = mb;
int t = diff[mb.style][style];
if (t > 0)
while (t--)
@ -242,7 +240,6 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name,
: Changer<MetricsBase>(mb), change_(really_change_font)
{
if (change_) {
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
docstring const oldname = from_ascii(save_.fontname);
@ -263,7 +260,6 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name,
: Changer<MetricsBase>(mb), change_(really_change_font)
{
if (change_) {
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
docstring const oldname = from_ascii(save_.fontname);
@ -295,7 +291,6 @@ FontSetChanger::~FontSetChanger()
WidthChanger::WidthChanger(MetricsBase & mb, int w)
: Changer<MetricsBase>(mb)
{
save_ = mb;
mb.textwidth = w;
}
@ -314,10 +309,9 @@ WidthChanger::~WidthChanger()
ColorChanger::ColorChanger(FontInfo & font, ColorCode color,
bool really_change_color)
: Changer<FontInfo, ColorCode>(font), change_(really_change_color)
: Changer<FontInfo, ColorCode>(font, font.color()), change_(really_change_color)
{
if (change_) {
save_ = font.color();
font.setColor(color);
}
}

12
src/MetricsInfo.h
View File

@ -126,14 +126,16 @@ public:
class TextMetricsInfo {};
/// Generic base for temporarily changing things.
/// The original state gets restored when the Changer is destructed.
/// Generic base for temporarily changing things. The derived class is
/// responsible for restoring the original state when the Changer is
/// destructed.
template <class Struct, class Temp = Struct>
class Changer {
public:
///
Changer(Struct & orig) : orig_(orig) {}
protected:
///
Changer(Struct & orig, Temp const & save) : orig_(orig), save_(save) {}
///
Changer(Struct & orig) : orig_(orig), save_(orig) {}
///
Struct & orig_;
///