Update server code integration for QtWebApp 1.7.11

- Adapt server code for QtWebapp namespace 'stefanfrings'
- Implement custom modifications needed by v1 controller
  via template engine
- Unify iphone and ipad templates

YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp

@@ -14,6 +14,9 @@
 
 #include <typeinfo>
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ComicControllerV2::ComicControllerV2() { }
 
 void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h

@@ -9,7 +9,7 @@
 class Comic;
 class QString;
 
-class ComicControllerV2 : public HttpRequestHandler
+class ComicControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ComicControllerV2)
@@ -18,7 +18,7 @@ public:
     ComicControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // COMICCONTROLLER_H

YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp

@@ -5,6 +5,9 @@
 
 #include "comic_db.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ComicDownloadInfoControllerV2::ComicDownloadInfoControllerV2() { }
 
 void ComicDownloadInfoControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ComicDownloadInfoControllerV2 : public HttpRequestHandler
+class ComicDownloadInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ComicDownloadInfoControllerV2)
@@ -14,7 +14,7 @@ public:
     ComicDownloadInfoControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // COMICDOWNLOADINFOCONTROLLER_H

YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp

@@ -11,6 +11,9 @@
 #include "qnaturalsorting.h"
 
 #include <ctime>
+
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
 using namespace std;
 
 ComicFullinfoController_v2::ComicFullinfoController_v2() { }

YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ComicFullinfoController_v2 : public HttpRequestHandler
+class ComicFullinfoController_v2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ComicFullinfoController_v2)
 public:
     ComicFullinfoController_v2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int &library, const qulonglong &comicId, HttpResponse &response);
+    void serviceContent(const int &library, const qulonglong &comicId, stefanfrings::HttpResponse &response);
 };
 
 #endif // COMICFULLINFOCONTROLLER_V2_H

YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp

@@ -6,6 +6,9 @@
 #include "template.h"
 #include "../static.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 CoverControllerV2::CoverControllerV2() { }
 
 void CoverControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/covercontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class CoverControllerV2 : public HttpRequestHandler
+class CoverControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(CoverControllerV2)
@@ -14,7 +14,7 @@ public:
     CoverControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // COVERCONTROLLER_H

YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp

@@ -3,6 +3,9 @@
 #include "template.h"
 #include "../static.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ErrorControllerV2::ErrorControllerV2(int errorCode)
     : error(errorCode)
 {

YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ErrorControllerV2 : public HttpRequestHandler
+class ErrorControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ErrorControllerV2)
@@ -14,7 +14,7 @@ public:
     ErrorControllerV2(int errorCode);
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
     int error;

YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp

@@ -5,6 +5,9 @@
 
 #include "yacreader_server_data_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 FavoritesControllerV2::FavoritesControllerV2() { }
 
 void FavoritesControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class FavoritesControllerV2 : public HttpRequestHandler
+class FavoritesControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(FavoritesControllerV2)
 public:
     FavoritesControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int library, HttpResponse &response);
+    void serviceContent(const int library, stefanfrings::HttpResponse &response);
 };
 
 #endif // FAVORITESCONTROLLER_H

YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp

@@ -14,6 +14,9 @@
 
 #include <chrono>
 #include <ctime>
+
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
 using namespace std;
 
 struct LibraryItemSorter {

YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class FolderContentControllerV2 : public HttpRequestHandler
+class FolderContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(FolderContentControllerV2)
@@ -14,10 +14,10 @@ public:
     FolderContentControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response);
+    void serviceContent(const int &library, const qulonglong &folderId, stefanfrings::HttpResponse &response);
 };
 
 #endif // FOLDERCONTENTCONTROLLER_H

YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp

@@ -7,6 +7,9 @@
 #include "template.h"
 #include "../static.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 FolderInfoControllerV2::FolderInfoControllerV2() { }
 
 void FolderInfoControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class FolderInfoControllerV2 : public HttpRequestHandler
+class FolderInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(FolderInfoControllerV2)
@@ -14,10 +14,10 @@ public:
     FolderInfoControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response);
+    void serviceComics(const int &library, const qulonglong &folderId, stefanfrings::HttpResponse &response);
 };
 
 #endif // FOLDERINFOCONTROLLER_H

YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp

@@ -7,6 +7,9 @@
 
 #include "QsLog.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 LibrariesControllerV2::LibrariesControllerV2() { }
 
 void LibrariesControllerV2::service(HttpRequest & /* request */, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h

@@ -9,7 +9,7 @@
   This controller displays a HTML form and dumps the submitted input.
 */
 
-class LibrariesControllerV2 : public HttpRequestHandler
+class LibrariesControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(LibrariesControllerV2)
@@ -18,7 +18,7 @@ public:
     LibrariesControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // LIBRARIESCONTROLLER_H

YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp

@@ -13,6 +13,9 @@
 
 #include "db_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 PageControllerV2::PageControllerV2() { }
 
 void PageControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class PageControllerV2 : public HttpRequestHandler
+class PageControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(PageControllerV2)
@@ -14,7 +14,7 @@ public:
     PageControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // PAGECONTROLLER_H

YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp

@@ -5,6 +5,9 @@
 
 #include "yacreader_server_data_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ReadingComicsControllerV2::ReadingComicsControllerV2()
 {
 }

YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ReadingComicsControllerV2 : public HttpRequestHandler
+class ReadingComicsControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ReadingComicsControllerV2)
 public:
     ReadingComicsControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int &library, HttpResponse &response);
