Replaced QRegExp with QRegularExpression as suggested by Shane
authorKurt Pattyn <pattyn.kurt@gmail.com>
Thu, 22 Aug 2013 18:26:39 +0000 (20:26 +0200)
committerKurt Pattyn <pattyn.kurt@gmail.com>
Thu, 22 Aug 2013 18:26:39 +0000 (20:26 +0200)
source/websocket.cpp

index e225f5f..c4e9e73 100644 (file)
@@ -6,7 +6,7 @@
 #include <QByteArray>
 #include <QtEndian>
 #include <QCryptographicHash>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QHostAddress>
 #include <QNetworkProxy>
@@ -808,14 +808,15 @@ void WebSocket::processHandshake(QTcpSocket *pSocket)
        QString errorDescription;
 
        const QString regExpStatusLine("^(HTTP/1.1)\\s([0-9]+)\\s(.*)");
-       const QRegExp regExp(regExpStatusLine);
+       const QRegularExpression regExp(regExpStatusLine);
        QString statusLine = readLine(pSocket);
        QString httpProtocol;
        int httpStatusCode;
        QString httpStatusMessage;
-       if (regExp.indexIn(statusLine) != -1)
+       QRegularExpressionMatch match = regExp.match(statusLine);
+       if (match.hasMatch())
        {
-               QStringList tokens = regExp.capturedTexts();
+               QStringList tokens = match.capturedTexts();
                tokens.removeFirst();   //remove the search string
                if (tokens.length() == 3)
                {