From f0ae973244026ca5382f05630bd799b44154d224 Mon Sep 17 00:00:00 2001
From: Peng Wenhao <pengwenhao@uniontech.com>
Date: Thu, 27 Aug 2020 14:21:07 +0800
Subject: Qpagedpaintdevice: Use marginsF instead of internal struct margins

resolve remaining Qt6 TODOs

Change-Id: Iad659a09ddfe136bdc545bc0635b4c695540c58b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/gui/painting/qpagedpaintdevice.cpp | 14 ++++----------
 src/gui/painting/qpagedpaintdevice.h   | 12 ++----------
 src/gui/painting/qpdfwriter.cpp        |  4 ++--
 src/gui/painting/qpdfwriter.h          |  2 +-
 4 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/gui/painting')

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:
-- 
cgit v1.2.3