manually manage QImageIOHandlerPrivate pointer

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-26 19:27:38 +00:00
parent c9f0d77eb3
commit e6b91609e3
2 changed files with 4 additions and 20 deletions

View file

@ -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;
}
/*!

View file

@ -36,7 +36,6 @@
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
#include <QtCore/qscopedpointer.h>
QT_BEGIN_HEADER
@ -98,11 +97,10 @@ public:
virtual int currentImageNumber() const;
virtual QRect currentImageRect() const;
protected:
QImageIOHandler(QImageIOHandlerPrivate &dd);
QScopedPointer<QImageIOHandlerPrivate> d_ptr;
private:
Q_DISABLE_COPY(QImageIOHandler)
QImageIOHandlerPrivate *d_ptr;
};
struct Q_GUI_EXPORT QImageIOHandlerFactoryInterface : public QFactoryInterface