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 | |
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')
-rw-r--r-- | src/gui/painting/qpagedpaintdevice.cpp | 14 | ||||
-rw-r--r-- | src/gui/painting/qpagedpaintdevice.h | 12 | ||||
-rw-r--r-- | src/gui/painting/qpdfwriter.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qpdfwriter.h | 2 | ||||
-rw-r--r-- | src/gui/text/qtextdocument.cpp | 9 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.h | 2 |
7 files changed, 18 insertions, 29 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); } /*! diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h index 21e23e0eb4..914a72b7be 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -230,16 +230,8 @@ public: virtual void setPageSizeMM(const QSizeF &size); QSizeF pageSizeMM() const; - // ### Qt6 Remove in favor of QMarginsF - struct Margins { - qreal left; - qreal right; - qreal top; - qreal bottom; - }; - - virtual void setMargins(const Margins &margins); - Margins margins() const; + virtual void setMargins(const QMarginsF &margins); + QMarginsF margins() const; protected: QPagedPaintDevice(QPagedPaintDevicePrivate *dd); diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index 32f2194da3..1de8ff0bcc 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -480,9 +480,9 @@ QT_WARNING_DISABLE_DEPRECATED \sa setPageMargins() */ -void QPdfWriter::setMargins(const Margins &m) +void QPdfWriter::setMargins(const QMarginsF &m) { - setPageMargins(QMarginsF(m.left, m.top, m.right, m.bottom), QPageLayout::Millimeter); + setPageMargins(m, QPageLayout::Millimeter); } QT_WARNING_POP #endif diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h index 04039a0104..fa5750dcf0 100644 --- a/src/gui/painting/qpdfwriter.h +++ b/src/gui/painting/qpdfwriter.h @@ -97,7 +97,7 @@ public: QT_DEPRECATED_X("Use setPageSize(QPageSize(size, QPageSize::Millimeter)) instead") 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 QMarginsF &m) override; #endif protected: diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 3cee66095b..877bae0f0a 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1918,9 +1918,12 @@ void QTextDocument::print(QPagedPaintDevice *printer) const QPagedPaintDevicePrivate *pd = QPagedPaintDevicePrivate::get(printer); // ### set page size to paginated size? - QPagedPaintDevice::Margins m = printer->margins(); - if (!documentPaginated && m.left == 0. && m.right == 0. && m.top == 0. && m.bottom == 0.) { - m.left = m.right = m.top = m.bottom = 2.; + QMarginsF m = printer->margins(); + if (!documentPaginated && m.left() == 0. && m.right() == 0. && m.top() == 0. && m.bottom() == 0.) { + m.setLeft(2); + m.setRight(2); + m.setTop(2); + m.setBottom(2); printer->setMargins(m); } // ### use the margins correctly 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; |