From be77fa82a3dd03c915b0217dd3c2f65705741ff3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 11 Nov 2017 09:32:15 +0100 Subject: [PATCH] HTTP server; changed namespace to qtwebapp --- httpserver/httpconnectionhandler.cpp | 2 +- httpserver/httpconnectionhandler.h | 2 +- httpserver/httpconnectionhandlerpool.cpp | 2 +- httpserver/httpconnectionhandlerpool.h | 2 +- httpserver/httpcookie.cpp | 2 +- httpserver/httpcookie.h | 2 +- httpserver/httplistener.cpp | 2 +- httpserver/httplistener.h | 2 +- httpserver/httprequest.cpp | 2 +- httpserver/httprequest.h | 2 +- httpserver/httprequesthandler.cpp | 2 +- httpserver/httprequesthandler.h | 2 +- httpserver/httpresponse.cpp | 2 +- httpserver/httpresponse.h | 2 +- httpserver/httpsession.cpp | 2 +- httpserver/httpsession.h | 2 +- httpserver/httpsessionstore.cpp | 2 +- httpserver/httpsessionstore.h | 2 +- httpserver/staticfilecontroller.cpp | 2 +- httpserver/staticfilecontroller.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/httpserver/httpconnectionhandler.cpp b/httpserver/httpconnectionhandler.cpp index aa60ea0ef..d9d8af5b3 100644 --- a/httpserver/httpconnectionhandler.cpp +++ b/httpserver/httpconnectionhandler.cpp @@ -6,7 +6,7 @@ #include "httpconnectionhandler.h" #include "httpresponse.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpConnectionHandler::HttpConnectionHandler(QSettings* settings, HttpRequestHandler* requestHandler, QSslConfiguration* sslConfiguration) : QThread() diff --git a/httpserver/httpconnectionhandler.h b/httpserver/httpconnectionhandler.h index c68f4281a..ab0ea7c81 100644 --- a/httpserver/httpconnectionhandler.h +++ b/httpserver/httpconnectionhandler.h @@ -17,7 +17,7 @@ #include "httprequest.h" #include "httprequesthandler.h" -namespace stefanfrings { +namespace qtwebapp { /** Alias type definition, for compatibility to different Qt versions */ #if QT_VERSION >= 0x050000 diff --git a/httpserver/httpconnectionhandlerpool.cpp b/httpserver/httpconnectionhandlerpool.cpp index 3a3615b56..c199fc330 100644 --- a/httpserver/httpconnectionhandlerpool.cpp +++ b/httpserver/httpconnectionhandlerpool.cpp @@ -7,7 +7,7 @@ #include #include "httpconnectionhandlerpool.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpConnectionHandlerPool::HttpConnectionHandlerPool(QSettings* settings, HttpRequestHandler* requestHandler) : QObject() diff --git a/httpserver/httpconnectionhandlerpool.h b/httpserver/httpconnectionhandlerpool.h index c6279f1a2..320ab97fd 100644 --- a/httpserver/httpconnectionhandlerpool.h +++ b/httpserver/httpconnectionhandlerpool.h @@ -8,7 +8,7 @@ #include "httpglobal.h" #include "httpconnectionhandler.h" -namespace stefanfrings { +namespace qtwebapp { /** Pool of http connection handlers. The size of the pool grows and diff --git a/httpserver/httpcookie.cpp b/httpserver/httpcookie.cpp index f09a2c373..444136b9d 100644 --- a/httpserver/httpcookie.cpp +++ b/httpserver/httpcookie.cpp @@ -5,7 +5,7 @@ #include "httpcookie.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpCookie::HttpCookie() { diff --git a/httpserver/httpcookie.h b/httpserver/httpcookie.h index 236888928..2075554d5 100644 --- a/httpserver/httpcookie.h +++ b/httpserver/httpcookie.h @@ -10,7 +10,7 @@ #include #include "httpglobal.h" -namespace stefanfrings { +namespace qtwebapp { /** HTTP cookie as defined in RFC 2109. This class can also parse diff --git a/httpserver/httplistener.cpp b/httpserver/httplistener.cpp index b07c4b8c7..7e86653f7 100644 --- a/httpserver/httplistener.cpp +++ b/httpserver/httplistener.cpp @@ -8,7 +8,7 @@ #include "httpconnectionhandlerpool.h" #include -using namespace stefanfrings; +using namespace qtwebapp; HttpListener::HttpListener(QSettings* settings, HttpRequestHandler* requestHandler, QObject *parent) : QTcpServer(parent) diff --git a/httpserver/httplistener.h b/httpserver/httplistener.h index b1dbfbc9f..11b7a420b 100644 --- a/httpserver/httplistener.h +++ b/httpserver/httplistener.h @@ -14,7 +14,7 @@ #include "httpconnectionhandlerpool.h" #include "httprequesthandler.h" -namespace stefanfrings { +namespace qtwebapp { /** Listens for incoming TCP connections and and passes all incoming HTTP requests to your implementation of HttpRequestHandler, diff --git a/httpserver/httprequest.cpp b/httpserver/httprequest.cpp index a6ac16ec7..73dcd774a 100644 --- a/httpserver/httprequest.cpp +++ b/httpserver/httprequest.cpp @@ -8,7 +8,7 @@ #include #include "httpcookie.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpRequest::HttpRequest(QSettings* settings) { diff --git a/httpserver/httprequest.h b/httpserver/httprequest.h index 42ad41984..46d565b44 100644 --- a/httpserver/httprequest.h +++ b/httpserver/httprequest.h @@ -16,7 +16,7 @@ #include #include "httpglobal.h" -namespace stefanfrings { +namespace qtwebapp { /** This object represents a single HTTP request. It reads the request diff --git a/httpserver/httprequesthandler.cpp b/httpserver/httprequesthandler.cpp index f3a5fbe76..607b41945 100644 --- a/httpserver/httprequesthandler.cpp +++ b/httpserver/httprequesthandler.cpp @@ -5,7 +5,7 @@ #include "httprequesthandler.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpRequestHandler::HttpRequestHandler(QObject* parent) : QObject(parent) diff --git a/httpserver/httprequesthandler.h b/httpserver/httprequesthandler.h index b9c33550e..862baf89c 100644 --- a/httpserver/httprequesthandler.h +++ b/httpserver/httprequesthandler.h @@ -10,7 +10,7 @@ #include "httprequest.h" #include "httpresponse.h" -namespace stefanfrings { +namespace qtwebapp { /** The request handler generates a response for each HTTP request. Web Applications diff --git a/httpserver/httpresponse.cpp b/httpserver/httpresponse.cpp index c7b3eec95..16341f25c 100644 --- a/httpserver/httpresponse.cpp +++ b/httpserver/httpresponse.cpp @@ -5,7 +5,7 @@ #include "httpresponse.h" -using namespace stefanfrings; +using namespace qtwebapp; HttpResponse::HttpResponse(QTcpSocket* socket) { diff --git a/httpserver/httpresponse.h b/httpserver/httpresponse.h index 8aa6524a2..044484b79 100644 --- a/httpserver/httpresponse.h +++ b/httpserver/httpresponse.h @@ -12,7 +12,7 @@ #include "httpglobal.h" #include "httpcookie.h" -namespace stefanfrings { +namespace qtwebapp { /** This object represents a HTTP response, used to return something to the web client. diff --git a/httpserver/httpsession.cpp b/httpserver/httpsession.cpp index 7bcac7f01..5e51e1fc7 100644 --- a/httpserver/httpsession.cpp +++ b/httpserver/httpsession.cpp @@ -7,7 +7,7 @@ #include #include -using namespace stefanfrings; +using namespace qtwebapp; HttpSession::HttpSession(bool canStore) { diff --git a/httpserver/httpsession.h b/httpserver/httpsession.h index e303eb1ef..dabe982c2 100644 --- a/httpserver/httpsession.h +++ b/httpserver/httpsession.h @@ -11,7 +11,7 @@ #include #include "httpglobal.h" -namespace stefanfrings { +namespace qtwebapp { /** This class stores data for a single HTTP session. diff --git a/httpserver/httpsessionstore.cpp b/httpserver/httpsessionstore.cpp index 79e99c851..0f8a47e50 100644 --- a/httpserver/httpsessionstore.cpp +++ b/httpserver/httpsessionstore.cpp @@ -7,7 +7,7 @@ #include #include -using namespace stefanfrings; +using namespace qtwebapp; HttpSessionStore::HttpSessionStore(QSettings* settings, QObject* parent) :QObject(parent) diff --git a/httpserver/httpsessionstore.h b/httpserver/httpsessionstore.h index 1d0d5ca86..814eca23d 100644 --- a/httpserver/httpsessionstore.h +++ b/httpserver/httpsessionstore.h @@ -15,7 +15,7 @@ #include "httpresponse.h" #include "httprequest.h" -namespace stefanfrings { +namespace qtwebapp { /** Stores HTTP sessions and deletes them when they have expired. diff --git a/httpserver/staticfilecontroller.cpp b/httpserver/staticfilecontroller.cpp index e6195766d..3bbdefc47 100644 --- a/httpserver/staticfilecontroller.cpp +++ b/httpserver/staticfilecontroller.cpp @@ -8,7 +8,7 @@ #include #include -using namespace stefanfrings; +using namespace qtwebapp; StaticFileController::StaticFileController(QSettings* settings, QObject* parent) :HttpRequestHandler(parent) diff --git a/httpserver/staticfilecontroller.h b/httpserver/staticfilecontroller.h index 6b2bd1c7a..27a07e909 100644 --- a/httpserver/staticfilecontroller.h +++ b/httpserver/staticfilecontroller.h @@ -13,7 +13,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -namespace stefanfrings { +namespace qtwebapp { /** Delivers static files. It is usually called by the applications main request handler when