From: Richard Moore <rich@kde.org>
Date: Sun, 19 Feb 2012 16:31:39 +0000 (+0000)
Subject: Remove dead method.
X-Git-Tag: qt-v5.0.0-alpha1~954
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad1a0138789041f4cb7083ea68168a4b9316dd99;p=profile%2Fivi%2Fqtbase.git

Remove dead method.

Fix Qt 5 TODO

Change-Id: I9a12cc07ebc7c039bbeb53922b0539f177b226f8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 16945ed..e8c1304 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 de76321..27bfe15 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;