diff options
Diffstat (limited to 'src/network/socket/qtcpserver.cpp')
-rw-r--r-- | src/network/socket/qtcpserver.cpp | 61 |
1 files changed, 16 insertions, 45 deletions
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index ad3d529a3e..b41d207947 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -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(); - void closeNotification() { 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 |