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/printsupport | |
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/printsupport')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 8fd98d1e4c..227b2af023 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1740,9 +1740,9 @@ void QPrinter::setPageMargins(qreal left, qreal top, qreal right, qreal bottom, \sa setPageMargins() */ -void QPrinter::setMargins(const Margins &m) +void QPrinter::setMargins(const QMarginsF &m) { - setPageMargins(QMarginsF(m.left, m.top, m.right, m.bottom), QPageLayout::Millimeter); + setPageMargins(m, QPageLayout::Millimeter); } /*! diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index e606ceba47..50b84e72d7 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -255,7 +255,7 @@ public: void setPrintRange(PrintRange range); PrintRange printRange() const; - void setMargins(const Margins &m) override; + void setMargins(const QMarginsF &m) override; void setPageMargins(qreal left, qreal top, qreal right, qreal bottom, Unit unit); void getPageMargins(qreal *left, qreal *top, qreal *right, qreal *bottom, Unit unit) const; |