diff options
| author | Peng Wenhao <pengwenhao@uniontech.com> | 2020-08-27 14:21:07 +0800 |
|---|---|---|
| committer | Peng Wenhao <pengwenhao@uniontech.com> | 2020-09-01 04:57:48 +0800 |
| commit | f0ae973244026ca5382f05630bd799b44154d224 (patch) | |
| tree | 630eef965e2fe07745c41fffdfa00b30c3ce2485 /src/gui/painting/qpagedpaintdevice.cpp | |
| parent | 90358f6042d1fe2db849e17e1b0c875fb0560b20 (diff) | |
Qpagedpaintdevice: Use marginsF instead of internal struct margins
resolve remaining Qt6 TODOs
Change-Id: Iad659a09ddfe136bdc545bc0635b4c695540c58b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/painting/qpagedpaintdevice.cpp')
| -rw-r--r-- | src/gui/painting/qpagedpaintdevice.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index e6d3a38427..ecb952a8bd 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -343,9 +343,9 @@ QSizeF QPagedPaintDevice::pageSizeMM() const \sa margins() */ -void QPagedPaintDevice::setMargins(const Margins &margins) +void QPagedPaintDevice::setMargins(const QMarginsF &margins) { - d->setPageMargins(QMarginsF(margins.left, margins.top, margins.right, margins.bottom), QPageLayout::Millimeter); + d->setPageMargins(margins, QPageLayout::Millimeter); } /*! @@ -355,15 +355,9 @@ void QPagedPaintDevice::setMargins(const Margins &margins) \sa setMargins() */ -QPagedPaintDevice::Margins QPagedPaintDevice::margins() const +QMarginsF QPagedPaintDevice::margins() const { - QMarginsF margins = d->pageLayout().margins(QPageLayout::Millimeter); - Margins result; - result.left = margins.left(); - result.top = margins.top(); - result.right = margins.right(); - result.bottom = margins.bottom(); - return result; + return d->pageLayout().margins(QPageLayout::Millimeter); } /*! |