From 6a52f7031e7bbc0e580ba3638714ece817547592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Mon, 3 Aug 2015 00:47:15 +0200
Subject: [PATCH] fix resource parser

---
 server/rest/restserver.cpp |  2 +-
 server/webserver.cpp       | 22 ----------------------
 server/webserver.h         |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/server/rest/restserver.cpp b/server/rest/restserver.cpp
index 23726afd..1e184ef7 100644
--- a/server/rest/restserver.cpp
+++ b/server/rest/restserver.cpp
@@ -90,6 +90,7 @@ void RestServer::processHttpRequest(const QUuid &clientId, const HttpRequest &re
         reply->setClientId(clientId);
         m_webserver->sendHttpReply(reply);
         reply->deleteLater();
+        return;
     }
 
     // process request in corresponding resource
@@ -104,7 +105,6 @@ void RestServer::processHttpRequest(const QUuid &clientId, const HttpRequest &re
     }
     m_webserver->sendHttpReply(reply);
     reply->deleteLater();
-    return;
 }
 
 void RestServer::asyncReplyFinished()
diff --git a/server/webserver.cpp b/server/webserver.cpp
index a694c8f1..d8116d9a 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -76,28 +76,6 @@ WebServer::~WebServer()
     this->close();
 }
 
-void WebServer::sendData(const QUuid &clientId, const QVariantMap &data)
-{
-    QSslSocket *socket = m_clientList.value(clientId);
-    HttpReply reply(HttpReply::Ok);
-    reply.setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
-    reply.setPayload(QJsonDocument::fromVariant(data).toJson());
-    reply.packReply();
-    writeData(socket, reply.data());
-}
-
-void WebServer::sendData(const QList<QUuid> &clients, const QVariantMap &data)
-{
-    foreach (const QUuid &client, clients) {
-        QSslSocket *socket = m_clientList.value(client);
-        HttpReply reply(HttpReply::Ok);
-        reply.setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
-        reply.setPayload(QJsonDocument::fromVariant(data).toJson());
-        reply.packReply();
-        writeData(socket, reply.data());
-    }
-}
-
 void WebServer::sendHttpReply(HttpReply *reply)
 {
     QSslSocket *socket = 0;
diff --git a/server/webserver.h b/server/webserver.h
index 996b6d29..427c782d 100644
--- a/server/webserver.h
+++ b/server/webserver.h
@@ -45,8 +45,6 @@ public:
     explicit WebServer(QObject *parent = 0);
     ~WebServer();
 
-    void sendData(const QUuid &clientId, const QVariantMap &data);
-    void sendData(const QList<QUuid> &clients, const QVariantMap &data);
     void sendHttpReply(HttpReply *reply);
 
 private: