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

QPdfWriter: mark obsolete functions as deprecated

Browse Source 
Mark obsolete functions in QPdfWriter as deprecated so they can be
removed with Qt6:
 - setPageSize(PageSize size)
 - setPageSizeMM(const QSizeF &size)
 - setMargins(const Margins &m)

Change-Id: Iba88528742e67c09f5dc61aea69d27e26f484c16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-02-18 21:46:33 +01:00
parent 5795317454
commit f4cc23cffb
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/painting/qpdfwriter.cpp
View File

@ -379,6 +379,9 @@ int QPdfWriter::resolution() const
*/ */
#endif #endif
#if QT_DEPRECATED_SINCE(5, 14)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
/*! /*!
\reimp \reimp
@ -404,6 +407,8 @@ void QPdfWriter::setPageSizeMM(const QSizeF &size)
{ {
setPageSize(QPageSize(size, QPageSize::Millimeter)); setPageSize(QPageSize(size, QPageSize::Millimeter));
} }
QT_WARNING_POP
#endif
/*! /*!
\internal \internal
@ -427,6 +432,9 @@ bool QPdfWriter::newPage()
} }
#if QT_DEPRECATED_SINCE(5, 14)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
/*! /*!
\reimp \reimp
@ -438,6 +446,8 @@ void QPdfWriter::setMargins(const Margins &m)
{ {
setPageMargins(QMarginsF(m.left, m.top, m.right, m.bottom), QPageLayout::Millimeter); setPageMargins(QMarginsF(m.left, m.top, m.right, m.bottom), QPageLayout::Millimeter);
} }
QT_WARNING_POP
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

6
src/gui/painting/qpdfwriter.h
View File

@ -86,10 +86,14 @@ public:
using QPagedPaintDevice::setPageSize; using QPagedPaintDevice::setPageSize;
#endif #endif
#if QT_DEPRECATED_SINCE(5, 14)
QT_DEPRECATED_X("Use setPageSize(QPageSize(id)) instead")
void setPageSize(PageSize size) override; void setPageSize(PageSize size) override;
QT_DEPRECATED_X("Use setPageSize(QPageSize(size, QPageSize::Millimeter)) instead")
void setPageSizeMM(const QSizeF &size) override; void setPageSizeMM(const QSizeF &size) override;
QT_DEPRECATED_X("Use setPageMargins(QMarginsF(l, t, r, b), QPageLayout::Millimeter) instead")
void setMargins(const Margins &m) override; void setMargins(const Margins &m) override;
#endif
protected: protected:
QPaintEngine *paintEngine() const override; QPaintEngine *paintEngine() const override;