From 10c261c77aad6cc8487617b3e0fb7f34702a7dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 24 Jun 2016 18:54:31 +0200 Subject: [PATCH] Fixed access to `Static::yacreaderSessionStore` members. --- YACReaderLibrary/server/controllers/comiccontroller.cpp | 2 +- YACReaderLibrary/server/controllers/covercontroller.cpp | 2 +- YACReaderLibrary/server/controllers/foldercontroller.cpp | 2 +- YACReaderLibrary/server/controllers/librariescontroller.cpp | 2 +- YACReaderLibrary/server/controllers/pagecontroller.cpp | 2 +- YACReaderLibrary/server/requestmapper.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/YACReaderLibrary/server/controllers/comiccontroller.cpp b/YACReaderLibrary/server/controllers/comiccontroller.cpp index 7ffcec58..7538067d 100644 --- a/YACReaderLibrary/server/controllers/comiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/comiccontroller.cpp @@ -19,7 +19,7 @@ ComicController::ComicController() {} void ComicController::service(HttpRequest& request, HttpResponse& response) { HttpSession session=Static::sessionStore->getSession(request,response,false); - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8(); QStringList pathElements = path.split('/'); diff --git a/YACReaderLibrary/server/controllers/covercontroller.cpp b/YACReaderLibrary/server/controllers/covercontroller.cpp index b8181e9e..09251bef 100644 --- a/YACReaderLibrary/server/controllers/covercontroller.cpp +++ b/YACReaderLibrary/server/controllers/covercontroller.cpp @@ -11,7 +11,7 @@ CoverController::CoverController() {} void CoverController::service(HttpRequest& request, HttpResponse& response) { HttpSession session=Static::sessionStore->getSession(request,response,false); - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); response.setHeader("Content-Type", "image/jpeg"); response.setHeader("Connection","close"); diff --git a/YACReaderLibrary/server/controllers/foldercontroller.cpp b/YACReaderLibrary/server/controllers/foldercontroller.cpp index a8eea99b..275418b8 100644 --- a/YACReaderLibrary/server/controllers/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontroller.cpp @@ -28,7 +28,7 @@ FolderController::FolderController() {} void FolderController::service(HttpRequest& request, HttpResponse& response) { HttpSession session=Static::sessionStore->getSession(request,response,false); - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); response.setHeader("Content-Type", "text/html; charset=utf-8"); response.setHeader("Connection","close"); diff --git a/YACReaderLibrary/server/controllers/librariescontroller.cpp b/YACReaderLibrary/server/controllers/librariescontroller.cpp index 24d12612..547fb578 100644 --- a/YACReaderLibrary/server/controllers/librariescontroller.cpp +++ b/YACReaderLibrary/server/controllers/librariescontroller.cpp @@ -13,7 +13,7 @@ LibrariesController::LibrariesController() {} void LibrariesController::service(HttpRequest& request, HttpResponse& response) { HttpSession session=Static::sessionStore->getSession(request,response,false); - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); response.setHeader("Content-Type", "text/html; charset=utf-8"); response.setHeader("Connection","close"); diff --git a/YACReaderLibrary/server/controllers/pagecontroller.cpp b/YACReaderLibrary/server/controllers/pagecontroller.cpp index eda6fee2..b0af2613 100644 --- a/YACReaderLibrary/server/controllers/pagecontroller.cpp +++ b/YACReaderLibrary/server/controllers/pagecontroller.cpp @@ -18,7 +18,7 @@ PageController::PageController() {} void PageController::service(HttpRequest& request, HttpResponse& response) { HttpSession session=Static::sessionStore->getSession(request,response,false); - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8(); bool remote = path.endsWith("remote"); diff --git a/YACReaderLibrary/server/requestmapper.cpp b/YACReaderLibrary/server/requestmapper.cpp index 5380a194..a04b4556 100644 --- a/YACReaderLibrary/server/requestmapper.cpp +++ b/YACReaderLibrary/server/requestmapper.cpp @@ -41,7 +41,7 @@ void RequestMapper::loadSession(HttpRequest & request, HttpResponse& response) HttpSession session=Static::sessionStore->getSession(request,response); if(session.contains("ySession")) //session is already alive check if it is needed to update comics { - YACReaderHttpSession *ySession = Static::yacreaderSessionStore.value(session.getId()); + YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); QString postData = QString::fromUtf8(request.getBody()); @@ -74,7 +74,7 @@ void RequestMapper::loadSession(HttpRequest & request, HttpResponse& response) { YACReaderHttpSession *ySession = new YACReaderHttpSession(this); - Static::yacreaderSessionStore.insert(session.getId(), ySession); + Static::yacreaderSessionStore->addYACReaderHttpSession(session.getId(), ySession); session.set("ySession","ok");