diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-01-19 13:58:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 22:40:19 +0100 |
| commit | 281647a7efcc122c87d65518d9d8fbf259a3803a (patch) | |
| tree | d3b556a2faecea0309a3352a90e310522da306ef /src/websockets/qwebsocketserver_p.cpp | |
| parent | f8b27c6b833ee796193ae115cb87574cb0e4df4c (diff) | |
| download | qtwebsockets-281647a7efcc122c87d65518d9d8fbf259a3803a.tar.gz | |
Rename SecureMode to SslMode
Renamed SecureMode to SslMode to be more inline with
QSslSocket.
Change-Id: Id2f0c5ebc1e06fcd7b0ce5059e88520e5f0e6fe5
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketserver_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocketserver_p.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index 4490826..4bf5724 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE \internal */ QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, - QWebSocketServerPrivate::SecureMode secureMode, + QWebSocketServerPrivate::SslMode secureMode, QWebSocketServer * const pWebSocketServer, QObject *parent) : QObject(parent), @@ -74,7 +74,7 @@ QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, m_errorString() { Q_ASSERT(pWebSocketServer); - if (m_secureMode == SecureModeSecure) { + if (m_secureMode == SecureMode) { m_pTcpServer = new QTcpServer(this); if (Q_LIKELY(m_pTcpServer)) connect(m_pTcpServer, &QTcpServer::newConnection, @@ -318,7 +318,7 @@ QString QWebSocketServerPrivate::serverName() const /*! \internal */ -QWebSocketServerPrivate::SecureMode QWebSocketServerPrivate::secureMode() const +QWebSocketServerPrivate::SslMode QWebSocketServerPrivate::secureMode() const { return m_secureMode; } @@ -326,7 +326,7 @@ QWebSocketServerPrivate::SecureMode QWebSocketServerPrivate::secureMode() const #ifndef QT_NO_SSL void QWebSocketServerPrivate::setSslConfiguration(const QSslConfiguration &sslConfiguration) { - if (m_secureMode == SecureModeSecure) + if (m_secureMode == SecureMode) qobject_cast<QSslServer *>(m_pTcpServer)->setSslConfiguration(sslConfiguration); else qWarning() << tr("Cannot set SSL configuration for non-secure server."); @@ -334,7 +334,7 @@ void QWebSocketServerPrivate::setSslConfiguration(const QSslConfiguration &sslCo QSslConfiguration QWebSocketServerPrivate::sslConfiguration() const { - if (m_secureMode == SecureModeSecure) + if (m_secureMode == SecureMode) return qobject_cast<QSslServer *>(m_pTcpServer)->sslConfiguration(); else return QSslConfiguration::defaultConfiguration(); |