1 files changed, 10 insertions, 8 deletions
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index b1d5d8c38f..3c19e25c64 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -28,7 +28,9 @@
 #include <QtWidgets/qformlayout.h>
 #include <QtWidgets/qlabel.h>
 
-static void initResources()
+#include <QtCore/qpointer.h>
+
+static void _q_ppd_initResources()
 {
     static bool resourcesInitialized = false;
     if (!resourcesInitialized) {
@@ -61,7 +63,7 @@ public:
     {
         bool replacePercent = false;
         if (input.endsWith(u'%')) {
-            input = input.left(input.length() - 1);
+            input = input.left(input.size() - 1);
             replacePercent = true;
         }
         State state = QDoubleValidator::validate(input, pos);
@@ -192,7 +194,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
 {
     Q_Q(QPrintPreviewDialog);
 
-    initResources();
+    _q_ppd_initResources();
 
     if (_printer) {
         preview = new QPrintPreviewWidget(_printer, q);
@@ -248,7 +250,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
     QWidget *pageEdit = new QWidget(toolbar);
     QVBoxLayout *vboxLayout = new QVBoxLayout;
     vboxLayout->setContentsMargins(0, 0, 0, 0);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // We query the widgets about their size and then we fix the size.
     // This should do the trick for the laying out part...
     QSize pageNumEditSize, pageNumLabelSize;
@@ -258,7 +260,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
     pageNumLabel->resize(pageNumLabelSize);
 #endif
     QFormLayout *formLayout = new QFormLayout;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // We have to change the growth policy in Mac.
     formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 #endif
@@ -308,7 +310,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
     q->setWindowTitle(caption);
 
     if (!printer->isValid()
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(Q_OS_APPLE)
         || printer->outputFormat() != QPrinter::NativeFormat
 #endif
         )
@@ -450,7 +452,7 @@ void QPrintPreviewDialogPrivate::updatePageNumLabel()
     Q_Q(QPrintPreviewDialog);
 
     int numPages = preview->pageCount();
-    int maxChars = QString::number(numPages).length();
+    int maxChars = QString::number(numPages).size();
     pageNumLabel->setText(QString::fromLatin1("/ %1").arg(numPages));
     int cyphersWidth = q->fontMetrics().horizontalAdvance(QString().fill(u'8', maxChars));
     int maxWidth = pageNumEdit->minimumSizeHint().width() + cyphersWidth;
@@ -537,7 +539,7 @@ void QPrintPreviewDialogPrivate::_q_print()
 {
     Q_Q(QPrintPreviewDialog);
 
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(Q_OS_APPLE)
     if (printer->outputFormat() != QPrinter::NativeFormat) {
         QString title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PDF");
         QString suffix = ".pdf"_L1;