From 4b566e5db926470499bb9171b336f5e526e40bba Mon Sep 17 00:00:00 2001
From: Olli Werwolff <qt-info@nokia.com>
Date: Wed, 8 Jun 2011 11:48:38 +0200
Subject: [PATCH] Most checks for windows in widgets have to be ws specific

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
---
 src/widgets/kernel/qgesturemanager.cpp | 4 ++--
 src/widgets/styles/qwindowsstyle.cpp   | 4 ++--
 src/widgets/widgets/qdockwidget.cpp    | 6 +++---
 src/widgets/widgets/qtoolbar.cpp       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index 868387d..d3d34c2 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -53,7 +53,7 @@
 #ifdef Q_WS_MAC
 #include "qmacgesturerecognizer_mac_p.h"
 #endif
-#if defined(Q_OS_WIN) && !defined(QT_NO_NATIVE_GESTURES)
+#if defined(Q_WS_WIN) && !defined(QT_NO_NATIVE_GESTURES)
 #include "qwinnativepangesturerecognizer_win_p.h"
 #endif
 
@@ -87,7 +87,7 @@ QGestureManager::QGestureManager(QObject *parent)
     registerGestureRecognizer(new QSwipeGestureRecognizer);
     registerGestureRecognizer(new QTapGestureRecognizer);
 #endif
-#if defined(Q_OS_WIN)
+#if defined(Q_WS_WIN)
   #if !defined(QT_NO_NATIVE_GESTURES)
     if (QApplicationPrivate::HasTouchSupport)
         registerGestureRecognizer(new QWinNativePanGestureRecognizer);
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index c099273..d1d3865 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -918,7 +918,7 @@ static const char *const question_xpm[] = {
 
 #endif //QT_NO_IMAGEFORMAT_XPM
 
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
 static QPixmap loadIconFromShell32( int resourceId, int size )
 {
 #ifdef Q_OS_WINCE
@@ -3256,7 +3256,7 @@ QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, con
 {
     QIcon icon;
     QPixmap pixmap;
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
     switch (standardIcon) {
     case SP_FileDialogNewFolder:
     {
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 6e37683..53e007a 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -854,7 +854,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
             && (event->pos() - state->pressPos).manhattanLength()
                 > QApplication::startDragDistance()) {
             startDrag();
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
             grabMouseWhileInWindow();
 #else
             q->grabMouse();
@@ -925,7 +925,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
             initDrag(event->pos(), true);
             if (state == 0)
                 break;
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
             // On Windows, NCA mouse events don't contain modifier info
             state->ctrlDrag = GetKeyState(VK_CONTROL) & 0x8000;
 #else
@@ -1433,7 +1433,7 @@ bool QDockWidget::event(QEvent *event)
         if (d->mouseMoveEvent(static_cast<QMouseEvent *>(event)))
             return true;
         break;
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
     case QEvent::Leave:
         if (d->state != 0 && d->state->dragging && !d->state->nca) {
             // This is a workaround for loosing the mouse on Vista.
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index e0e8ce6..7527baa 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -354,7 +354,7 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event)
 
             startDrag(moving);
             if (!moving && !wasDragging) {
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
                 grabMouseWhileInWindow();
 #else
                 q->grabMouse();
-- 
2.7.4