From 9793d5e6a20584063e5b708501089a8bebb68e41 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 21 Dec 2020 15:52:34 +0200 Subject: [PATCH] Remove deprecated QPrinter methods. --- src/app/valentina/mainwindowsnogui.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 6218ace49..ad47d5acb 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -834,8 +834,9 @@ void MainWindowsNoGUI::PrintPages(QPrinter *printer) // Get printer rect acording to our dpi. const QRectF printerPageRect(0, 0, ToPixel(printer->pageRect(QPrinter::Millimeter).width(), Unit::Mm), ToPixel(printer->pageRect(QPrinter::Millimeter).height(), Unit::Mm)); - const double xscale = printer->pageRect().width() / printerPageRect.width(); - const double yscale = printer->pageRect().height() / printerPageRect.height(); + const QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution()); + const double xscale = pageRect.width() / printerPageRect.width(); + const double yscale = pageRect.height() / printerPageRect.height(); QPainter painter; if (not painter.begin(printer)) @@ -1286,7 +1287,7 @@ void MainWindowsNoGUI::PdfFile(const QString &name, QGraphicsRectItem *paper, QG printer.setDocName(FileName()); const QRectF r = paper->rect(); printer.setResolution(static_cast(PrintDPI)); - printer.setOrientation(QPrinter::Portrait); + printer.setPageOrientation(QPageLayout::Portrait); printer.setFullPage(ignorePrinterFields); qreal width = FromPixel(r.width() * m_dialogSaveLayout->GetXScale() + margins.left() + margins.right(), Unit::Mm); @@ -1707,7 +1708,7 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr printer->setCreator(QGuiApplication::applicationDisplayName()+QChar(QChar::Space)+ QCoreApplication::applicationVersion()); - printer->setOrientation(isLayoutPortrait ? QPrinter::Portrait : QPrinter::Landscape); + printer->setPageOrientation(isLayoutPortrait ? QPageLayout::Portrait : QPageLayout::Landscape); if (not isTiled) {