d->device = pd;
- d->extended = d->engine->isExtended() ? static_cast<QPaintEngineEx *>(d->engine) : 0;
+ d->extended = d->engine->isExtended() ? static_cast<QPaintEngineEx *>(d->engine) : Q_NULLPTR;
// Setup new state...
Q_ASSERT(!d->state);
}
if (d->extended) {
- d->extended = 0;
+ d->extended = Q_NULLPTR;
}
qt_cleanup_painter_state(d);
// If we don't have an extended paint engine, or if the painter is projected,
// we go through standard code path
- if (d->extended == 0 || !d->state->matrix.isAffine()) {
+ if (d->extended == Q_NULLPTR || !d->state->matrix.isAffine()) {
staticText_d->paintText(topLeftPosition, this);
return;
}
setPen(oldPen);
}
-
-
/*!
\fn void QPainter::fillRect(const QRect &rectangle, const QColor &color)
\overload
\sa QPainter::drawPixmapFragments(), QPainter::PixmapFragment
*/
-void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivate::DrawOperation operation)
-{
- p->draw_helper(path, operation);
-}
-
/*! \fn Display *QPaintDevice::x11Display() const
Use QX11Info::display() instead.
Q_DECLARE_PUBLIC(QPainter)
public:
QPainterPrivate(QPainter *painter)
- : q_ptr(painter), d_ptrs(0), state(0), dummyState(0), txinv(0), inDestructor(false), d_ptrs_size(0),
- refcount(1), device(0), original_device(0), helper_device(0), engine(0), extended(0)
+ : q_ptr(painter), d_ptrs(Q_NULLPTR), state(Q_NULLPTR), dummyState(Q_NULLPTR), txinv(false),
+ inDestructor(false), d_ptrs_size(0), refcount(1), device(Q_NULLPTR),
+ original_device(Q_NULLPTR), helper_device(Q_NULLPTR), engine(Q_NULLPTR),
+ extended(Q_NULLPTR)
{
}
mutable QPainterDummyState *dummyState;
QTransform invMatrix;
- uint txinv:1;
- uint inDestructor : 1;
- uint d_ptrs_size;
+ bool txinv;
+ bool inDestructor;
+ int d_ptrs_size;
uint refcount;
- enum DrawOperation { StrokeDraw = 0x1,
- FillDraw = 0x2,
- StrokeAndFillDraw = 0x3
+ enum DrawOperation {
+ StrokeDraw = 0x1,
+ FillDraw = 0x2,
+ StrokeAndFillDraw = 0x3
};
QPainterDummyState *fakeState() const {
QBrush colorBrush; // for fill with solid color
};
-Q_GUI_EXPORT void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivate::DrawOperation operation);
-
QString qt_generate_brush_key(const QBrush &brush);
QT_END_NAMESPACE