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ø --- .../printsupport/kernel/qprinter/tst_qprinter.cpp | 36 ++-------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'tests/auto/printsupport/kernel') diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index d6c236e76e..fef7c4905d 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -65,7 +65,6 @@ private slots: #if QT_CONFIG(printer) void testPageRectAndPaperRect(); void testPageRectAndPaperRect_data(); - void testSetOptions(); void testMargins_data(); void testMargins(); void testPageSetupDialog(); @@ -135,8 +134,6 @@ void tst_QPrinter::initTestCase() #if QT_CONFIG(printer) -#define MYCOMPARE(a, b) QCOMPARE(QVariant((int)a), QVariant((int)b)) - void tst_QPrinter::testPageSetupDialog() { // Make sure this doesn't crash at least @@ -259,33 +256,6 @@ void tst_QPrinter::testPageRectAndPaperRect() QVERIFY(printer->pageLayout().orientation() != QPageLayout::Portrait || pageRect.width() < pageRect.height()); } -void tst_QPrinter::testSetOptions() -{ - QPrinter prn; - QPrintDialog dlg(&prn); - - // Verify default values - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions(QAbstractPrintDialog::PrintPageRange); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions((QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection - | QAbstractPrintDialog::PrintPageRange))); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions(QAbstractPrintDialog::PrintSelection); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), false); -} - void tst_QPrinter::testMargins_data() { QTest::addColumn("printer"); @@ -556,7 +526,7 @@ void tst_QPrinter::printDialogCompleter() if (dialog.printer()->outputFormat() != QPrinter::NativeFormat) QSKIP("Dialog cannot be used with non-native formats"); #endif - dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile); + dialog.setOption(QAbstractPrintDialog::PrintToFile); dialog.show(); QVERIFY(QTest::qWaitForWindowActive(&dialog)); @@ -625,11 +595,11 @@ void tst_QPrinter::testCurrentPage() QPrintDialog dialog(&printer); // Test default Current Page option to off - QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), false); + QVERIFY(!dialog.testOption(QPrintDialog::PrintCurrentPage)); // Test enable Current Page option dialog.setOption(QPrintDialog::PrintCurrentPage); - QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), true); + QVERIFY(dialog.testOption(QPrintDialog::PrintCurrentPage)); } -- cgit v1.2.3