Merge remote-tracking branch 'origin/5.3' into dev

[contrib/qtwebsockets.git] / src / websockets / qwebsocketserver.h

diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 7e484fb..90e149f 100644 (file)
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Kurt Pattyn <pattyn.kurt@gmail.com>.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtWebSockets module of the Qt Toolkit.
@@ -66,18 +66,18 @@ class Q_WEBSOCKETS_EXPORT QWebSocketServer : public QObject
     Q_DISABLE_COPY(QWebSocketServer)
     Q_DECLARE_PRIVATE(QWebSocketServer)
 
-    Q_ENUMS(SecureMode)
+    Q_ENUMS(SslMode)
 
 public:
-    enum SecureMode {
+    enum SslMode {
 #ifndef QT_NO_SSL
-        SECURE_MODE,
+        SecureMode,
 #endif
-        NON_SECURE_MODE
+        NonSecureMode
     };
 
-    explicit QWebSocketServer(const QString &serverName, SecureMode secureMode,
-                              QObject *parent = Q_NULLPTR);
+    explicit QWebSocketServer(const QString &serverName, SslMode secureMode,
+                              QObject *parent = 0);
     virtual ~QWebSocketServer();
 
     bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0);
@@ -90,8 +90,9 @@ public:
 
     quint16 serverPort() const;
     QHostAddress serverAddress() const;
+    QUrl serverUrl() const;
 
-    SecureMode secureMode() const;
+    SslMode secureMode() const;
 
     bool setSocketDescriptor(int socketDescriptor);
     int socketDescriptor() const;
@@ -118,8 +119,6 @@ public:
 #endif
 
     QList<QWebSocketProtocol::Version> supportedVersions() const;
-    QStringList supportedProtocols() const;
-    QStringList supportedExtensions() const;
 
 Q_SIGNALS:
     void acceptError(QAbstractSocket::SocketError socketError);
@@ -133,9 +132,6 @@ Q_SIGNALS:
     void sslErrors(const QList<QSslError> &errors);
 #endif
     void closed();
-
-private:
-    QWebSocketServerPrivate * const d_ptr;
 };
 
 QT_END_NAMESPACE