Remove deprecated QPrinter and QPagedPaintDevice APIs

Adjusting the QPrinter test case - some use cases no longer exist, or are
already tested in QPageSize and QPageLayout tests.

Adjust examples and manual tests.

Change-Id: I01cbc65f3d8031aea2dac86dd942126ba708b111
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 4 insertions, 181 deletions

diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h
index f4e671f2d2..ab304250c9 100644
--- a/src/gui/painting/qpagedpaintdevice.h
+++ b/src/gui/painting/qpagedpaintdevice.h
@@ -55,199 +55,22 @@ class QPagedPaintDevicePrivate;
 class Q_GUI_EXPORT QPagedPaintDevice : public QPaintDevice
 {
 public:
-    QT_DEPRECATED QPagedPaintDevice();
     ~QPagedPaintDevice();
 
     virtual bool newPage() = 0;
 
-    // ### Qt6 Remove in favor of QPage::PageSize
-    // NOTE: Must keep in sync with QPageSize and QPrinter
-    enum PageSize {
-        // Existing Qt sizes
-        A4,
-        B5,
-        Letter,
-        Legal,
-        Executive,
-        A0,
-        A1,
-        A2,
-        A3,
-        A5,
-        A6,
-        A7,
-        A8,
-        A9,
-        B0,
-        B1,
-        B10,
-        B2,
-        B3,
-        B4,
-        B6,
-        B7,
-        B8,
-        B9,
-        C5E,
-        Comm10E,
-        DLE,
-        Folio,
-        Ledger,
-        Tabloid,
-        Custom,
-
-        // New values derived from PPD standard
-        A10,
-        A3Extra,
-        A4Extra,
-        A4Plus,
-        A4Small,
-        A5Extra,
-        B5Extra,
-
-        JisB0,
-        JisB1,
-        JisB2,
-        JisB3,
-        JisB4,
-        JisB5,
-        JisB6,
-        JisB7,
-        JisB8,
-        JisB9,
-        JisB10,
-
-        // AnsiA = Letter,
-        // AnsiB = Ledger,
-        AnsiC,
-        AnsiD,
-        AnsiE,
-        LegalExtra,
-        LetterExtra,
-        LetterPlus,
-        LetterSmall,
-        TabloidExtra,
-
-        ArchA,
-        ArchB,
-        ArchC,
-        ArchD,
-        ArchE,
-
-        Imperial7x9,
-        Imperial8x10,
-        Imperial9x11,
-        Imperial9x12,
-        Imperial10x11,
-        Imperial10x13,
-        Imperial10x14,
-        Imperial12x11,
-        Imperial15x11,
-
-        ExecutiveStandard,
-        Note,
-        Quarto,
-        Statement,
-        SuperA,
-        SuperB,
-        Postcard,
-        DoublePostcard,
-        Prc16K,
-        Prc32K,
-        Prc32KBig,
-
-        FanFoldUS,
-        FanFoldGerman,
-        FanFoldGermanLegal,
-
-        EnvelopeB4,
-        EnvelopeB5,
-        EnvelopeB6,
-        EnvelopeC0,
-        EnvelopeC1,
-        EnvelopeC2,
-        EnvelopeC3,
-        EnvelopeC4,
-        // EnvelopeC5 = C5E,
-        EnvelopeC6,
-        EnvelopeC65,
-        EnvelopeC7,
-        // EnvelopeDL = DLE,
-
-        Envelope9,
-        // Envelope10 = Comm10E,
-        Envelope11,
-        Envelope12,
-        Envelope14,
-        EnvelopeMonarch,
-        EnvelopePersonal,
-
-        EnvelopeChou3,
-        EnvelopeChou4,
-        EnvelopeInvite,
-        EnvelopeItalian,
-        EnvelopeKaku2,
-        EnvelopeKaku3,
-        EnvelopePrc1,
-        EnvelopePrc2,
-        EnvelopePrc3,
-        EnvelopePrc4,
-        EnvelopePrc5,
-        EnvelopePrc6,
-        EnvelopePrc7,
-        EnvelopePrc8,
-        EnvelopePrc9,
-        EnvelopePrc10,
-        EnvelopeYou4,
-
-        // Last item, with commonly used synynoms from QPagedPrintEngine / QPrinter
-        LastPageSize = EnvelopeYou4,
-        NPageSize = LastPageSize,
-        NPaperSize = LastPageSize,
-
-        // Convenience overloads for naming consistency
-        AnsiA = Letter,
-        AnsiB = Ledger,
-        EnvelopeC5 = C5E,
-        EnvelopeDL = DLE,
-        Envelope10 = Comm10E
-    };
-
     // keep in sync with QPdfEngine::PdfVersion!
     enum PdfVersion { PdfVersion_1_4, PdfVersion_A1b, PdfVersion_1_6 };
 
-    // ### Qt6 Make these virtual
-    bool setPageLayout(const QPageLayout &pageLayout);
-    bool setPageSize(const QPageSize &pageSize);
-    bool setPageOrientation(QPageLayout::Orientation orientation);
-    bool setPageMargins(const QMarginsF &margins);
-    bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units);
+    virtual bool setPageLayout(const QPageLayout &pageLayout);
+    virtual bool setPageSize(const QPageSize &pageSize);
+    virtual bool setPageOrientation(QPageLayout::Orientation orientation);
+    virtual bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units = QPageLayout::Millimeter);
     QPageLayout pageLayout() const;
 
-#if QT_DEPRECATED_SINCE(5,15)
-    QT_DEPRECATED_VERSION_X_5_15("Use setPageSize(QPageSize) instead.")
-    virtual void setPageSize(PageSize size);
-    QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().pageSize().id() instead.")
-    PageSize pageSize() const;
-
-    QT_DEPRECATED_VERSION_X_5_15("Use setPageSize(QPageSize) instead.")
-    virtual void setPageSizeMM(const QSizeF &size);
-    QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().pageSize() instead.")
-    QSizeF pageSizeMM() const;
-#endif
-
-#if QT_DEPRECATED_SINCE(5,15)
-    QT_DEPRECATED_VERSION_X_5_15("Use setPageMargins(QMarginsF, QPageLayout::Unit) instead.")
-    virtual void setMargins(const QMarginsF &margins);
-    QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().margins() instead.")
-    QMarginsF margins() const;
-#endif
-
 protected:
     QPagedPaintDevice(QPagedPaintDevicePrivate *dd);
     QPagedPaintDevicePrivate *dd();
-    QT_DEPRECATED QPageLayout devicePageLayout() const;
-    QT_DEPRECATED QPageLayout &devicePageLayout();
     friend class QPagedPaintDevicePrivate;
     QPagedPaintDevicePrivate *d;
 };