From 664bd5adea54a2235414878d9cc4f1197fa2bd53 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Wed, 8 Dec 2010 13:06:14 +0000
Subject: Fix compile errors

including qnativesocketengine_p.h causes link errors

Reviewed-by: Markus Goetz
---
 src/network/socket/qabstractsocket_p.h      | 2 +-
 src/network/socket/qlocalserver_p.h         | 2 +-
 src/network/socket/qlocalsocket_p.h         | 2 +-
 src/network/socket/qsymbiansocketengine.cpp | 1 -
 src/network/socket/qsymbiansocketengine_p.h | 2 --
 src/network/socket/qtcpserver.cpp           | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 8ca83fc..732d609 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -59,7 +59,7 @@
 #include "QtCore/qtimer.h"
 #include "private/qringbuffer_p.h"
 #include "private/qiodevice_p.h"
-#include "private/qnativesocketengine_p.h"
+#include "private/qabstractsocketengine_p.h"
 #include "qnetworkproxy.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 4f92b64..e9c8563 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -65,7 +65,7 @@
 #   include <qt_windows.h>
 #   include <private/qwineventnotifier_p.h>
 #else
-#   include <private/qnativesocketengine_p.h>
+#   include <qabstractsocketengine_p.h>
 #   include <qsocketnotifier.h>
 #endif
 
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 57ca3c2..7b912fb 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -67,7 +67,7 @@
 #   include "private/qringbuffer_p.h"
 #   include <private/qwineventnotifier_p.h>
 #else
-#   include "private/qnativesocketengine_p.h"
+#   include "private/qabstractsocketengine_p.h"
 #   include <qtcpsocket.h>
 #   include <qsocketnotifier.h>
 #   include <errno.h>
diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp
index a937f7c..1d2a11b 100644
--- a/src/network/socket/qsymbiansocketengine.cpp
+++ b/src/network/socket/qsymbiansocketengine.cpp
@@ -63,7 +63,6 @@
 #include <qsocketnotifier.h>
 #include <qnetworkinterface.h>
 
-#include "qnativesocketengine_p.h"
 #include <private/qthread_p.h>
 #include <private/qobject_p.h>
 
diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h
index 0c8bc53..3111442 100644
--- a/src/network/socket/qsymbiansocketengine_p.h
+++ b/src/network/socket/qsymbiansocketengine_p.h
@@ -154,14 +154,12 @@ public:
     ~QSymbianSocketEnginePrivate();
 
     int socketDescriptor;
-#ifdef Q_OS_SYMBIAN
     mutable RSocket nativeSocket;
     // From QtCore:
     RSocketServ& socketServer;
     // From QtCore, check lifetime issues, also should be pulling this out of a QNetworkSession somehow:
     RConnection *connection;
     mutable RTimer selectTimer;
-#endif
 
     QSocketNotifier *readNotifier, *writeNotifier, *exceptNotifier;
 
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 0640c7c..642983f 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -105,7 +105,7 @@
 #include "qhostaddress.h"
 #include "qlist.h"
 #include "qpointer.h"
-#include "qnativesocketengine_p.h"
+#include "qabstractsocketengine_p.h"
 #include "qtcpserver.h"
 #include "qtcpsocket.h"
 #include "qnetworkproxy.h"
-- 
cgit v0.12