remove qt_windows.h from qwinoverlappedionotifier_p.h

Preparation for making QWinOverlappedIoNotifier public.

Change-Id: Id443514a134b5c13e64d4d89450a7912ab38d40f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

5 files changed, 12 insertions, 8 deletions

diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index fc9d191a90..df65aebcff 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -173,7 +173,8 @@ bool QWindowsPipeReader::canReadLine() const
     \internal
     Will be called whenever the read operation completes.
  */
-void QWindowsPipeReader::notified(DWORD numberOfBytesRead, DWORD errorCode, OVERLAPPED *notifiedOverlapped)
+void QWindowsPipeReader::notified(quint32 numberOfBytesRead, quint32 errorCode,
+                                  OVERLAPPED *notifiedOverlapped)
 {
     if (&overlapped != notifiedOverlapped)
         return;
diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h
index ea3d3c271f..78ac8eb76d 100644
--- a/src/corelib/io/qwindowspipereader_p.h
+++ b/src/corelib/io/qwindowspipereader_p.h
@@ -94,7 +94,7 @@ Q_SIGNALS:
     void pipeClosed();
 
 private Q_SLOTS:
-    void notified(DWORD numberOfBytesRead, DWORD errorCode, OVERLAPPED *notifiedOverlapped);
+    void notified(quint32 numberOfBytesRead, quint32 errorCode, OVERLAPPED *notifiedOverlapped);
 
 private:
     bool completeAsyncRead(DWORD bytesRead, DWORD errorCode);
diff --git a/src/corelib/io/qwinoverlappedionotifier.cpp b/src/corelib/io/qwinoverlappedionotifier.cpp
index a903ebe77a..33583afb78 100644
--- a/src/corelib/io/qwinoverlappedionotifier.cpp
+++ b/src/corelib/io/qwinoverlappedionotifier.cpp
@@ -46,6 +46,7 @@
 #include <qqueue.h>
 #include <qset.h>
 #include <qthread.h>
+#include <qt_windows.h>
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -270,13 +271,13 @@ QWinOverlappedIoNotifier::~QWinOverlappedIoNotifier()
     ReleaseMutex(d->iocpInstanceLock);
 }
 
-void QWinOverlappedIoNotifier::setHandle(HANDLE h)
+void QWinOverlappedIoNotifier::setHandle(Qt::HANDLE h)
 {
     Q_D(QWinOverlappedIoNotifier);
     d->hHandle = h;
 }
 
-HANDLE QWinOverlappedIoNotifier::handle() const
+Qt::HANDLE QWinOverlappedIoNotifier::handle() const
 {
     Q_D(const QWinOverlappedIoNotifier);
     return d->hHandle;
diff --git a/src/corelib/io/qwinoverlappedionotifier_p.h b/src/corelib/io/qwinoverlappedionotifier_p.h
index 545d7bba84..f90fd2e615 100644
--- a/src/corelib/io/qwinoverlappedionotifier_p.h
+++ b/src/corelib/io/qwinoverlappedionotifier_p.h
@@ -54,7 +54,8 @@
 //
 
 #include <qobject.h>
-#include <qt_windows.h>
+
+typedef struct _OVERLAPPED OVERLAPPED;
 
 QT_BEGIN_NAMESPACE
 
@@ -71,14 +72,14 @@ public:
     QWinOverlappedIoNotifier(QObject *parent = 0);
     ~QWinOverlappedIoNotifier();
 
-    void setHandle(HANDLE h);
-    HANDLE handle() const;
+    void setHandle(Qt::HANDLE h);
+    Qt::HANDLE handle() const;
 
     void setEnabled(bool enabled);
     bool waitForNotified(int msecs, OVERLAPPED *overlapped);
 
 Q_SIGNALS:
-    void notified(DWORD numberOfBytes, DWORD errorCode, OVERLAPPED *overlapped);
+    void notified(quint32 numberOfBytes, quint32 errorCode, OVERLAPPED *overlapped);
 #if !defined(Q_QDOC)
     void _q_notify();
 #endif
diff --git a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
index 0944f32443..8321f76bec 100644
--- a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
+++ b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
@@ -42,6 +42,7 @@
 #include <QtTest/QtTest>
 #include <private/qwinoverlappedionotifier_p.h>
 #include <qbytearray.h>
+#include <qt_windows.h>
 
 #ifndef PIPE_REJECT_REMOTE_CLIENTS
 #define PIPE_REJECT_REMOTE_CLIENTS 0x08