summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold Dumas <contact@arnolddumas.fr>2014-10-06 18:02:48 (GMT)
committerArnold Dumas <contact@arnolddumas.fr>2014-10-06 18:02:48 (GMT)
commitd852a7bee096850a698c79dbb41a38d47332a442 (patch)
treec65c254eced7f3752a1adb10d91ee30acbd9beb6
parent6300c30fea213953fa2a052db7cdbfe09bdcab0e (diff)
Use new Q_OS_* macros.
-rw-r--r--core/utils.cpp4
-rw-r--r--generators/poppler/generator_pdf.cpp4
-rw-r--r--part.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/core/utils.cpp b/core/utils.cpp
index 5a26d4a..36c64f3 100644
--- a/core/utils.cpp
+++ b/core/utils.cpp
@@ -26,7 +26,7 @@
#include <QX11Info>
#endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
#include <ApplicationServices/ApplicationServices.h>
#include <IOKit/graphics/IOGraphicsLib.h>
#endif
@@ -188,7 +188,7 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
return res;
}
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MAC)
/*
* Code copied from http://developer.apple.com/qa/qa2001/qa1217.html
*/
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 1a1eeef..2ecd07e 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -81,7 +81,7 @@ class PDFOptionsPage : public QWidget
layout->addWidget(m_forceRaster);
layout->addStretch(1);
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
m_printAnnots->setVisible( false );
#endif
setPrintAnnots( true ); // Default value
@@ -969,7 +969,7 @@ void PDFGenerator::requestFontData(const Okular::FontInfo &font, QByteArray *dat
#define DUMMY_QPRINTER_COPY
bool PDFGenerator::print( QPrinter& printer )
{
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QPainter painter;
painter.begin(&printer);
diff --git a/part.cpp b/part.cpp
index 02bcb1c..d4949b0 100644
--- a/part.cpp
+++ b/part.cpp
@@ -2627,7 +2627,7 @@ void Part::slotPrint()
{
if (m_document->pages() == 0) return;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QPrinter printer(QPrinter::HighResolution);
#else
QPrinter printer;