Rename processMessage to processTextMessage

Renamed processMessage to be more inline with
processBinaryMessage.

Change-Id: Ib0c8b9a4999756105f894d7ca5df88452495a66b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/examples/sslechoserver/sslechoserver.cpp b/examples/sslechoserver/sslechoserver.cpp
index b360a08..d24c934 100644 (file)
--- a/examples/sslechoserver/sslechoserver.cpp
+++ b/examples/sslechoserver/sslechoserver.cpp
@@ -89,7 +89,7 @@ void SslEchoServer::onNewConnection()
 
     qDebug() << "Client connected:" << pSocket->peerName() << pSocket->origin();
 
-    connect(pSocket, &QWebSocket::textMessageReceived, this, &SslEchoServer::processMessage);
+    connect(pSocket, &QWebSocket::textMessageReceived, this, &SslEchoServer::processTextMessage);
     connect(pSocket, &QWebSocket::binaryMessageReceived,
             this, &SslEchoServer::processBinaryMessage);
     connect(pSocket, &QWebSocket::disconnected, this, &SslEchoServer::socketDisconnected);
@@ -99,8 +99,8 @@ void SslEchoServer::onNewConnection()
 }
 //! [onNewConnection]
 
-//! [processMessage]
-void SslEchoServer::processMessage(QString message)
+//! [processTextMessage]
+void SslEchoServer::processTextMessage(QString message)
 {
     QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
     if (pClient)
@@ -109,7 +109,7 @@ void SslEchoServer::processMessage(QString message)
         Q_UNUSED(bytesWritten);
     }
 }
-//! [processMessage]
+//! [processTextMessage]
 
 //! [processBinaryMessage]
 void SslEchoServer::processBinaryMessage(QByteArray message)

diff --git a/examples/sslechoserver/sslechoserver.h b/examples/sslechoserver/sslechoserver.h
index bbd0a87..3420a27 100644 (file)
--- a/examples/sslechoserver/sslechoserver.h
+++ b/examples/sslechoserver/sslechoserver.h
@@ -58,7 +58,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void onNewConnection();
-    void processMessage(QString message);
+    void processTextMessage(QString message);
     void processBinaryMessage(QByteArray message);
     void socketDisconnected();
 

diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp
index 9b27ffb..f2ae3d5 100644 (file)
--- a/src/websockets/qwebsocketserver.cpp
+++ b/src/websockets/qwebsocketserver.cpp
@@ -92,8 +92,8 @@
   The client socket is remembered in a list, in case we would like to use it later
   (in this example, nothing is done with it).
 
-  \snippet echoserver/echoserver.cpp processMessage
-  Whenever `processMessage()` is triggered, we retrieve the sender, and if valid, send back the
+  \snippet echoserver/echoserver.cpp processTextMessage
+  Whenever `processTextMessage()` is triggered, we retrieve the sender, and if valid, send back the
   original message (`send()`).
   The same is done with binary messages.
   \snippet echoserver/echoserver.cpp processBinaryMessage