diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index 6b35afc76..24316c9d9 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -222,18 +222,13 @@ class QImageIOHandlerPrivate { public: QImageIOHandlerPrivate(); - virtual ~QImageIOHandlerPrivate(); QIODevice *device; mutable QByteArray format; }; QImageIOHandlerPrivate::QImageIOHandlerPrivate() -{ - device = 0; -} - -QImageIOHandlerPrivate::~QImageIOHandlerPrivate() + : device(Q_NULLPTR) { } @@ -245,21 +240,12 @@ QImageIOHandler::QImageIOHandler() { } -/*! \internal - - Constructs a QImageIOHandler object, using the private member \a - dd. -*/ -QImageIOHandler::QImageIOHandler(QImageIOHandlerPrivate &dd) - : d_ptr(&dd) -{ -} - /*! Destructs the QImageIOHandler object. */ QImageIOHandler::~QImageIOHandler() { + delete d_ptr; } /*! diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index be8661c23..16b6a505c 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -36,7 +36,6 @@ #include #include -#include QT_BEGIN_HEADER @@ -98,11 +97,10 @@ public: virtual int currentImageNumber() const; virtual QRect currentImageRect() const; -protected: - QImageIOHandler(QImageIOHandlerPrivate &dd); - QScopedPointer d_ptr; private: Q_DISABLE_COPY(QImageIOHandler) + + QImageIOHandlerPrivate *d_ptr; }; struct Q_GUI_EXPORT QImageIOHandlerFactoryInterface : public QFactoryInterface