QTcpServerPrivate: move class definition to the separate header

This allows further QTcpServer inheritance in library. Also,
add protected c'tor for this purpose.

Change-Id: I1a5c0cdedd64bcd41b028e09d7752248506296c7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 9 insertions, 38 deletions

diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index abb00ed9db..dd916ad5c0 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -92,7 +92,8 @@
 */
 
 #include "qtcpserver.h"
-#include "private/qobject_p.h"
+#include "qtcpserver_p.h"
+
 #include "qalgorithms.h"
 #include "qhostaddress.h"
 #include "qlist.h"
@@ -108,43 +109,6 @@ QT_BEGIN_NAMESPACE
         return returnValue; \
     } } while (0)
 
-class QTcpServerPrivate : public QObjectPrivate, public QAbstractSocketEngineReceiver
-{
-    Q_DECLARE_PUBLIC(QTcpServer)
-public:
-    QTcpServerPrivate();
-    ~QTcpServerPrivate();
-
-    QList<QTcpSocket *> pendingConnections;
-
-    quint16 port;
-    QHostAddress address;
-
-    QAbstractSocket::SocketState state;
-    QAbstractSocketEngine *socketEngine;
-
-    QAbstractSocket::SocketError serverSocketError;
-    QString serverSocketErrorString;
-
-    int maxConnections;
-
-#ifndef QT_NO_NETWORKPROXY
-    QNetworkProxy proxy;
-    QNetworkProxy resolveProxy(const QHostAddress &address, quint16 port);
-#endif
-
-    // from QAbstractSocketEngineReceiver
-    void readNotification() Q_DECL_OVERRIDE;
-    void closeNotification() Q_DECL_OVERRIDE { readNotification(); }
-    inline void writeNotification() {}
-    inline void exceptionNotification() {}
-    inline void connectionNotification() {}
-#ifndef QT_NO_NETWORKPROXY
-    inline void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) {}
-#endif
-
-};
-
 /*! \internal
 */
 QTcpServerPrivate::QTcpServerPrivate()
@@ -257,6 +221,13 @@ QTcpServer::~QTcpServer()
     close();
 }
 
+/*! \internal
+*/
+QTcpServer::QTcpServer(QTcpServerPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+}
+
 /*!
     Tells the server to listen for incoming connections on address \a
     address and port \a port. If \a port is 0, a port is chosen