AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove qt_windows.h from qwinoverlappedionotifier_p.h

Browse Source 
Preparation for making QWinOverlappedIoNotifier public.

Change-Id: Id443514a134b5c13e64d4d89450a7912ab38d40f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2014-01-08 13:18:17 +01:00 committed by The Qt Project
parent 022f0a020a
commit 5ca6039b77
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/io/qwindowspipereader.cpp
View File

@ -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;

2
src/corelib/io/qwindowspipereader_p.h
View File

@ -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);

5
src/corelib/io/qwinoverlappedionotifier.cpp
View File

@ -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;

9
src/corelib/io/qwinoverlappedionotifier_p.h
View File

@ -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

1
tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
View File

@ -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