From 8186bd628f701744a528d83c22346abcd6c46384 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 7 Sep 2020 10:59:58 +0200 Subject: Remove obsolete APIs and comments from QAbstractPrintDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merging QAbstractPrintDialog with QPrintDialog, as proposed in the removed comment, seems to have little value, given that the platform specific implementations rely on the current abstraction. Adjust examples and tests; with the QAbstractPrintDialog test now testing the QPrintDialog::options API, the corresponding test function can be removed from the QPrinter test. Change-Id: Ia8906627898332e8590ea9b27e3d71dfcc6e8d71 Reviewed-by: Tor Arne Vestbø --- .../tst_qabstractprintdialog.cpp | 77 +++++++++++++++------- 1 file changed, 55 insertions(+), 22 deletions(-) (limited to 'tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp') diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp index 7f874a843d..01772b2d02 100644 --- a/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -33,7 +33,7 @@ #include #include #if QT_CONFIG(printdialog) -#include +#include #include #endif @@ -60,31 +60,63 @@ void tst_QAbstractPrintDialog::initTestCase() #else -class MyAbstractPrintDialog : public QAbstractPrintDialog +class MyPrintDialog : public QPrintDialog { public: - MyAbstractPrintDialog(QPrinter *p) : QAbstractPrintDialog(p) {} + MyPrintDialog(QPrinter *p) + : QPrintDialog(p) + { + } int exec() { return 0; } + + void resetAllOptions() + { + setOption(QAbstractPrintDialog::PrintToFile, false); + setOption(QAbstractPrintDialog::PrintSelection, false); + setOption(QAbstractPrintDialog::PrintPageRange, false); + setOption(QAbstractPrintDialog::PrintShowPageSize, false); + setOption(QAbstractPrintDialog::PrintCollateCopies, false); + setOption(QAbstractPrintDialog::PrintCurrentPage, false); + } }; // Testing get/set functions void tst_QAbstractPrintDialog::getSetCheck() { QPrinter printer; - MyAbstractPrintDialog obj1(&printer); + MyPrintDialog obj1(&printer); QCOMPARE(obj1.printer(), &printer); - // PrintDialogOptions QAbstractPrintDialog::enabledOptions() - // void QAbstractPrintDialog::setEnabledOptions(PrintDialogOptions) - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None)); - QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None), obj1.enabledOptions()); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintToFile)); - QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintToFile), obj1.enabledOptions()); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection)); - QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection), obj1.enabledOptions()); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintPageRange)); - QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintPageRange), obj1.enabledOptions()); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintCollateCopies)); - QCOMPARE(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintCollateCopies), obj1.enabledOptions()); + + // QPrintDialog::options APIs + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile + |QAbstractPrintDialog::PrintPageRange + |QAbstractPrintDialog::PrintShowPageSize + |QAbstractPrintDialog::PrintCollateCopies); + obj1.setOptions(QAbstractPrintDialog::PrintSelection + |QAbstractPrintDialog::PrintCurrentPage); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintSelection + |QAbstractPrintDialog::PrintCurrentPage); + obj1.resetAllOptions(); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintDialogOptions()); + + obj1.setOption(QAbstractPrintDialog::PrintToFile); + QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintToFile)); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile); + obj1.setOption(QAbstractPrintDialog::PrintSelection); + QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintSelection)); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile + |QAbstractPrintDialog::PrintSelection); + obj1.setOption(QAbstractPrintDialog::PrintPageRange); + QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintPageRange)); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile + |QAbstractPrintDialog::PrintSelection + |QAbstractPrintDialog::PrintPageRange); + obj1.setOption(QAbstractPrintDialog::PrintCollateCopies); + QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintCollateCopies)); + QCOMPARE(obj1.options(), QAbstractPrintDialog::PrintToFile + |QAbstractPrintDialog::PrintSelection + |QAbstractPrintDialog::PrintPageRange + |QAbstractPrintDialog::PrintCollateCopies); // PrintRange QAbstractPrintDialog::printRange() // void QAbstractPrintDialog::setPrintRange(PrintRange) @@ -99,22 +131,23 @@ void tst_QAbstractPrintDialog::getSetCheck() void tst_QAbstractPrintDialog::setMinMax() { QPrinter printer; - MyAbstractPrintDialog obj1(&printer); - obj1.setEnabledOptions(QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::None)); + MyPrintDialog obj1(&printer); + obj1.resetAllOptions(); + QCOMPARE(obj1.minPage(), 0); QCOMPARE(obj1.maxPage(), INT_MAX); - QVERIFY(!obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); + QVERIFY(!obj1.testOption(QAbstractPrintDialog::PrintPageRange)); obj1.setMinMax(2,5); QCOMPARE(obj1.minPage(), 2); QCOMPARE(obj1.maxPage(), 5); - QVERIFY(obj1.enabledOptions() & QAbstractPrintDialog::PrintPageRange); - QVERIFY(obj1.isOptionEnabled(QAbstractPrintDialog::PrintPageRange)); + QVERIFY(obj1.options() & QAbstractPrintDialog::PrintPageRange); + QVERIFY(obj1.testOption(QAbstractPrintDialog::PrintPageRange)); } void tst_QAbstractPrintDialog::setFromTo() { QPrinter printer; - MyAbstractPrintDialog obj1(&printer); + MyPrintDialog obj1(&printer); QCOMPARE(obj1.fromPage(), 0); QCOMPARE(obj1.toPage(), 0); obj1.setMinMax(0,0); -- cgit v1.2.3