diff options
| author | John Layt <jlayt@kde.org> | 2013-12-29 20:19:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 13:45:49 +0100 |
| commit | 0c04b31d2715f68aa883107b4aa593fd95aefdfe (patch) | |
| tree | b882b4835f0acd3b188e473c99170ac12951eacc /src/gui/painting/qpdfwriter.cpp | |
| parent | 4ab55a01e96b6ac398d3a9afa2c93032e305f30b (diff) | |
QPdfPaintEngine - Use QPageLayout and QPageSize
Switch internals of QPdfPageEngine and derived classes to use
QPageLayout and QPageSize to make handling of page layout and size
more consistent by removing multiple implementations. In particular
remove all use of the QPdf namespace version of page size.
Change-Id: Ie820340015e8812c8162bd1a257dd0f51f4f0b85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/painting/qpdfwriter.cpp')
| -rw-r--r-- | src/gui/painting/qpdfwriter.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index 27fb8b1646..a6f752b129 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -166,7 +166,7 @@ void QPdfWriter::setPageSize(PageSize size) Q_D(const QPdfWriter); QPagedPaintDevice::setPageSize(size); - d->engine->d_func()->setPaperSize(pageSizeMM()); + d->engine->setPageSize(QPageSize(QPageSize::PageSizeId(size))); } /*! @@ -177,7 +177,7 @@ void QPdfWriter::setPageSizeMM(const QSizeF &size) Q_D(const QPdfWriter); QPagedPaintDevice::setPageSizeMM(size); - d->engine->d_func()->setPaperSize(pageSizeMM()); + d->engine->setPageSize(QPageSize(size, QPageSize::Millimeter)); } /*! @@ -212,10 +212,8 @@ void QPdfWriter::setMargins(const Margins &m) QPagedPaintDevice::setMargins(m); const qreal multiplier = 72./25.4; - d->engine->d_func()->leftMargin = m.left*multiplier; - d->engine->d_func()->rightMargin = m.right*multiplier; - d->engine->d_func()->topMargin = m.top*multiplier; - d->engine->d_func()->bottomMargin = m.bottom*multiplier; + d->engine->setPageMargins(QMarginsF(m.left * multiplier, m.top * multiplier, + m.right * multiplier, m.bottom * multiplier), QPageLayout::Point); } QT_END_NAMESPACE |