Removed scope (i.e. QWebSocket) from tr() callls

diff --git a/src/dataprocessor_p.cpp b/src/dataprocessor_p.cpp
index 3d94b45..638f4a9 100644 (file)
--- a/src/dataprocessor_p.cpp
+++ b/src/dataprocessor_p.cpp
@@ -569,13 +569,13 @@ void DataProcessor::process(QTcpSocket *pSocket)
                 if (!m_isFragmented && frame.isContinuationFrame())
                 {
                     clear();
-                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_PROTOCOL_ERROR, QWebSocket::tr("Received Continuation frame /*with FIN=true*/, while there is nothing to continue."));
+                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_PROTOCOL_ERROR, tr("Received Continuation frame /*with FIN=true*/, while there is nothing to continue."));
                     return;
                 }
                 if (m_isFragmented && frame.isDataFrame() && !frame.isContinuationFrame())
                 {
                     clear();
-                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_PROTOCOL_ERROR, QWebSocket::tr("All data frames after the initial data frame must have opcode 0 (continuation)."));
+                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_PROTOCOL_ERROR, tr("All data frames after the initial data frame must have opcode 0 (continuation)."));
                     return;
                 }
                 if (!frame.isContinuationFrame())
@@ -587,7 +587,7 @@ void DataProcessor::process(QTcpSocket *pSocket)
                 if ((messageLength + quint64(frame.getPayload().length())) > MAX_MESSAGE_SIZE_IN_BYTES)
                 {
                     clear();
-                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_TOO_MUCH_DATA, QWebSocket::tr("Received message is too big."));
+                    Q_EMIT errorEncountered(QWebSocketProtocol::CC_TOO_MUCH_DATA, tr("Received message is too big."));
                     return;
                 }
 
@@ -598,7 +598,7 @@ void DataProcessor::process(QTcpSocket *pSocket)
                     if (failed)
                     {
                         clear();
-                        Q_EMIT errorEncountered(QWebSocketProtocol::CC_WRONG_DATATYPE, QWebSocket::tr("Invalid UTF-8 code encountered."));
+                        Q_EMIT errorEncountered(QWebSocketProtocol::CC_WRONG_DATATYPE, tr("Invalid UTF-8 code encountered."));
                         return;
                     }
                     else

diff --git a/src/qwebsocket_p.cpp b/src/qwebsocket_p.cpp
index c39af5c..f0fbf51 100644 (file)
--- a/src/qwebsocket_p.cpp
+++ b/src/qwebsocket_p.cpp
@@ -102,7 +102,7 @@ QWebSocketPrivate::~QWebSocketPrivate()
 {
     if (state() == QAbstractSocket::ConnectedState)
     {
-        close(QWebSocketProtocol::CC_GOING_AWAY, QWebSocket::tr("Connection closed"));
+        close(QWebSocketProtocol::CC_GOING_AWAY, tr("Connection closed"));
     }
     releaseConnections(m_pSocket);
     m_pSocket->deleteLater();
@@ -551,7 +551,7 @@ qint64 QWebSocketPrivate::doWriteFrames(const QByteArray &data, bool isBinary)
             }
             else
             {
-                setErrorString(QWebSocket::tr("Error writing bytes to socket: %1.").arg(m_pSocket->errorString()));
+                setErrorString(tr("Error writing bytes to socket: %1.").arg(m_pSocket->errorString()));
                 qDebug() << errorString();
                 m_pSocket->flush();
                 Q_EMIT q->error(QAbstractSocket::NetworkError);
@@ -563,7 +563,7 @@ qint64 QWebSocketPrivate::doWriteFrames(const QByteArray &data, bool isBinary)
     }
     if (payloadWritten != data.size())
     {
-        setErrorString(QWebSocket::tr("Bytes written %1 != %2.").arg(payloadWritten).arg(data.size()));
+        setErrorString(tr("Bytes written %1 != %2.").arg(payloadWritten).arg(data.size()));
         qDebug() << errorString();
         Q_EMIT q->error(QAbstractSocket::NetworkError);
     }
