From fcc25b11bbb8393ef3e0738bee107d52ea553111 Mon Sep 17 00:00:00 2001
From: Marcel Krems <m.krems@software-vision.eu>
Date: Mon, 24 Aug 2020 20:48:06 +0200
Subject: QPrinterInfo: Remove deprecated methods

Change-Id: I5089bc23308a4348dc21122dfa000d5ca6e3938d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/printsupport/kernel/qprinterinfo.cpp | 45 --------------------------------
 src/printsupport/kernel/qprinterinfo.h   |  5 ----
 2 files changed, 50 deletions(-)

(limited to 'src/printsupport/kernel')

diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp
index 167b2361ef..c285f9afc5 100644
--- a/src/printsupport/kernel/qprinterinfo.cpp
+++ b/src/printsupport/kernel/qprinterinfo.cpp
@@ -313,51 +313,6 @@ QPageSize QPrinterInfo::maximumPhysicalPageSize() const
     return QPageSize(d->m_printDevice.maximumPhysicalPageSize(), QString(), QPageSize::ExactMatch);
 }
 
-#if QT_DEPRECATED_SINCE(5,3)
-/*!
-    \obsolete Use supportedPageSizes() instead.
-
-    Returns a list of supported paper sizes by the printer.
-
-    Not all printer drivers support this query, so the list may be empty.
-
-    \since 4.4
-*/
-
-QList<QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const
-{
-    Q_D(const QPrinterInfo);
-    QList<QPrinter::PaperSize> list;
-    const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes();
-    list.reserve(supportedPageSizes.size());
-    for (const QPageSize &pageSize : supportedPageSizes)
-        list.append(QPrinter::PaperSize(pageSize.id()));
-    return list;
-}
-
-/*!
-    \obsolete Use supportedPageSizes() instead.
-
-    Returns a list of all the paper names supported by the driver with the
-    corresponding size in millimeters.
-
-    Not all printer drivers support this query, so the list may be empty.
-
-    \since 5.1
-*/
-
-QList<QPair<QString, QSizeF> > QPrinterInfo::supportedSizesWithNames() const
-{
-    Q_D(const QPrinterInfo);
-    QList<QPair<QString, QSizeF> > list;
-    const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes();
-    list.reserve(supportedPageSizes.size());
-    for (const QPageSize &pageSize : supportedPageSizes)
-        list.append(qMakePair(pageSize.name(), pageSize.size(QPageSize::Millimeter)));
-    return list;
-}
-#endif // QT_DEPRECATED_SINCE(5,3)
-
 /*!
     Returns a list of resolutions supported by this printer.
 
diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h
index 7195cb76b5..f97b79b486 100644
--- a/src/printsupport/kernel/qprinterinfo.h
+++ b/src/printsupport/kernel/qprinterinfo.h
@@ -83,11 +83,6 @@ public:
     QPageSize minimumPhysicalPageSize() const;
     QPageSize maximumPhysicalPageSize() const;
 
-#if QT_DEPRECATED_SINCE(5,3)
-    QT_DEPRECATED QList<QPrinter::PaperSize> supportedPaperSizes() const;
-    QT_DEPRECATED QList<QPair<QString, QSizeF> > supportedSizesWithNames() const;
-#endif // QT_DEPRECATED_SINCE(5,3)
-
     QList<int> supportedResolutions() const;
 
     QPrinter::DuplexMode defaultDuplexMode() const;
-- 
cgit v1.2.3