QtTools/Assistant: Replace Q_WS_ by Q_OS_ where appropriate.

Change-Id: Ifbd9c374a8a7947191528c947ec0f419bcf20081
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

diff --git a/src/assistant/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp
index 28ce2dd..32cc904 100644 (file)
--- a/src/assistant/assistant/aboutdialog.cpp
+++ b/src/assistant/assistant/aboutdialog.cpp
@@ -158,7 +158,7 @@ void AboutDialog::updateSize()
         .size();
     int limit = qMin(screenSize.width()/2, 500);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     limit = qMin(screenSize.width()/2, 420);
 #endif
 

diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index da7d690..474cadb 100644 (file)
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -141,15 +141,15 @@ GlobalActions::GlobalActions(QObject *parent) : QObject(parent)
     connect(m_findAction, SIGNAL(triggered()), centralWidget, SLOT(showTextSearch()));
     m_actionList << m_findAction;
 
-#ifdef Q_WS_X11
-    m_backAction->setIcon(QIcon::fromTheme("go-previous" , m_backAction->icon()));
-    m_nextAction->setIcon(QIcon::fromTheme("go-next" , m_nextAction->icon()));
-    m_zoomInAction->setIcon(QIcon::fromTheme("zoom-in" , m_zoomInAction->icon()));
-    m_zoomOutAction->setIcon(QIcon::fromTheme("zoom-out" , m_zoomOutAction->icon()));
-    m_copyAction->setIcon(QIcon::fromTheme("edit-copy" , m_copyAction->icon()));
-    m_findAction->setIcon(QIcon::fromTheme("edit-find" , m_findAction->icon()));
-    m_homeAction->setIcon(QIcon::fromTheme("go-home" , m_homeAction->icon()));
-    m_printAction->setIcon(QIcon::fromTheme("document-print" , m_printAction->icon()));
+#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
+    m_backAction->setIcon(QIcon::fromTheme(QStringLiteral("go-previous") , m_backAction->icon()));
+    m_nextAction->setIcon(QIcon::fromTheme(QStringLiteral("go-next") , m_nextAction->icon()));
+    m_zoomInAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-in") , m_zoomInAction->icon()));
+    m_zoomOutAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-out") , m_zoomOutAction->icon()));
+    m_copyAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy") , m_copyAction->icon()));
+    m_findAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find") , m_findAction->icon()));
+    m_homeAction->setIcon(QIcon::fromTheme(QStringLiteral("go-home") , m_homeAction->icon()));
+    m_printAction->setIcon(QIcon::fromTheme(QStringLiteral("document-print") , m_printAction->icon()));
 #endif
 }
 

diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 84b867d..4759e4f 100644 (file)
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -530,7 +530,7 @@ void MainWindow::setupActions()
     tmp->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("Ctrl+Alt+Left"))
         << QKeySequence(Qt::CTRL + Qt::Key_PageUp));
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     QShortcut *sct = new QShortcut(QKeySequence(Qt::ALT + Qt::Key_Tab), this);
     connect(sct, SIGNAL(activated()), openPages, SLOT(nextPageWithSwitcher()));
     sct = new QShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_Tab), this);
@@ -548,7 +548,7 @@ void MainWindow::setupActions()
     m_aboutAction = menu->addAction(tr("About..."), this, SLOT(showAboutDialog()));
     m_aboutAction->setMenuRole(QAction::AboutRole);
 
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     m_resetZoomAction->setIcon(QIcon::fromTheme("zoom-original" , m_resetZoomAction->icon()));
     m_syncAction->setIcon(QIcon::fromTheme("view-refresh" , m_syncAction->icon()));
 #endif
@@ -568,7 +568,7 @@ void MainWindow::setupActions()
     navigationBar->addAction(globalActions->zoomOutAction());
     navigationBar->addAction(m_resetZoomAction);
 
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     QMenu *windowMenu = new QMenu(tr("&Window"), this);
     menuBar()->insertMenu(menu->menuAction(), windowMenu);
     windowMenu->addAction(tr("Zoom"), this, SLOT(showMaximized()));

diff --git a/src/assistant/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp
index 04b3fcd..d82ca70 100644 (file)
--- a/src/assistant/assistant/openpagesswitcher.cpp
+++ b/src/assistant/assistant/openpagesswitcher.cpp
@@ -67,7 +67,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
 
     // We disable the frame on this list view and use a QFrame around it instead.
     // This improves the look with QGTKStyle.
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     setFrameStyle(m_openPagesWidget->frameStyle());
 #endif
     m_openPagesWidget->setFrameStyle(QFrame::NoFrame);
@@ -148,7 +148,7 @@ bool OpenPagesSwitcher::eventFilter(QObject *object, QEvent *event)
             }
 
             Qt::KeyboardModifier modifier = Qt::ControlModifier;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
             modifier = Qt::AltModifier;
 #endif
             if (key == Qt::Key_Backtab

diff --git a/src/assistant/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp
index 327b5a5..aae83de 100644 (file)
--- a/src/assistant/assistant/openpageswidget.cpp
+++ b/src/assistant/assistant/openpageswidget.cpp
@@ -52,10 +52,6 @@
 #include <QtWidgets/QMenu>
 #include <QtGui/QPainter>
 
-#ifdef Q_WS_MAC
-#include <qmacstyle_mac.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 OpenPagesDelegate::OpenPagesDelegate(QObject *parent)

diff --git a/src/assistant/assistant/remotecontrol.cpp b/src/assistant/assistant/remotecontrol.cpp
index b93c739..00dd1cc 100644 (file)
--- a/src/assistant/assistant/remotecontrol.cpp
+++ b/src/assistant/assistant/remotecontrol.cpp
@@ -88,7 +88,7 @@ void StdInListenerWin::run()
     char chBuf[4096];
     DWORD dwRead;
 
-#ifndef Q_WS_WINCE
+#ifndef Q_OS_WINCE
     HANDLE hStdin, hStdinDup;
 
     hStdin = GetStdHandle(STD_INPUT_HANDLE);