mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-01-02 08:50:15 +01:00
[qt] Remove use of unnecessary QPen pointer
QPen is a implicitly shared class, so there is no need to do explicit sharing via pointers. Mozilla Bug #498873
This commit is contained in:
parent
0797b2fcaa
commit
222c12cc4e
1 changed files with 10 additions and 12 deletions
|
|
@ -1061,8 +1061,8 @@ struct PatternToBrushConverter {
|
|||
|
||||
struct PatternToPenConverter {
|
||||
PatternToPenConverter (const cairo_pattern_t *source,
|
||||
cairo_stroke_style_t *style)
|
||||
: mBrushConverter(source)
|
||||
cairo_stroke_style_t *style) :
|
||||
mBrushConverter(source)
|
||||
{
|
||||
Qt::PenJoinStyle join = Qt::MiterJoin;
|
||||
Qt::PenCapStyle cap = Qt::SquareCap;
|
||||
|
|
@ -1091,8 +1091,8 @@ struct PatternToPenConverter {
|
|||
break;
|
||||
}
|
||||
|
||||
mPen = new QPen (mBrushConverter, style->line_width, Qt::SolidLine, cap, join);
|
||||
mPen->setMiterLimit (style->miter_limit);
|
||||
mPen = QPen(mBrushConverter, style->line_width, Qt::SolidLine, cap, join);
|
||||
mPen.setMiterLimit (style->miter_limit);
|
||||
|
||||
if (style->dash && style->num_dashes) {
|
||||
Qt::PenStyle pstyle = Qt::NoPen;
|
||||
|
|
@ -1113,7 +1113,7 @@ struct PatternToPenConverter {
|
|||
}
|
||||
|
||||
if (pstyle != Qt::NoPen) {
|
||||
mPen->setStyle(pstyle);
|
||||
mPen.setStyle(pstyle);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1130,20 +1130,18 @@ struct PatternToPenConverter {
|
|||
}
|
||||
}
|
||||
|
||||
mPen->setDashPattern (dashes);
|
||||
mPen->setDashOffset (style->dash_offset / style->line_width);
|
||||
mPen.setDashPattern(dashes);
|
||||
mPen.setDashOffset(style->dash_offset / style->line_width);
|
||||
}
|
||||
}
|
||||
|
||||
~PatternToPenConverter() {
|
||||
delete mPen;
|
||||
}
|
||||
~PatternToPenConverter() { }
|
||||
|
||||
operator QPen& () {
|
||||
return *mPen;
|
||||
return mPen;
|
||||
}
|
||||
|
||||
QPen *mPen;
|
||||
QPen mPen;
|
||||
PatternToBrushConverter mBrushConverter;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue