Renamed WebSocket to QWebSocket

Renamed WebSocketProtocol to QWebSocketProtocol
Renamed WebSocketServer to QWebSocketServer
Adapted source files to include renamed headers
Added qwebsocketsglobal.h file

3 files changed, 13 insertions, 13 deletions

diff --git a/examples/echoclient/echoclient.h b/examples/echoclient/echoclient.h
index 4405071..36a3cad 100644
--- a/examples/echoclient/echoclient.h
+++ b/examples/echoclient/echoclient.h
@@ -2,7 +2,7 @@
 #define ECHOCLIENT_H
 
 #include <QObject>
-#include "websocket.h"
+#include "qwebsocket.h"
 
 class EchoClient : public QObject
 {
@@ -19,7 +19,7 @@ private Q_SLOTS:
 	void onTextMessageReceived(QString message);
 
 private:
-	WebSocket m_webSocket;
+	QWebSocket m_webSocket;
 };
 
 #endif // ECHOCLIENT_H
diff --git a/examples/echoserver/echoserver.cpp b/examples/echoserver/echoserver.cpp
index 1e223c9..c08aad1 100644
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
@@ -1,6 +1,6 @@
 #include "echoserver.h"
-#include "websocketserver.h"
-#include "websocket.h"
+#include "qwebsocketserver.h"
+#include "qwebsocket.h"
 #include <QDebug>
 
 //! [constructor]
@@ -9,7 +9,7 @@ EchoServer::EchoServer(quint16 port, QObject *parent) :
 	m_pWebSocketServer(0),
 	m_clients()
 {
-	m_pWebSocketServer = new WebSocketServer("Echo Server", this);
+	m_pWebSocketServer = new QWebSocketServer("Echo Server", this);
 	if (m_pWebSocketServer->listen(QHostAddress::Any, port))
 	{
 		qDebug() << "Echoserver listening on port" << port;
@@ -21,7 +21,7 @@ EchoServer::EchoServer(quint16 port, QObject *parent) :
 //! [onNewConnection]
 void EchoServer::onNewConnection()
 {
-	WebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
+	QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
 
 	connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processMessage(QString)));
 	connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this, SLOT(processBinaryMessage(QByteArray)));
@@ -35,7 +35,7 @@ void EchoServer::onNewConnection()
 //! [processMessage]
 void EchoServer::processMessage(QString message)
 {
-	WebSocket *pClient = qobject_cast<WebSocket *>(sender());
+	QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
 	if (pClient != 0)
 	{
 		pClient->send(message);
@@ -46,7 +46,7 @@ void EchoServer::processMessage(QString message)
 //! [processBinaryMessage]
 void EchoServer::processBinaryMessage(QByteArray message)
 {
-	WebSocket *pClient = qobject_cast<WebSocket *>(sender());
+	QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
 	if (pClient != 0)
 	{
 		pClient->send(message);
@@ -57,7 +57,7 @@ void EchoServer::processBinaryMessage(QByteArray message)
 //! [socketDisconnected]
 void EchoServer::socketDisconnected()
 {
-	WebSocket *pClient = qobject_cast<WebSocket *>(sender());
+	QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
 	if (pClient != 0)
 	{
 		m_clients.removeAll(pClient);
diff --git a/examples/echoserver/echoserver.h b/examples/echoserver/echoserver.h
index 21cf0de..aa8c2ba 100644
--- a/examples/echoserver/echoserver.h
+++ b/examples/echoserver/echoserver.h
@@ -5,8 +5,8 @@
 #include <QList>
 #include <QByteArray>
 
-class WebSocketServer;
-class WebSocket;
+class QWebSocketServer;
+class QWebSocket;
 
 class EchoServer : public QObject
 {
@@ -23,8 +23,8 @@ private Q_SLOTS:
 	void socketDisconnected();
 
 private:
-	WebSocketServer *m_pWebSocketServer;
-	QList<WebSocket *> m_clients;
+	QWebSocketServer *m_pWebSocketServer;
+	QList<QWebSocket *> m_clients;
 };
 
 #endif //ECHOSERVER_H