From 8c7f1ba233914e05a8f1f11a7b25e0a7398aa32d Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sourceforge.net>
Date: Fri, 7 Oct 2011 16:17:42 +0300
Subject: [PATCH] Win32: Fixed build

---
 doomsday/libdeng2/src/data/writer.cpp       | 7 ++++---
 doomsday/libdeng2/src/legacy/legacycore.cpp | 2 +-
 doomsday/libdeng2/src/net/socket.cpp        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doomsday/libdeng2/src/data/writer.cpp b/doomsday/libdeng2/src/data/writer.cpp
index 4e03f32ebd..781897ae10 100644
--- a/doomsday/libdeng2/src/data/writer.cpp
+++ b/doomsday/libdeng2/src/data/writer.cpp
@@ -23,6 +23,7 @@
 #include "de/ISerializable"
 #include "de/FixedByteArray"
 #include "de/data/byteorder.h"
+#include <QScopedPointer>
 
 using namespace de;
 
@@ -143,9 +144,9 @@ Writer& Writer::operator << (const FixedByteArray& fixedByteArray)
     
     // Read the entire contents of the array.
     const dsize size = fixedByteArray.size();
-    std::auto_ptr<IByteArray::Byte> data(new IByteArray::Byte[size]);
-    fixedByteArray.get(0, data.get(), size);
-    _destination.set(_fixedOffset + _offset, data.get(), size);
+    QScopedPointer<IByteArray::Byte> data(new IByteArray::Byte[size]);
+    fixedByteArray.get(0, data.data(), size);
+    _destination.set(_fixedOffset + _offset, data.data(), size);
     _offset += size;
     return *this;
 }
diff --git a/doomsday/libdeng2/src/legacy/legacycore.cpp b/doomsday/libdeng2/src/legacy/legacycore.cpp
index ac455e42ab..c8537015e0 100644
--- a/doomsday/libdeng2/src/legacy/legacycore.cpp
+++ b/doomsday/libdeng2/src/legacy/legacycore.cpp
@@ -62,7 +62,7 @@ LegacyCore::~LegacyCore()
 
 int LegacyCore::runEventLoop(void (*func)(void))
 {
-    LOG_AS("LegacyCore::runEventLoop");
+    LOG_AS("LegacyCore");
     LOG_MSG("Starting event loop...");
 
     // Set up a timer to periodically call the provided callback function.
diff --git a/doomsday/libdeng2/src/net/socket.cpp b/doomsday/libdeng2/src/net/socket.cpp
index defda4b2f3..e3b011f2de 100644
--- a/doomsday/libdeng2/src/net/socket.cpp
+++ b/doomsday/libdeng2/src/net/socket.cpp
@@ -294,7 +294,7 @@ void Socket::socketDisconnected()
 
 void Socket::socketError(QAbstractSocket::SocketError /*socketError*/)
 {
-    LOG_AS("Socket::socketError");
+    LOG_AS("Socket");
     LOG_WARNING(d->socket->errorString());
 
     emit disconnected(); //error(socketError);