summaryrefslogtreecommitdiff
path: root/src/serialport/qserialport_win_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/serialport/qserialport_win_p.h')
-rw-r--r--src/serialport/qserialport_win_p.h28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h
index 461226b..f6c3b0a 100644
--- a/src/serialport/qserialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -45,18 +45,14 @@
#include "qserialport_p.h"
+#include <QtCore/qhash.h>
+
#include <qt_windows.h>
-#ifndef Q_OS_WINCE
-#include <QtCore/qhash.h>
QT_BEGIN_NAMESPACE
+
class QWinEventNotifier;
class QTimer;
-#else
-#include <QtCore/qmutex.h>
-QT_BEGIN_NAMESPACE
-class QThread;
-#endif
class QSerialPortPrivate : public QSerialPortPrivateData
{
@@ -94,7 +90,7 @@ public:
void processIoErrors(bool error);
QSerialPort::SerialPortError decodeSystemError() const;
-#ifndef Q_OS_WINCE
+
void _q_completeAsyncCommunication();
void _q_completeAsyncRead();
void _q_completeAsyncWrite();
@@ -105,10 +101,6 @@ public:
bool emulateErrorPolicy();
void emitReadyRead();
-#else
- bool notifyRead();
- bool notifyWrite();
-#endif
static QString portNameToSystemLocation(const QString &port);
static QString portNameFromSystemLocation(const QString &location);
@@ -124,8 +116,6 @@ public:
COMMTIMEOUTS restoredCommTimeouts;
HANDLE handle;
bool parityErrorOccurred;
-
-#ifndef Q_OS_WINCE
QByteArray readChunkBuffer;
bool readyReadEmitted;
bool writeStarted;
@@ -138,23 +128,13 @@ public:
OVERLAPPED writeCompletionOverlapped;
DWORD originalEventMask;
DWORD triggeredEventMask;
-#else
- QThread *eventNotifier;
- QMutex settingsChangeMutex;
-#endif
private:
bool updateDcb();
bool updateCommTimeouts();
-#ifndef Q_OS_WINCE
bool waitAnyEvent(int msecs, bool *timedOut, HANDLE *triggeredEvent);
-#else
- bool waitForReadOrWrite(bool *selectForRead, bool *selectForWrite,
- bool checkRead, bool checkWrite,
- int msecs, bool *timedOut);
-#endif
};