From dbeb748de30bcc0e0615d21c593b761408404950 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Mon, 29 May 2017 17:35:58 +0200 Subject: Convert features.printdialog to QT_[REQUIRE_]CONFIG Change-Id: Ifb016ae2a0986b436f788b34513c81ea91f3804a Reviewed-by: Oswald Buddenhagen --- examples/touch/fingerpaint/scribblearea.cpp | 9 ++++++--- examples/widgets/dialogs/licensewizard/licensewizard.cpp | 7 ++++++- examples/widgets/graphicsview/chip/view.cpp | 7 ++++++- examples/widgets/itemviews/pixelator/mainwindow.cpp | 7 +++++-- examples/widgets/itemviews/spreadsheet/spreadsheet.cpp | 9 +++++++-- examples/widgets/mainwindows/dockwidgets/mainwindow.cpp | 7 +++++-- examples/widgets/painting/fontsampler/mainwindow.cpp | 9 ++++++++- examples/widgets/painting/fontsampler/mainwindow.h | 2 -- examples/widgets/richtext/orderform/mainwindow.cpp | 7 +++++-- examples/widgets/richtext/textedit/textedit.cpp | 13 ++++++++++--- examples/widgets/widgets/imageviewer/imageviewer.cpp | 7 +++++-- examples/widgets/widgets/scribble/scribblearea.cpp | 9 ++++++--- 12 files changed, 69 insertions(+), 24 deletions(-) (limited to 'examples') diff --git a/examples/touch/fingerpaint/scribblearea.cpp b/examples/touch/fingerpaint/scribblearea.cpp index f8dadb4829..aa4e60c934 100644 --- a/examples/touch/fingerpaint/scribblearea.cpp +++ b/examples/touch/fingerpaint/scribblearea.cpp @@ -49,10 +49,13 @@ ****************************************************************************/ #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include #endif +#endif #include "scribblearea.h" @@ -167,7 +170,7 @@ void ScribbleArea::resizeImage(QImage *image, const QSize &newSize) //! [21] void ScribbleArea::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer(QPrinter::HighResolution); QPrintDialog printDialog(&printer, this); @@ -181,7 +184,7 @@ void ScribbleArea::print() painter.setWindow(image.rect()); painter.drawImage(0, 0, image); } -#endif // QT_NO_PRINTER +#endif // QT_CONFIG(printdialog) } //! [22] diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.cpp b/examples/widgets/dialogs/licensewizard/licensewizard.cpp index 6dbb894ad8..c082afa876 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.cpp +++ b/examples/widgets/dialogs/licensewizard/licensewizard.cpp @@ -49,8 +49,13 @@ ****************************************************************************/ #include +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include +#endif +#endif #include "licensewizard.h" @@ -364,7 +369,7 @@ void ConclusionPage::setVisible(bool visible) void ConclusionPage::printButtonClicked() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer; QPrintDialog dialog(&printer, this); if (dialog.exec()) diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index 62aa25b575..79b173bec7 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -50,8 +50,13 @@ #include "view.h" +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include +#endif +#endif #ifndef QT_NO_OPENGL #include #else @@ -259,7 +264,7 @@ void View::toggleAntialiasing() void View::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer; QPrintDialog dialog(&printer, this); if (dialog.exec() == QDialog::Accepted) { diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp index 2a5b572344..63617f0169 100644 --- a/examples/widgets/itemviews/pixelator/mainwindow.cpp +++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp @@ -53,10 +53,13 @@ #include "pixeldelegate.h" #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include #endif +#endif //! [0] MainWindow::MainWindow() @@ -164,7 +167,7 @@ void MainWindow::openImage(const QString &fileName) void MainWindow::printImage() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) if (model->rowCount(QModelIndex())*model->columnCount(QModelIndex()) > 90000) { QMessageBox::StandardButton answer; answer = QMessageBox::question(this, tr("Large Image Size"), diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp index e894d7fbd4..621f655b02 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp @@ -49,11 +49,16 @@ ****************************************************************************/ #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include +#endif +#if QT_CONFIG(printpreviewdialog) #include #endif +#endif #include "spreadsheet.h" #include "spreadsheetdelegate.h" @@ -637,7 +642,7 @@ QString encode_pos(int row, int col) void SpreadSheet::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printpreviewdialog) QPrinter printer(QPrinter::ScreenResolution); QPrintPreviewDialog dlg(&printer); PrintView view; diff --git a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp index eb5864c818..47a6e78265 100644 --- a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp @@ -50,9 +50,12 @@ //! [0] #include -#ifndef QT_NO_PRINTDIALOG +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #endif +#endif #include "mainwindow.h" //! [0] @@ -125,7 +128,7 @@ void MainWindow::newLetter() //! [3] void MainWindow::print() { -#ifndef QT_NO_PRINTDIALOG +#if QT_CONFIG(printdialog) QTextDocument *document = textEdit->document(); QPrinter printer; diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 192ffbd369..bd15438df9 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -50,8 +50,15 @@ #include #if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) +#include +#include +#if QT_CONFIG(printpreviewdialog) #include #endif +#endif +#endif #include "mainwindow.h" @@ -270,7 +277,7 @@ void MainWindow::printDocument(QPrinter *printer) void MainWindow::on_printPreviewAction_triggered() { -#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog) +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printpreviewdialog) pageMap = currentPageMap(); if (pageMap.count() == 0) diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h index 8f59e1021b..ffb2839ffa 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.h +++ b/examples/widgets/painting/fontsampler/mainwindow.h @@ -52,8 +52,6 @@ #define MAINWINDOW_H #include "ui_mainwindowbase.h" -#include -#include #if defined(QT_PRINTSUPPORT_LIB) #include diff --git a/examples/widgets/richtext/orderform/mainwindow.cpp b/examples/widgets/richtext/orderform/mainwindow.cpp index 35934bee72..030072978e 100644 --- a/examples/widgets/richtext/orderform/mainwindow.cpp +++ b/examples/widgets/richtext/orderform/mainwindow.cpp @@ -49,10 +49,13 @@ ****************************************************************************/ #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include #endif +#endif #include "detailsdialog.h" #include "mainwindow.h" @@ -245,7 +248,7 @@ void MainWindow::openDialog() //! [17] void MainWindow::printFile() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QTextEdit *editor = static_cast(letters->currentWidget()); //! [18] QPrinter printer; diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 140ae478ff..fe4ee4f499 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -71,11 +71,18 @@ #include #include #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printer) +#if QT_CONFIG(printdialog) #include +#endif #include +#if QT_CONFIG(printpreviewdialog) #include #endif +#endif +#endif #include "textedit.h" @@ -474,7 +481,7 @@ bool TextEdit::fileSaveAs() void TextEdit::filePrint() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer(QPrinter::HighResolution); QPrintDialog *dlg = new QPrintDialog(&printer, this); if (textEdit->textCursor().hasSelection()) @@ -488,7 +495,7 @@ void TextEdit::filePrint() void TextEdit::filePrintPreview() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printpreviewdialog) QPrinter printer(QPrinter::HighResolution); QPrintPreviewDialog preview(&printer, this); connect(&preview, &QPrintPreviewDialog::paintRequested, this, &TextEdit::printPreview); diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index f2570c18c1..327abf7e43 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -49,9 +49,12 @@ ****************************************************************************/ #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #endif +#endif #include "imageviewer.h" @@ -180,7 +183,7 @@ void ImageViewer::print() //! [5] //! [6] { Q_ASSERT(imageLabel->pixmap()); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) //! [6] //! [7] QPrintDialog dialog(&printer, this); //! [7] //! [8] diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp index 2ae7ee027b..d32a29697b 100644 --- a/examples/widgets/widgets/scribble/scribblearea.cpp +++ b/examples/widgets/widgets/scribble/scribblearea.cpp @@ -49,10 +49,13 @@ ****************************************************************************/ #include -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include +#if QT_CONFIG(printdialog) #include #include #endif +#endif #include "scribblearea.h" @@ -210,7 +213,7 @@ void ScribbleArea::resizeImage(QImage *image, const QSize &newSize) //! [21] void ScribbleArea::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer(QPrinter::HighResolution); QPrintDialog printDialog(&printer, this); @@ -224,6 +227,6 @@ void ScribbleArea::print() painter.setWindow(image.rect()); painter.drawImage(0, 0, image); } -#endif // QT_NO_PRINTER +#endif // QT_CONFIG(printdialog) } //! [22] -- cgit v1.2.3