diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-11-01 23:13:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-01 23:20:39 +0100 |
| commit | b745b1c99ef3474250d122a6b3b36c0302f8279b (patch) | |
| tree | 0e2701aec2e7dccb23a2f91091b07486cf57712d /src | |
| parent | 7a4a44212df348779692c2aaab3efd9a2c40cd29 (diff) | |
Replace qGreater with std::greater
Change-Id: I1c2e2f14bbbd1dfc8dc30d4a0cdff7ded0222113
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsockethandshakerequest_p.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsockethandshakeresponse_p.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsockethandshakeresponse_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/websockets/qwebsockethandshakerequest_p.cpp b/src/websockets/qwebsockethandshakerequest_p.cpp index 5a79bc8..158e7b8 100644 --- a/src/websockets/qwebsockethandshakerequest_p.cpp +++ b/src/websockets/qwebsockethandshakerequest_p.cpp @@ -256,7 +256,7 @@ QTextStream &QWebSocketHandshakeRequest::readFromStream(QTextStream &textStream) m_versions << ver; } } - std::sort(m_versions.begin(), m_versions.end(), qGreater<QWebSocketProtocol::Version>()); //sort in descending order + std::sort(m_versions.begin(), m_versions.end(), std::greater<QWebSocketProtocol::Version>()); //sort in descending order m_key = m_headers.value(QStringLiteral("Sec-WebSocket-Key"), QStringLiteral("")); const QString upgrade = m_headers.value(QStringLiteral("Upgrade"), QStringLiteral("")); //must be equal to "websocket", case-insensitive const QString connection = m_headers.value(QStringLiteral("Connection"), QStringLiteral("")); //must contain "Upgrade", case-insensitive diff --git a/src/websockets/qwebsockethandshakeresponse_p.cpp b/src/websockets/qwebsockethandshakeresponse_p.cpp index 52eccbf..358b53d 100644 --- a/src/websockets/qwebsockethandshakeresponse_p.cpp +++ b/src/websockets/qwebsockethandshakeresponse_p.cpp @@ -142,7 +142,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse(const QWebSocketHandsh const QList<QString> matchingProtocols = supportedProtocols.toSet().intersect(request.protocols().toSet()).toList(); const QList<QString> matchingExtensions = supportedExtensions.toSet().intersect(request.extensions().toSet()).toList(); QList<QWebSocketProtocol::Version> matchingVersions = request.versions().toSet().intersect(supportedVersions.toSet()).toList(); - std::sort(matchingVersions.begin(), matchingVersions.end(), qGreater<QWebSocketProtocol::Version>()); //sort in descending order + std::sort(matchingVersions.begin(), matchingVersions.end(), std::greater<QWebSocketProtocol::Version>()); //sort in descending order if (matchingVersions.isEmpty()) { diff --git a/src/websockets/qwebsockethandshakeresponse_p.h b/src/websockets/qwebsockethandshakeresponse_p.h index 0e9574a..b9b0c53 100644 --- a/src/websockets/qwebsockethandshakeresponse_p.h +++ b/src/websockets/qwebsockethandshakeresponse_p.h @@ -62,7 +62,7 @@ class QWebSocketHandshakeRequest; class QString; class QTextStream; -class QWebSocketHandshakeResponse : public QObject +class Q_AUTOTEST_EXPORT QWebSocketHandshakeResponse : public QObject { Q_OBJECT Q_DISABLE_COPY(QWebSocketHandshakeResponse) @@ -104,7 +104,7 @@ private: const QList<QString> &supportedExtensions); QTextStream &writeToStream(QTextStream &textStream) const; - friend QTextStream &operator <<(QTextStream &stream, const QWebSocketHandshakeResponse &response); + friend QTextStream & Q_AUTOTEST_EXPORT operator <<(QTextStream &stream, const QWebSocketHandshakeResponse &response); }; QT_END_NAMESPACE |