Added some more examples

Implemented a C++ Server, providing a chatservice through a simple
QObject using QWebChannel and also both a QML and HTML Client to
interact with the server.
The examples show how to use properties, signals and methods,
separated in server and clients.

This reverts commit e8c280a15f7822fa5a563388615313858fd90848.
The integration issues w.r.t. unconditional usage of the
websockets module have been resolved.

Change-Id: I4a07646dcd5e6050d3bd6b9bd1c5b07dbc7d7d69
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

6 files changed, 6 insertions, 301 deletions

diff --git a/examples/webchannel/standalone/main.cpp b/examples/webchannel/standalone/main.cpp
index 6f0db3a..201c4cd 100644
--- a/examples/webchannel/standalone/main.cpp
+++ b/examples/webchannel/standalone/main.cpp
@@ -42,8 +42,8 @@
 
 #include <QtWebSockets/QWebSocketServer>
 
-#include "websocketclientwrapper.h"
-#include "websockettransport.h"
+#include "../shared/websocketclientwrapper.h"
+#include "../shared/websockettransport.h"
 
 #include "ui_dialog.h"
 
diff --git a/examples/webchannel/standalone/standalone.pro b/examples/webchannel/standalone/standalone.pro
index fdeb87a..19aa264 100644
--- a/examples/webchannel/standalone/standalone.pro
+++ b/examples/webchannel/standalone/standalone.pro
@@ -4,12 +4,12 @@ CONFIG += warn_on
 
 SOURCES += \
     main.cpp \
-    websockettransport.cpp \
-    websocketclientwrapper.cpp
+    ../shared/websockettransport.cpp \
+    ../shared/websocketclientwrapper.cpp
 
 HEADERS += \
-    websockettransport.h \
-    websocketclientwrapper.h
+    ../shared/websockettransport.h \
+    ../shared/websocketclientwrapper.h
 
 FORMS += \
     dialog.ui
diff --git a/examples/webchannel/standalone/websocketclientwrapper.cpp b/examples/webchannel/standalone/websocketclientwrapper.cpp
deleted file mode 100644
index 68ff1c0..0000000
--- a/examples/webchannel/standalone/websocketclientwrapper.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebChannel module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "websocketclientwrapper.h"
-
-#include <QtWebSockets/QWebSocketServer>
-
-#include "websockettransport.h"
-
-/*!
-    \brief Wrapps connected QWebSockets clients in WebSocketTransport objects.
-
-    This code is all that is required to connect incoming WebSockets to the WebChannel. Any kind
-    of remote JavaScript client that supports WebSockets can thus receive messages and access the
-    published objects.
-*/
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    Construct the client wrapper with the given parent.
-
-    All clients connecting to the QWebSocketServer will be automatically wrapped
-    in WebSocketTransport objects.
-*/
-WebSocketClientWrapper::WebSocketClientWrapper(QWebSocketServer *server, QObject *parent)
-    : QObject(parent)
-    , m_server(server)
-{
-    connect(server, &QWebSocketServer::newConnection,
-            this, &WebSocketClientWrapper::handleNewConnection);
-}
-
-/*!
-    Wrap an incoming WebSocket connection in a WebSocketTransport object.
-*/
-void WebSocketClientWrapper::handleNewConnection()
-{
-    emit clientConnected(new WebSocketTransport(m_server->nextPendingConnection()));
-}
-
-QT_END_NAMESPACE
diff --git a/examples/webchannel/standalone/websocketclientwrapper.h b/examples/webchannel/standalone/websocketclientwrapper.h
deleted file mode 100644
index f49b8b9..0000000
--- a/examples/webchannel/standalone/websocketclientwrapper.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebChannel module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef WEBSOCKETTRANSPORTSERVER_H
-#define WEBSOCKETTRANSPORTSERVER_H
-
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-
-class QWebSocketServer;
-class WebSocketTransport;
-
-class WebSocketClientWrapper : public QObject
-{
-    Q_OBJECT
-
-public:
-    WebSocketClientWrapper(QWebSocketServer *server, QObject *parent = 0);
-
-Q_SIGNALS:
-    void clientConnected(WebSocketTransport* client);
-
-private Q_SLOTS:
-    void handleNewConnection();
-
-private:
-    QWebSocketServer *m_server;
-};
-
-QT_END_NAMESPACE
-
-#endif // WEBSOCKETTRANSPORTSERVER_H
diff --git a/examples/webchannel/standalone/websockettransport.cpp b/examples/webchannel/standalone/websockettransport.cpp
deleted file mode 100644
index 266563a..0000000
--- a/examples/webchannel/standalone/websockettransport.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebChannel module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "websockettransport.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QDebug>
-
-#include <QtWebSockets/QWebSocket>
-
-/*!
-    \brief QWebChannelAbstractSocket implementation that uses a QWebSocket internally.
-
-    The transport delegates all messages received over the QWebSocket over its
-    textMessageReceived signal. Analogously, all calls to sendTextMessage will
-    be send over the QWebSocket to the remote client.
-*/
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    Construct the transport object and wrap the given socket.
-
-    The socket is also set as the parent of the transport object.
-*/
-WebSocketTransport::WebSocketTransport(QWebSocket *socket)
-: QWebChannelAbstractTransport(socket)
-, m_socket(socket)
-{
-    connect(socket, &QWebSocket::textMessageReceived,
-            this, &WebSocketTransport::textMessageReceived);
-}
-
-/*!
-    Destroys the WebSocketTransport.
-*/
-WebSocketTransport::~WebSocketTransport()
-{
-
-}
-
-/*!
-    Serialize the JSON message and send it as a text message via the WebSocket to the client.
-*/
-void WebSocketTransport::sendMessage(const QJsonObject &message)
-{
-    QJsonDocument doc(message);
-    m_socket->sendTextMessage(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
-}
-
-/*!
-    Deserialize the stringified JSON messageData and emit messageReceived.
-*/
-void WebSocketTransport::textMessageReceived(const QString &messageData)
-{
-    QJsonParseError error;
-    QJsonDocument message = QJsonDocument::fromJson(messageData.toUtf8(), &error);
-    if (error.error) {
-        qWarning() << "Failed to parse text message as JSON object:" << messageData
-                   << "Error is:" << error.errorString();
-        return;
-    } else if (!message.isObject()) {
-        qWarning() << "Received JSON message that is not an object: " << messageData;
-        return;
-    }
-    emit messageReceived(message.object(), this);
-}
-
-QT_END_NAMESPACE
diff --git a/examples/webchannel/standalone/websockettransport.h b/examples/webchannel/standalone/websockettransport.h
deleted file mode 100644
index 4d4a6cd..0000000
--- a/examples/webchannel/standalone/websockettransport.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebChannel module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef WEBSOCKETTRANSPORT_H
-#define WEBSOCKETTRANSPORT_H
-
-#include <QtWebChannel/QWebChannelAbstractTransport>
-
-QT_BEGIN_NAMESPACE
-
-class QWebSocket;
-class WebSocketTransport : public QWebChannelAbstractTransport
-{
-    Q_OBJECT
-public:
-    explicit WebSocketTransport(QWebSocket *socket);
-    virtual ~WebSocketTransport();
-
-    void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
-    void textMessageReceived(const QString &message);
-
-private:
-    QWebSocket *m_socket;
-};
-
-QT_END_NAMESPACE
-
-#endif // WEBSOCKETTRANSPORT_H