@@ -692,7 +692,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
     }
     if (!ok)
     {
-        errorDescription = QWebSocket::tr("Invalid statusline in response: %1.").arg(statusLine);
+        errorDescription = tr("Invalid statusline in response: %1.").arg(statusLine);
     }
     else
     {
@@ -728,12 +728,12 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
                 ok = (accept == acceptKey);
                 if (!ok)
                 {
-                    errorDescription = QWebSocket::tr("Accept-Key received from server %1 does not match the client key %2.").arg(acceptKey).arg(accept);
+                    errorDescription = tr("Accept-Key received from server %1 does not match the client key %2.").arg(acceptKey).arg(accept);
                 }
             }
             else
             {
-                errorDescription = QWebSocket::tr("Invalid statusline in response: %1.").arg(statusLine);
+                errorDescription = tr("Invalid statusline in response: %1.").arg(statusLine);
             }
         }
         else if (httpStatusCode == 400)        //HTTP/1.1 400 Bad Request
@@ -745,20 +745,20 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
                 {
                     //if needed to switch protocol version, then we are finished here
                     //because we cannot handle other protocols than the RFC one (v13)
-                    errorDescription = QWebSocket::tr("Handshake: Server requests a version that we don't support: %1.").arg(versions.join(", "));
+                    errorDescription = tr("Handshake: Server requests a version that we don't support: %1.").arg(versions.join(", "));
                     ok = false;
                 }
                 else
                 {
                     //we tried v13, but something different went wrong
-                    errorDescription = QWebSocket::tr("Unknown error condition encountered. Aborting connection.");
+                    errorDescription = tr("Unknown error condition encountered. Aborting connection.");
                     ok = false;
                 }
             }
         }
         else
         {
-            errorDescription = QWebSocket::tr("Unhandled http status code: %1.").arg(httpStatusCode);
+            errorDescription = tr("Unhandled http status code: %1.").arg(httpStatusCode);
             ok = false;
         }
 
@@ -897,7 +897,7 @@ void QWebSocketPrivate::processControlFrame(QWebSocketProtocol::OpCode opCode, Q
                 if (!QWebSocketProtocol::isCloseCodeValid(closeCode))
                 {
                     closeCode = QWebSocketProtocol::CC_PROTOCOL_ERROR;
-                    closeReason = QWebSocket::tr("Invalid close code %1 detected.").arg(closeCode);
+                    closeReason = tr("Invalid close code %1 detected.").arg(closeCode);
                 }
                 else
                 {
@@ -910,7 +910,7 @@ void QWebSocketPrivate::processControlFrame(QWebSocketProtocol::OpCode opCode, Q
                         if (failed)
                         {
                             closeCode = QWebSocketProtocol::CC_WRONG_DATATYPE;
-                            closeReason = QWebSocket::tr("Invalid UTF-8 code encountered.");
+                            closeReason = tr("Invalid UTF-8 code encountered.");
                         }
                     }
                 }

diff --git a/src/qwebsocketserver_p.cpp b/src/qwebsocketserver_p.cpp
index 82c9247..04ea23b 100644 (file)
--- a/src/qwebsocketserver_p.cpp
+++ b/src/qwebsocketserver_p.cpp
@@ -54,7 +54,7 @@ QWebSocketServerPrivate::~QWebSocketServerPrivate()
     while (!m_pendingConnections.isEmpty())
     {
         QWebSocket *pWebSocket = m_pendingConnections.dequeue();
-        pWebSocket->close(QWebSocketProtocol::CC_GOING_AWAY, QWebSocketServer::tr("Server closed."));
+        pWebSocket->close(QWebSocketProtocol::CC_GOING_AWAY, tr("Server closed."));
         pWebSocket->deleteLater();
     }
     m_pTcpServer->deleteLater();
@@ -312,24 +312,24 @@ void QWebSocketServerPrivate::handshakeReceived()
                 else
                 {
                     //TODO: should set or emit error
-                    qDebug() << QWebSocketServer::tr("Upgrading to websocket failed.");
+                    qDebug() << tr("Upgrading to websocket failed.");
                 }
             }
             else
             {
                 //TODO: should set or emit error
-                qDebug() << QWebSocketServer::tr("Cannot upgrade to websocket.");
+                qDebug() << tr("Cannot upgrade to websocket.");
             }
         }
         else
         {
             //TODO: should set or emit error
-            qDebug() << QWebSocketServer::tr("Invalid response received.");
+            qDebug() << tr("Invalid response received.");
         }
         if (!success)
         {
             //TODO: should set or emit error
-            qDebug() << QWebSocketServer::tr("Closing socket because of invalid or unsupported request.");
+            qDebug() << tr("Closing socket because of invalid or unsupported request.");
             pTcpSocket->close();
         }
     }