summaryrefslogtreecommitdiff
path: root/examples/echoserver
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2014-01-25 19:42:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-01 20:54:45 +0100
commit43b193b457c32a2481702b66afde19c188057d40 (patch)
treec358d20dc430803bf1c1663747d6d35a1248a708 /examples/echoserver
parentd6d679caa4ebaf6d78e134976e48f7c4aeadf02f (diff)
downloadqtwebsockets-43b193b457c32a2481702b66afde19c188057d40.tar.gz
Rename ProcessMessage to ProcessTextMessage
Renamed to ProcessTextMessage to be consistent with ProcessBinaryMessage and with the method names in the SslEchoServer example. Change-Id: Iaaa732221597a08fca079e8df4df941d673d16a6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'examples/echoserver')
-rw-r--r--examples/echoserver/echoserver.cpp8
-rw-r--r--examples/echoserver/echoserver.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/echoserver/echoserver.cpp b/examples/echoserver/echoserver.cpp
index 6b14754..fdfb087 100644
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
@@ -75,7 +75,7 @@ void EchoServer::onNewConnection()
{
QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
- connect(pSocket, &QWebSocket::textMessageReceived, this, &EchoServer::processMessage);
+ connect(pSocket, &QWebSocket::textMessageReceived, this, &EchoServer::processTextMessage);
connect(pSocket, &QWebSocket::binaryMessageReceived, this, &EchoServer::processBinaryMessage);
connect(pSocket, &QWebSocket::disconnected, this, &EchoServer::socketDisconnected);
@@ -83,8 +83,8 @@ void EchoServer::onNewConnection()
}
//! [onNewConnection]
-//! [processMessage]
-void EchoServer::processMessage(QString message)
+//! [processTextMessage]
+void EchoServer::processTextMessage(QString message)
{
QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
if (pClient) {
@@ -93,7 +93,7 @@ void EchoServer::processMessage(QString message)
}
m_pWebSocketServer->close();
}
-//! [processMessage]
+//! [processTextMessage]
//! [processBinaryMessage]
void EchoServer::processBinaryMessage(QByteArray message)
diff --git a/examples/echoserver/echoserver.h b/examples/echoserver/echoserver.h
index 2cd8922..a336938 100644
--- a/examples/echoserver/echoserver.h
+++ b/examples/echoserver/echoserver.h
@@ -60,7 +60,7 @@ Q_SIGNALS:
private Q_SLOTS:
void onNewConnection();
- void processMessage(QString message);
+ void processTextMessage(QString message);
void processBinaryMessage(QByteArray message);
void socketDisconnected();