summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2011-12-20 12:30:04 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-20 16:18:27 +0100
commit189f944a0df4b2f4a6850979eb0f158bc32e0e4c (patch)
tree8b013f73ce4103a952398cde224465f5542f13a5
parent43aef6f8d2db00a57fd8e8e4be348dd50d00d399 (diff)
Remove unused QPicture::detach_helper() private method.
QPicture doesn't need this for quite a long time now, so get rid of it. Change-Id: Ie575f32555deb130f7b27e11a7617fb2b3dc4e43 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
-rw-r--r--src/gui/image/qpicture.cpp11
-rw-r--r--src/gui/image/qpicture.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index dfc84c56d8..2cddb9af5f 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -1008,17 +1008,6 @@ int QPicture::metric(PaintDeviceMetric m) const
\internal
*/
-/*! \internal
-### Qt 5 - remove me
- */
-void QPicture::detach_helper()
-{
- // QExplicitelySharedDataPointer takes care of cloning using
- // QPicturePrivate's copy constructor. Do not call detach_helper() anymore
- // and remove in Qt 5, please.
- Q_ASSERT_X(false, "QPicture::detach_helper()", "Do not call this function");
-}
-
/*!
Assigns picture \a p to this picture and returns a reference to
this picture.
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 1c5d3a9c8f..ab25723fba 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -107,7 +107,6 @@ protected:
private:
bool exec(QPainter *p, QDataStream &ds, int i);
- void detach_helper();
QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
friend class QPicturePaintEngine;