From ad1a0138789041f4cb7083ea68168a4b9316dd99 Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Sun, 19 Feb 2012 16:31:39 +0000 Subject: Remove dead method. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix Qt 5 TODO Change-Id: I9a12cc07ebc7c039bbeb53922b0539f177b226f8 Reviewed-by: Samuel Rødal --- src/gui/image/qpixmap.cpp | 8 -------- src/gui/image/qpixmap.h | 1 - 2 files changed, 9 deletions(-) (limited to 'src/gui') diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 16945edc90..e8c1304b74 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1003,14 +1003,6 @@ bool QPixmap::isDetached() const return data && data->ref.load() == 1; } -/*! \internal - ### Qt5 - remove me. -*/ -void QPixmap::deref() -{ - Q_ASSERT_X(false, "QPixmap::deref()", "Do not call this function anymore!"); -} - /*! Replaces this pixmap's data with the given \a image using the specified \a flags to control the conversion. The \a flags diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index de76321f0a..27bfe15688 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -174,7 +174,6 @@ private: QPixmap(const QSize &s, int type); void doInit(int, int, int); - void deref(); Q_DUMMY_COMPARISON_OPERATOR(QPixmap) friend class QPlatformPixmap; friend class QBitmap; -- cgit v1.2.3