diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 21:39:34 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-08 11:49:54 +0100 |
| commit | b14b1c99f8d122c7988cd6e59b0f3fef15923da4 (patch) | |
| tree | c876d2428f7be32a73a1d066fa2d703b59708a1e /src/gui/painting/painting.pri | |
| parent | 8bf36025f5602e3067448941ee4d0ccca3928a40 (diff) | |
Rename QRangeCollection to QPageRanges, make it a proper value type
The type is specific about printing, so give it a name in line with
QPageLayout and QPageSize.
As per API review comment, it's not clear why this type should not be a
regular, copyable and movable value type. It stores a list of intervals.
Give it value-type semantics, as an implicitly shared class.
Convert the parse method into a static factory function.
Add a Range type and use it instead of the semantic-free QPair.
Move QPrinter getter into QPagedPainteDevice, make it return a copy
rather than a pointer, and add a setter.
Extend test case to cover all members and more merge cases. Fix bugs
found that way.
Fixes: QTBUG-88113
Change-Id: If17ea4d410d49f16b097e88b7979db5d72add820
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/painting/painting.pri')
| -rw-r--r-- | src/gui/painting/painting.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index ccd67e12b3..1262b1775c 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -31,6 +31,8 @@ HEADERS += \ painting/qpagedpaintdevice.h \ painting/qpagedpaintdevice_p.h \ painting/qpagelayout.h \ + painting/qpageranges.h \ + painting/qpageranges_p.h \ painting/qpagesize.h \ painting/qpaintdevice.h \ painting/qpaintengine.h \ @@ -49,8 +51,6 @@ HEADERS += \ painting/qpen.h \ painting/qpixellayout_p.h \ painting/qpolygon.h \ - painting/qrangecollection.h \ - painting/qrangecollection_p.h \ painting/qrasterdefs_p.h \ painting/qrasterizer_p.h \ painting/qrbtree_p.h \ @@ -88,6 +88,7 @@ SOURCES += \ painting/qoutlinemapper.cpp \ painting/qpagedpaintdevice.cpp \ painting/qpagelayout.cpp \ + painting/qpageranges.cpp \ painting/qpagesize.cpp \ painting/qpaintdevice.cpp \ painting/qpaintengine.cpp \ @@ -102,7 +103,6 @@ SOURCES += \ painting/qpen.cpp \ painting/qpixellayout.cpp \ painting/qpolygon.cpp \ - painting/qrangecollection.cpp \ painting/qrasterizer.cpp \ painting/qregion.cpp \ painting/qstroker.cpp \ |