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 /tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.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 'tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp')
-rw-r--r-- | tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp index 3fbe16575d..36b8a4726b 100644 --- a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp +++ b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp @@ -90,25 +90,25 @@ void tst_QPdfWriter::basics() QCOMPARE(writer.pageLayout().margins(), QMarginsF(10, 10, 10, 10)); QCOMPARE(writer.pageLayout().units(), QPageLayout::Point); - QCOMPARE(writer.margins().left, 3.53); // mm - QCOMPARE(writer.margins().right, 3.53); - QCOMPARE(writer.margins().top, 3.53); - QCOMPARE(writer.margins().bottom, 3.53); + QCOMPARE(writer.margins().left(), 3.53); // mm + QCOMPARE(writer.margins().right(), 3.53); + QCOMPARE(writer.margins().top(), 3.53); + QCOMPARE(writer.margins().bottom(), 3.53); writer.setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Millimeter); QCOMPARE(writer.pageLayout().margins(), QMarginsF(20, 20, 20, 20)); QCOMPARE(writer.pageLayout().units(), QPageLayout::Millimeter); - QCOMPARE(writer.margins().left, 20.0); - QCOMPARE(writer.margins().right, 20.0); - QCOMPARE(writer.margins().top, 20.0); - QCOMPARE(writer.margins().bottom, 20.0); + QCOMPARE(writer.margins().left(), 20.0); + QCOMPARE(writer.margins().right(), 20.0); + QCOMPARE(writer.margins().top(), 20.0); + QCOMPARE(writer.margins().bottom(), 20.0); const QMarginsF margins = {50, 50, 50, 50}; writer.setPageMargins(margins, QPageLayout::Millimeter); QCOMPARE(writer.pageLayout().margins(), margins); QCOMPARE(writer.pageLayout().units(), QPageLayout::Millimeter); - QCOMPARE(writer.margins().left, 50.0); - QCOMPARE(writer.margins().right, 50.0); - QCOMPARE(writer.margins().top, 50.0); - QCOMPARE(writer.margins().bottom, 50.0); + QCOMPARE(writer.margins().left(), 50.0); + QCOMPARE(writer.margins().right(), 50.0); + QCOMPARE(writer.margins().top(), 50.0); + QCOMPARE(writer.margins().bottom(), 50.0); QCOMPARE(writer.pageLayout().fullRect(QPageLayout::Millimeter), QRectF(0, 0, 297, 210)); QCOMPARE(writer.pageLayout().paintRect(QPageLayout::Millimeter), QRectF(50, 50, 197, 110)); @@ -185,10 +185,10 @@ void tst_QPdfWriter::testPageMetrics() if (setMargins) { // Setup the given margins writer.setPageMargins({leftMMf, topMMf, rightMMf, bottomMMf}, QPageLayout::Millimeter); - QCOMPARE(writer.margins().left, leftMMf); - QCOMPARE(writer.margins().right, rightMMf); - QCOMPARE(writer.margins().top, topMMf); - QCOMPARE(writer.margins().bottom, bottomMMf); + QCOMPARE(writer.margins().left(), leftMMf); + QCOMPARE(writer.margins().right(), rightMMf); + QCOMPARE(writer.margins().top(), topMMf); + QCOMPARE(writer.margins().bottom(), bottomMMf); } // Set the given size, in Portrait mode @@ -199,10 +199,10 @@ void tst_QPdfWriter::testPageMetrics() QCOMPARE(int(writer.pageSize()), int(pageSizeId)); QCOMPARE(writer.pageLayout().orientation(), QPageLayout::Portrait); - QCOMPARE(writer.margins().left, leftMMf); - QCOMPARE(writer.margins().right, rightMMf); - QCOMPARE(writer.margins().top, topMMf); - QCOMPARE(writer.margins().bottom, bottomMMf); + QCOMPARE(writer.margins().left(), leftMMf); + QCOMPARE(writer.margins().right(), rightMMf); + QCOMPARE(writer.margins().top(), topMMf); + QCOMPARE(writer.margins().bottom(), bottomMMf); // QPagedPaintDevice::pageSizeMM() always returns Portrait QCOMPARE(writer.pageSizeMM(), sizeMMf); @@ -216,10 +216,10 @@ void tst_QPdfWriter::testPageMetrics() QCOMPARE(writer.pageLayout().pageSize().id(), pageSizeId); QCOMPARE(int(writer.pageSize()), int(pageSizeId)); QCOMPARE(writer.pageLayout().orientation(), QPageLayout::Landscape); - QCOMPARE(writer.margins().left, leftMMf); - QCOMPARE(writer.margins().right, rightMMf); - QCOMPARE(writer.margins().top, topMMf); - QCOMPARE(writer.margins().bottom, bottomMMf); + QCOMPARE(writer.margins().left(), leftMMf); + QCOMPARE(writer.margins().right(), rightMMf); + QCOMPARE(writer.margins().top(), topMMf); + QCOMPARE(writer.margins().bottom(), bottomMMf); // QPagedPaintDevice::pageSizeMM() always returns Portrait QCOMPARE(writer.pageSizeMM(), sizeMMf); @@ -240,10 +240,10 @@ void tst_QPdfWriter::testPageMetrics() QCOMPARE(writer.pageLayout().pageSize().id(), pageSizeId); QCOMPARE(int(writer.pageSize()), int(pageSizeId)); QCOMPARE(writer.pageLayout().orientation(), QPageLayout::Landscape); - QCOMPARE(writer.margins().left, leftMMf); - QCOMPARE(writer.margins().right, rightMMf); - QCOMPARE(writer.margins().top, topMMf); - QCOMPARE(writer.margins().bottom, bottomMMf); + QCOMPARE(writer.margins().left(), leftMMf); + QCOMPARE(writer.margins().right(), rightMMf); + QCOMPARE(writer.margins().top(), topMMf); + QCOMPARE(writer.margins().bottom(), bottomMMf); // QPagedPaintDevice::pageSizeMM() always returns Portrait QCOMPARE(writer.pageSizeMM(), sizeMMf); |