whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPainterPrivate: use NSDMI, outline ctor 

As a drive-by, make the ctor explicit.

Change-Id: I4c0c597e4b6e96e800017c90acced33bbccd1d10
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Marc Mutz 2020-06-01 22:54:10 +02:00
parent 1e9e6c6e70
commit e71b9fb465
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/painting/qpainter.cpp
View File

@ -218,6 +218,12 @@ void QPainterPrivate::checkEmulation()
}
QPainterPrivate::QPainterPrivate(QPainter *painter)
: q_ptr(painter), txinv(0), inDestructor(false)
{
}
QPainterPrivate::~QPainterPrivate()
{
delete emulationEngine;

27
src/gui/painting/qpainter_p.h
View File

@ -194,17 +194,11 @@ class QPainterPrivate
{
Q_DECLARE_PUBLIC(QPainter)
public:
QPainterPrivate(QPainter *painter)
: q_ptr(painter), d_ptrs(nullptr), state(nullptr), dummyState(nullptr), txinv(0), inDestructor(false), d_ptrs_size(0),
refcount(1), device(nullptr), original_device(nullptr), helper_device(nullptr), engine(nullptr), emulationEngine(nullptr),
extended(nullptr)
{
}
explicit QPainterPrivate(QPainter *painter);
~QPainterPrivate();
QPainter *q_ptr;
QPainterPrivate **d_ptrs;
QPainterPrivate **d_ptrs = nullptr;
std::unique_ptr<QPainterState> state;
template <typename T, std::size_t N = 8>
@ -218,8 +212,8 @@ public:
QTransform invMatrix;
uint txinv:1;
uint inDestructor : 1;
uint d_ptrs_size;
uint refcount;
uint d_ptrs_size = 0;
uint refcount = 1;
enum DrawOperation { StrokeDraw = 0x1,
FillDraw = 0x2,
@ -265,9 +259,10 @@ public:
void detachPainterPrivate(QPainter *q);
void initFrom(const QPaintDevice *device);
QPaintDevice *device;
QPaintDevice *original_device;
QPaintDevice *helper_device;
QPaintDevice *device = nullptr;
QPaintDevice *original_device = nullptr;
QPaintDevice *helper_device = nullptr;
struct QPaintEngineDestructor {
void operator()(QPaintEngine *pe) const noexcept
{
@ -275,10 +270,10 @@ public:
delete pe;
}
};
std::unique_ptr<QPaintEngine, QPaintEngineDestructor> engine;
QEmulationPaintEngine *emulationEngine;
QPaintEngineEx *extended;
QEmulationPaintEngine *emulationEngine = nullptr;
QPaintEngineEx *extended = nullptr;
QBrush colorBrush; // for fill with solid color
};