Add move semantics to Variant

[libs/core.git] / source / io / windows / eventreader.cpp

diff --git a/source/io/windows/eventreader.cpp b/source/io/windows/eventreader.cpp
index 82d9e8c2a297a48dbe202eeace2edfbafc035328..8f208c20dda864c711ad5584697083c3df9b4ade 100644 (file)
--- a/source/io/windows/eventreader.cpp
+++ b/source/io/windows/eventreader.cpp
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <msp/core/winapi.h>
 #include <algorithm>
 #include <msp/core/systemerror.h>
 #include "eventreader.h"
@@ -13,28 +13,25 @@ struct EventReader::Private
 {
        OVERLAPPED overlapped;
        Handle event;
-       unsigned buf_size;
-       char *buffer;
-       unsigned buf_avail;
-       char *buf_next;
-       bool pending;
-       bool eof;
+       size_t buf_size = 0;
+       char *buffer = nullptr;
+       size_t buf_avail = 0;
+       char *buf_next = nullptr;
+       bool pending = false;
+       bool eof = false;
 };
 
 
-EventReader::EventReader(Handle &h, unsigned size):
+EventReader::EventReader(Handle &h, size_t size):
        handle(h),
        priv(new Private)
 {
        memset(&priv->overlapped, 0, sizeof(OVERLAPPED));
-       *priv->event = CreateEvent(0, true, false, 0);
+       *priv->event = CreateEvent(nullptr, true, false, nullptr);
        priv->overlapped.hEvent = *priv->event;
        priv->buf_size = size;
        priv->buffer = new char[priv->buf_size];
-       priv->buf_avail = 0;
        priv->buf_next = priv->buffer;
-       priv->pending = false;
-       priv->eof = false;
 }
 
 EventReader::~EventReader()
@@ -95,7 +92,7 @@ void EventReader::wait()
        }
 }
 
-unsigned EventReader::read(char *buf, unsigned len)
+unsigned EventReader::read(char *buf, size_t len)
 {
        if(!priv->buf_avail)
        {