1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPicture: mark deprecated functions with the QT_DEPRECATED macros

Browse Source 
These functions should never be used, they've been deprecated
since Qt 5.0.

Change-Id: I71744eba3ff3b94487dd040ddd6af4fb11f382b2
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Giuseppe D'Angelo 2017-06-19 12:53:25 +02:00
parent 3d77c3629c
commit 4de4051406
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/image/qpicture.cpp
View File

@ -1194,6 +1194,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
#include "qpictureformatplugin.h" #include "qpictureformatplugin.h"
QT_END_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE
#if QT_DEPRECATED_SINCE(5, 0)
/*! /*!
\obsolete \obsolete
@ -1279,6 +1280,7 @@ QList<QByteArray> QPicture::outputFormats()
{ {
return QPictureIO::outputFormats(); return QPictureIO::outputFormats();
} }
#endif // QT_DEPRECATED_SINCE(5, 0)
/***************************************************************************** /*****************************************************************************
QPictureIO member functions QPictureIO member functions

12
src/gui/image/qpicture.h
View File

@ -90,11 +90,13 @@ public:
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p); friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p); friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p);
static const char* pictureFormat(const QString &fileName); #if QT_DEPRECATED_SINCE(5, 0)
static QList<QByteArray> inputFormats(); static QT_DEPRECATED const char* pictureFormat(const QString &fileName);
static QList<QByteArray> outputFormats(); static QT_DEPRECATED QList<QByteArray> inputFormats();
static QStringList inputFormatList(); static QT_DEPRECATED QList<QByteArray> outputFormats();
static QStringList outputFormatList(); static QT_DEPRECATED QStringList inputFormatList();
static QT_DEPRECATED QStringList outputFormatList();
#endif // QT_DEPRECATED_SINCE(5, 0)
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;