Make it possible to swich of debug output with a define.

5 files changed, 65 insertions, 60 deletions

diff --git a/src/eventqueue.cpp b/src/eventqueue.cpp
index bab7fbe..96bc448 100755
--- a/src/eventqueue.cpp
+++ b/src/eventqueue.cpp
@@ -1,4 +1,5 @@
 #include "eventqueue.h"
+#include "webclient.h"
 #include <QImage>
 
 bool imagesEqual(const QImage &a, const QImage &b, QRect rect)
@@ -45,21 +46,21 @@ void EventQueue::setSession(Session *session)
 
 void EventQueue::reset()
 {
-    qDebug() << "reset";
+    DEBUG << "reset";
     images.clear();
     geometries.clear();
 }
 
 void EventQueue::handleRequest(HttpRequest *request, HttpResponse *response)
 {
-//    qDebug() << "handle request" << request->path();
+//    DEBUG << "handle request" << request->path();
     const QByteArray path = request->path();
 
     if (path == "/content") {
-        qDebug() << "content";
+        DEBUG << "content";
         response->setBody(queueToByteArray());
     } else if (path == "/idle") {
-        qDebug() << "idle";
+        DEBUG << "idle";
         response->setBody(queueToByteArray());
 
     // If the part starts with "/josn" then the rest of the string is an json-encoded
@@ -72,17 +73,17 @@ void EventQueue::handleRequest(HttpRequest *request, HttpResponse *response)
         jsonText.replace("%7D", "}");
         jsonText.replace("%22", "\"");
 
-        qDebug() << "json request" << jsonText;
+        DEBUG << "json request" << jsonText;
         json_object* request = json_tokener_parse(jsonText.data());
         json_object* type = json_object_object_get(request, "type");
 
         QByteArray typeText = json_object_get_string(type);
-//        qDebug() << typeText;
+//        DEBUG << typeText;
 
         if (typeText == "img") {
             json_object* idObject = json_object_object_get(request, "id");
             const int id = json_object_get_int(idObject);
-            qDebug() << "id" << this << id << images.value(id).size();
+            DEBUG << "id" << this << id << images.value(id).size();
 
             QByteArray block;
             QBuffer buffer(&block);
@@ -107,19 +108,19 @@ void EventQueue::handleRequest(HttpRequest *request, HttpResponse *response)
 
 void EventQueue::addUpdateEvent(int id, const QImage &image, QRect updateRect)
 {
-      qDebug() << "addUpdateEvent" << this << id << image.size();
+      DEBUG << "addUpdateEvent" << this << id << image.size();
 
     if (images.contains(id) == false) {
-        qDebug() << "new image for" << id;
+        DEBUG << "new image for" << id;
         images.insert(id, image);
     } else {
         if (imagesEqual(image, images.value(id), updateRect)) {
-          qDebug() << "discard update" << id;
+          DEBUG << "discard update" << id;
             return;
         } else {
         //  image.save("images/" + widget->objectName() + ".png");
             images.insert(id, image);
-            qDebug() << "accept update" << id;
+            DEBUG << "accept update" << id;
         }
     }
 
@@ -137,7 +138,7 @@ void EventQueue::addGeometryEvent(int id, QRect globalGeometry)
 
 void EventQueue::addParentChangeEvent(int id)
 {
-//    qDebug() << "parentchanged";
+//    DEBUG << "parentchanged";
     addEvent(id, EventEntry::ParentChange);
 }
 
@@ -146,12 +147,12 @@ void EventQueue::addEvent(int id, EventEntry::Type type)
     EventEntry entry(id, type);
 
     if (events.contains(entry)) {
-//        qDebug() << "event already in queue";
+//        DEBUG << "event already in queue";
         return;
     }
 
     events.enqueue(entry);
-//    qDebug() << json_object_to_json_string(toJson(entry));
+//    DEBUG << json_object_to_json_string(toJson(entry));
 
     if (m_session)
         m_session->contentAvailable();
@@ -169,7 +170,7 @@ QByteArray EventQueue::queueToByteArray()
 
     QByteArray text(json_object_to_json_string(array));
 
-    qDebug() << "sending event text" << text;
+    DEBUG << "sending event text" << text;
     // json_free(array);
 
    return text;
@@ -211,7 +212,7 @@ json_object *EventQueue::jsonShowEvent(const EventEntry &event) const
 
 json_object *EventQueue::jsonShowLineEditEvent(const EventEntry &event) const
 {
-    qDebug() << "### Show line edit";
+    DEBUG << "### Show line edit";
     struct json_object *obj = json_object_new_object();
     json_object_object_add(obj, "type", json_object_new_string("showLineEdit"));
     json_object_object_add(obj, "id", json_object_new_int(event.id));
@@ -255,7 +256,7 @@ json_object *EventQueue::jsonGeometryEvent(const EventEntry &event) const
 
 json_object *EventQueue::jsonParentChangeEvent(const EventEntry &event) const
 {
-//    qDebug() << "parentchanged send";
+//    DEBUG << "parentchanged send";
     QWidget *parent = ((QWidget *)event.id)->parentWidget();
     struct json_object *obj = json_object_new_object();
     json_object_object_add(obj, "type", json_object_new_string("parentChange"));
diff --git a/src/multiuserserver.cpp b/src/multiuserserver.cpp
index 198b323..5e7ca7b 100755
--- a/src/multiuserserver.cpp
+++ b/src/multiuserserver.cpp
@@ -1,4 +1,5 @@
 #include "multiuserserver.h"
+#include "webclient.h"
 
 #include <json.h>
 #include <eventqueue.h>
@@ -27,7 +28,7 @@ SessionServer::SessionServer(QWidget *widget, Session *session)
 
 void SessionServer::handleRequest(HttpRequest *request, HttpResponse *response)
 {
-    qDebug() << "SingleUserServer::handleRequest!" << request->path();
+    DEBUG << "SingleUserServer::handleRequest!" << request->path();
     widgetEventHandler->handleRequest(request, response);
 
     if (response->body == QByteArray()) {
diff --git a/src/singleuserserver.cpp b/src/singleuserserver.cpp
index e8f545e..a01d75e 100755
--- a/src/singleuserserver.cpp
+++ b/src/singleuserserver.cpp
@@ -1,4 +1,5 @@
 #include "singleuserserver.h"
+#include "webclient.h"
 
 #include <json.h>
 #include <eventqueue.h>
@@ -31,7 +32,7 @@ void SingleUserServer::newSession(Session *session)
         //  return;
     }
     
-     qDebug() << "new session";
+     DEBUG << "new session";
 
     widgetEventHandler->setSession(session);
     
diff --git a/src/webclientserver.cpp b/src/webclientserver.cpp
index d8c2de5..e0152c2 100755
--- a/src/webclientserver.cpp
+++ b/src/webclientserver.cpp
@@ -1,3 +1,4 @@
+#include "webclient.h"
 #include "webclientserver.h"
 #include <time.h>
 
@@ -37,7 +38,7 @@ void HttpRequest::readText()
     while (m_socket->canReadLine()) {
         m_text.append(m_socket->readLine());
     }   
-//    qDebug() << "req" << m_text;
+//    DEBUG << "req" << m_text;
 }
 
 void HttpRequest::parseText()
@@ -46,8 +47,8 @@ void HttpRequest::parseText()
         if (line.startsWith("GET")) {
              m_path = line.mid(4).split(' ').at(0); // ### assumes well-formed string
         } else if (line.startsWith("Cookie:")) {
-               qDebug() << "cookie line" << line.simplified();
-             //qDebug() << line.split(':').at(1).simplified();
+               DEBUG << "cookie line" << line.simplified();
+             //DEBUG << line.split(':').at(1).simplified();
              m_cookies = line.split(':').at(1).simplified();
             
             
@@ -132,7 +133,7 @@ void Session::contentAvailable()
 
 void Session::idleSocketDisconnect()
 {
-//    qDebug() << "idleSocketDisconnect";
+//    DEBUG << "idleSocketDisconnect";
     m_idleSocket = 0;
 }
 
@@ -148,13 +149,13 @@ Server::Server()
 void Server::printRequest(const QList<QByteArray> &request)
 {
     foreach (const QByteArray &line, request) {
-        qDebug() << line;
+        DEBUG << line;
     }
 }
 
 void Server::contentAvailable(Session *session)
 {
-//    qDebug() << "content available!";
+//    DEBUG << "content available!";
     QTcpSocket *socket = session->m_idleSocket;
     if (socket == 0)
         return;
@@ -175,14 +176,14 @@ void Server::dataOnSocket()
 {
     QTcpSocket * socket = static_cast<QTcpSocket *>(sender());
 
-    qDebug() << "";
-    qDebug() << "request";
+    DEBUG << "";
+    DEBUG << "request";
 
     HttpRequest request(socket);
 
     int sessionId = 0;
     
-    qDebug() << "cookies" << request.cookies();
+    DEBUG << "cookies" << request.cookies();
     foreach (QNetworkCookie cookie, request.parsedCookies()) {
         if (cookie.name() == "qtcookie") {
             sessionId = cookie.value().toInt();
@@ -197,14 +198,14 @@ void Server::dataOnSocket()
         return;
     }
 
-    qDebug() << "sessionId" << sessionId;
+    DEBUG << "sessionId" << sessionId;
 
     HttpResponse response;
     Session *session = activeSessions.value(sessionId);
 
     if (session == 0) { 
         // ### accept unknown sessions for now, TODO do authentication here.
-        qDebug() << "new session for" << sessionId;
+        DEBUG << "new session for" << sessionId;
         
 
         sessionId = nextCookieId;
@@ -215,12 +216,12 @@ void Server::dataOnSocket()
         session = new Session(this, sessionId);
         activeSessions.insert(sessionId, session);
 
-//        qDebug() << "new session" << sessionId << session;
+//        DEBUG << "new session" << sessionId << session;
 
         emit sessionBegin(session);
                        
     } else {
- //       qDebug() << "found session for" << sessionId;
+ //       DEBUG << "found session for" << sessionId;
     }
 
     // Strip away the page ids: "-pageId="
@@ -238,7 +239,7 @@ void Server::dataOnSocket()
     // If there are no more events, save this connection and keep it open.
 
 //    if (path == "/idle")
-//        qDebug() << response.body;
+//        DEBUG << response.body;
     if (path.startsWith("/idle") && response.body == QByteArray()) {
         // Keep one socket for each connection, the html spec allows
         // only two connections between a web browser and a server.
@@ -248,14 +249,14 @@ void Server::dataOnSocket()
             session->m_idleRequest = request;
             session->m_idleResponse = response;
         }
-//        qDebug() << "idle socket" << socket;
+//        DEBUG << "idle socket" << socket;
         return;
     }
 
-//    qDebug() << "socket write response";
-//    qDebug() << "response" << response.toText();
+//    DEBUG << "socket write response";
+//    DEBUG << "response" << response.toText();
     socket->write(response.toText());
-//    qDebug() << "socket write response done";
+//    DEBUG << "socket write response done";
 }
 
 void FileServer::handleRequest(HttpRequest *request, HttpResponse *response)
@@ -266,14 +267,14 @@ void FileServer::handleRequest(HttpRequest *request, HttpResponse *response)
     const QByteArray path = request->path();
     QByteArray filePath =  path.right(path.size() - 1); // remove leading '/'
             
-//    qDebug() << "file server handle request" << path <<  filePath;
+//    DEBUG << "file server handle request" << path <<  filePath;
             
     if (filePath == "")
         filePath = ":index.html";
     
     QFile file(filePath); // ### contain
     if (file.exists() == false) {
-//        qDebug() << "no file" << filePath;
+//        DEBUG << "no file" << filePath;
         return;
     }
 
diff --git a/src/widgeteventhandler.cpp b/src/widgeteventhandler.cpp
index e876482..1f20522 100755
--- a/src/widgeteventhandler.cpp
+++ b/src/widgeteventhandler.cpp
@@ -1,5 +1,6 @@
 #include <QtGui>
 #include "widgeteventhandler.h"
+#include "webclient.h"
 
 
 QWidget * findEventTarget(QWidget *root, QPoint pos)
@@ -23,7 +24,7 @@ WidgetEventHandler::WidgetEventHandler(QObject *parent)
 
 void WidgetEventHandler::setRootWidget(QWidget *root)
 {
-    qDebug() << "set root widget" << root;
+    DEBUG << "set root widget" << root;
     rootWidget = root;
     recursivelyInstallEventHandler(root);
 }
@@ -33,7 +34,7 @@ void WidgetEventHandler::recursivelyInstallEventHandler(QWidget *widget)
 {
     widget->installEventFilter(this);
 
-//    qDebug() << widget->metaObject()->className() << widget->objectName();
+//    DEBUG << widget->metaObject()->className() << widget->objectName();
 
     if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget)) {
         connect(lineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(lineEditTextChange()));
@@ -72,13 +73,13 @@ bool WidgetEventHandler::eventFilter(QObject *object, QEvent *event)
         }
 
         if (!grabbing) {
-            qDebug() << " add paint update" << object;
+            DEBUG << " add paint update" << object;
             addPendingUpdate(widget, static_cast<QPaintEvent*>(event)->rect());
         }
     }
 
     if (event->type() == QEvent::Show) {
-//        qDebug() << "show" << object;
+//        DEBUG << "show" << object;
         // Add immediate show update if we have an image to serve.
         if (events.images.contains((int)widget)) {
             addShowEvent(widget);
@@ -91,7 +92,7 @@ bool WidgetEventHandler::eventFilter(QObject *object, QEvent *event)
     }
 
     if (event->type() == QEvent::Hide) {
-//        qDebug() << "hide" << object;
+//        DEBUG << "hide" << object;
         events.addEvent((int)widget, EventEntry::Hide);
         recursivelyAddHide(widget);
     }
@@ -99,7 +100,7 @@ bool WidgetEventHandler::eventFilter(QObject *object, QEvent *event)
     if (event->type() == QEvent::Move) {
         QRect geometry = globalGeometry(widget);
 //        if (object->metaObject()->className() == "QPushbutton")
-//        qDebug() << "move geometry" << object->metaObject()->className() << geometry;
+//        DEBUG << "move geometry" << object->metaObject()->className() << geometry;
 
         events.addGeometryEvent((int)widget, geometry);
     }
@@ -108,13 +109,13 @@ bool WidgetEventHandler::eventFilter(QObject *object, QEvent *event)
         QRect geometry = globalGeometry(widget);
 
 //        if (object->metaObject()->className() == "QPushbutton")
-//            qDebug() << "resize geometry" << geometry;
+//            DEBUG << "resize geometry" << geometry;
 
         events.addGeometryEvent((int)widget, geometry);
     }
 
     if (event->type() == QEvent::ParentChange) {
-        qDebug() << "parentChange" << widget << widget->parentWidget();
+        DEBUG << "parentChange" << widget << widget->parentWidget();
         events.addParentChangeEvent((int)widget);
     }
 
@@ -135,12 +136,12 @@ void WidgetEventHandler::updatePendingWidgets()
 void WidgetEventHandler::handleRequest(HttpRequest *request, HttpResponse *response)
 {
     const QByteArray path = request->path();
-    qDebug() << "request" << path;
+    DEBUG << "request" << path;
     if (path.startsWith("/mousepress") || path.startsWith("/mouserelease")) {
-//        qDebug() << "handle mouse press";
+//        DEBUG << "handle mouse press";
         handleMousePress(path);
     } else if (path.startsWith("/keypress") || path.startsWith("/keyrelease")) {
-//        qDebug() << "handle key press";
+//        DEBUG << "handle key press";
         handleKeyPress(path);
     } else {
         if (path.startsWith("/content")) {
@@ -157,7 +158,7 @@ void WidgetEventHandler::handleMousePress(const QByteArray &message)
     QPoint p(tokens.at(1).toInt(), tokens.at(2).toInt()); // ### assumes well-formed string
 
     QWidget *target = findEventTarget(rootWidget, p);
-//    qDebug() << "target" << target;
+//    DEBUG << "target" << target;
 
     QPoint local = target->mapFrom(rootWidget, p);
 
@@ -181,7 +182,7 @@ void WidgetEventHandler::handleKeyPress(const QByteArray &message)
     QChar c(code);
 
     if (code == 8) {
-//                qDebug() << "backspace";
+//                DEBUG << "backspace";
         QKeyEvent press(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier, QString());
         QKeyEvent release(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier, QString());
         QApplication::sendEvent(focusWidget, &press);
@@ -192,7 +193,7 @@ void WidgetEventHandler::handleKeyPress(const QByteArray &message)
         QApplication::sendEvent(focusWidget, &press);
         QApplication::sendEvent(focusWidget, &release);
     }
-//    qDebug() << "got key press" << c;
+//    DEBUG << "got key press" << c;
 
     qApp->processEvents();
 }
@@ -201,30 +202,30 @@ void WidgetEventHandler::handleKeyPress(const QByteArray &message)
 void WidgetEventHandler::widgetPaint(QWidget *widget, const QRect &updateRect)
 {
     QImage image(widget->size(), QImage::Format_ARGB32_Premultiplied);
-    qDebug() << "widget->size" << widget->size();
+    DEBUG << "widget->size" << widget->size();
     image.fill(QColor(0,0,0,0).rgba()); // fill with transparent pixels
 
     grabbing = true; // prevent recusion
-    //qDebug() << "render";
+    //DEBUG << "render";
     // grab widget only, no background or children
     widget->render(&image, updateRect.topLeft(), QRegion(updateRect), QWidget::RenderFlags(0));
-    //qDebug() << "render done";
+    //DEBUG << "render done";
     grabbing = false;
 
 //    image.save(QString::number(int(widget)) + ".png");
 
 
-//    qDebug() << "update" << widget << (int)widget;
+//    DEBUG << "update" << widget << (int)widget;
     events.addUpdateEvent((int)widget, image, updateRect);
 
-//    qDebug() << "geometry" << widget << (int)widget << globalGeometry(widget);
+//    DEBUG << "geometry" << widget << (int)widget << globalGeometry(widget);
     events.addGeometryEvent((int)widget, globalGeometry(widget));
 }
 
 QRect WidgetEventHandler::globalGeometry(QWidget *widget)
 {
     QRect geometry(widget->mapTo(widget->window(), QPoint(0,0)), widget->size());
-//    qDebug() << "geometry for" << widget << geometry;
+//    DEBUG << "geometry for" << widget << geometry;
     return geometry;
 }
 
@@ -272,7 +273,7 @@ void WidgetEventHandler::recursivelyAddUpdate(QWidget *widget)
 
 void WidgetEventHandler::addShowEvent(QWidget *widget)
 {
-    qDebug() << "add show event" << widget;
+    DEBUG << "add show event" << widget;
     events.addEvent((int)widget, EventEntry::Show);
 }