doc: update QPrinter docs for clangqdoc

The docs for QPrinter contained a use of Q_QDoc to
declare an enum representing paper sizes for different
printers, but this special declaration for qdoc was
no longer needed, so it was removed. The real declaration
is in QPagedPaintDevice, which is the public base class
of QPrinter, and it is documented there. A few other
uses of Q_QDOC were examined and either removed or
upgraded to Q_CLANG_QDOC. One use of Q_OS_WIN was
changed to also be included for Q_CLANG_QDOC.

Change-Id: If6d810c624aa8d659fd0e3e753ba666d4d42ef83
Reviewed-by: Martin Smith <martin.smith@qt.io>

1 files changed, 3 insertions, 156 deletions

diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h
index 4650d5432a..33a2d4dbc8 100644
--- a/src/printsupport/kernel/qprinter.h
+++ b/src/printsupport/kernel/qprinter.h
@@ -77,161 +77,7 @@ public:
     enum Orientation { Portrait, Landscape };
 
     // ### Qt6 Remove in favor of QPage::PageSize
-    // NOTE: Must keep in sync with QPageSize and QPagedPaintDevice
-#ifndef Q_QDOC
     typedef PageSize PaperSize;
-#else
-    enum PaperSize {
-        // 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
-    };
-#endif
 
     enum PageOrder   { FirstPageFirst,
                        LastPageFirst };
@@ -305,7 +151,8 @@ public:
     void setCreator(const QString &);
     QString creator() const;
 
-#ifdef Q_QDOC
+#ifdef Q_CLANG_QDOC
+    // ### Qt6 Remove when these are made virtual in QPagedPaintDevice
     bool setPageLayout(const QPageLayout &pageLayout);
     bool setPageSize(const QPageSize &pageSize);
     bool setPageOrientation(QPageLayout::Orientation orientation);
@@ -366,7 +213,7 @@ public:
 
     QList<int> supportedResolutions() const;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
     QList<PaperSource> supportedPaperSources() const;
 #endif