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>

diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 47cc3fb..f8ee384 100644 (file)
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -60,7 +60,7 @@ QPaintDevice::~QPaintDevice()
 /*!
     \internal
 */
-void QPaintDevice::init(QPainter *) const
+void QPaintDevice::initPainter(QPainter *) const
 {
 }
 

diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 6d3815c..a793a42 100644 (file)
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -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;
 

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 3b7bfcf..da50bd3 100644 (file)
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1541,7 +1541,7 @@ void QPainter::initFrom(const QPaintDevice *device)
         return;
     }
 
-    device->init(this);
+    device->initPainter(this);
 
     if (d->extended) {
         d->extended->penChanged();

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index c068f4e..c5f033c 100644 (file)
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -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);

diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 67b5251..5baa3c3 100644 (file)
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -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;