From 189f944a0df4b2f4a6850979eb0f158bc32e0e4c Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 20 Dec 2011 12:30:04 +0100 Subject: [PATCH] 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 --- src/gui/image/qpicture.cpp | 11 ----------- src/gui/image/qpicture.h | 1 - 2 files changed, 12 deletions(-) diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index dfc84c56d8e..2cddb9af5f0 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 1c5d3a9c8fa..ab25723fba4 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 d_ptr; friend class QPicturePaintEngine;