+    void serviceContent(const int &library, stefanfrings::HttpResponse &response);
 };
 
 #endif // READINGCOMICSCONTROLLER_H

YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp

@@ -5,6 +5,9 @@
 
 #include "yacreader_server_data_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ReadingListContentControllerV2::ReadingListContentControllerV2()
 {
 }

YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ReadingListContentControllerV2 : public HttpRequestHandler
+class ReadingListContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ReadingListContentControllerV2)
 public:
     ReadingListContentControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response);
+    void serviceContent(const int &library, const qulonglong &readingListId, stefanfrings::HttpResponse &response);
 };
 
 #endif // READINGLISTCONTENTCONTROLLER_H

YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp

@@ -8,6 +8,9 @@
 #include "template.h"
 #include "../static.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ReadingListInfoControllerV2::ReadingListInfoControllerV2() { }
 
 void ReadingListInfoControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ReadingListInfoControllerV2 : public HttpRequestHandler
+class ReadingListInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ReadingListInfoControllerV2)
 public:
     ReadingListInfoControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceComics(const int &library, const qulonglong &readingListId, HttpResponse &response);
+    void serviceComics(const int &library, const qulonglong &readingListId, stefanfrings::HttpResponse &response);
 };
 
 #endif // READINGLISTINFOCONTROLLER_V2_H

YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp

@@ -4,6 +4,9 @@
 #include "reading_list.h"
 #include "yacreader_server_data_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 ReadingListsControllerV2::ReadingListsControllerV2()
 {
 }

YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class ReadingListsControllerV2 : public HttpRequestHandler
+class ReadingListsControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(ReadingListsControllerV2)
 public:
     ReadingListsControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int library, HttpResponse &response);
+    void serviceContent(const int library, stefanfrings::HttpResponse &response);
 };
 
 #endif // READINGLISTSCONTROLLER_H

YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp

@@ -6,6 +6,9 @@
 #include "comic_db.h"
 #include "db_helper.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 SyncControllerV2::SyncControllerV2()
 {
 }

YACReaderLibrary/server/controllers/v2/synccontroller_v2.h

@@ -7,7 +7,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class SyncControllerV2 : public HttpRequestHandler
+class SyncControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(SyncControllerV2)
@@ -16,7 +16,7 @@ public:
     SyncControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // SYNCCONTROLLER_H

YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp

@@ -7,6 +7,9 @@
 
 #include <QUrl>
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 TagContentControllerV2::TagContentControllerV2()
 {
 }

YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class TagContentControllerV2 : public HttpRequestHandler
+class TagContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(TagContentControllerV2)
@@ -14,10 +14,10 @@ public:
     TagContentControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response);
+    void serviceContent(const int &library, const qulonglong &tagId, stefanfrings::HttpResponse &response);
 };
 
 #endif // TAGCONTENTCONTROLLER_H

YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp

@@ -8,6 +8,9 @@
 #include "template.h"
 #include "../static.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 TagInfoControllerV2::TagInfoControllerV2() { }
 
 void TagInfoControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h

@@ -5,17 +5,17 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class TagInfoControllerV2 : public HttpRequestHandler
+class TagInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(TagInfoControllerV2)
 public:
     TagInfoControllerV2();
 
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 
 private:
-    void serviceComics(const int &library, const qulonglong &tagId, HttpResponse &response);
+    void serviceComics(const int &library, const qulonglong &tagId, stefanfrings::HttpResponse &response);
 };
 
 #endif // TAGINFOCONTROLLER_V2_H

YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp

@@ -11,6 +11,9 @@
 
 #include "QsLog.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 TagsControllerV2::TagsControllerV2() { }
 
 void TagsControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class TagsControllerV2 : public HttpRequestHandler
+class TagsControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(TagsControllerV2)
@@ -14,7 +14,7 @@ public:
     TagsControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // TAGSCONTROLLER_H

YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp

@@ -11,6 +11,9 @@
 
 #include "QsLog.h"
 
+using stefanfrings::HttpRequest;
+using stefanfrings::HttpResponse;
+
 UpdateComicControllerV2::UpdateComicControllerV2() { }
 
 void UpdateComicControllerV2::service(HttpRequest &request, HttpResponse &response)

YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h

@@ -5,7 +5,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
-class UpdateComicControllerV2 : public HttpRequestHandler
+class UpdateComicControllerV2 : public stefanfrings::HttpRequestHandler
 {
     Q_OBJECT
     Q_DISABLE_COPY(UpdateComicControllerV2)
@@ -14,7 +14,7 @@ public:
     UpdateComicControllerV2();
 
     /** Generates the response */
-    void service(HttpRequest &request, HttpResponse &response) override;
+    void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override;
 };
 
 #endif // UPDATECOMICCONTROLLER_H