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

Rename QPaintDevice::init() to initPainter() 

The old name was too generic and was likely to cause warnings in user
code.

Change-Id: I7126d8fe89a394cd8388af5a030961af7b69c741
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Richard Moore 2012-09-05 09:24:22 +01:00 committed by Qt by Nokia
parent 703253d31b
commit c1d7d0f0b2
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qpaintdevice.cpp
View File

@ -60,7 +60,7 @@ QPaintDevice::~QPaintDevice()
/*!
\internal
*/
void QPaintDevice::init(QPainter *) const
void QPaintDevice::initPainter(QPainter *) const
{
}

2
src/gui/painting/qpaintdevice.h
View File

@ -90,7 +90,7 @@ public:
protected:
QPaintDevice();
virtual int metric(PaintDeviceMetric metric) const;
virtual void init(QPainter *painter) const;
virtual void initPainter(QPainter *painter) const;
virtual QPaintDevice *redirected(QPoint *offset) const;
virtual QPainter *sharedPainter() const;

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

@ -1541,7 +1541,7 @@ void QPainter::initFrom(const QPaintDevice *device)
return;
}
device->init(this);
device->initPainter(this);
if (d->extended) {
d->extended->penChanged();

2
src/widgets/kernel/qwidget.cpp
View File

@ -11227,7 +11227,7 @@ void QWidget::ungrabGesture(Qt::GestureType gesture)
the given widget's. This function is called automatically when the
painter is opened on a QWidget.
*/
void QWidget::init(QPainter *painter) const
void QWidget::initPainter(QPainter *painter) const
{
const QPalette &pal = palette();
painter->d_func()->state->pen = QPen(pal.brush(foregroundRole()), 0);

2
src/widgets/kernel/qwidget.h
View File

@ -643,7 +643,7 @@ protected:
virtual void changeEvent(QEvent *);
int metric(PaintDeviceMetric) const;
void init(QPainter *painter) const;
void initPainter(QPainter *painter) const;
QPaintDevice *redirected(QPoint *offset) const;
QPainter *sharedPainter() const;