diff --git a/YACReaderLibrary/server/controllers/comiccontroller.cpp b/YACReaderLibrary/server/controllers/comiccontroller.cpp index a77290a4..e3e6daad 100644 --- a/YACReaderLibrary/server/controllers/comiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/comiccontroller.cpp @@ -81,8 +81,8 @@ void ComicController::service(HttpRequest& request, HttpResponse& response) response.setHeader("Content-Type", "text/plain; charset=utf-8"); //TODO this field is not used by the client! - response.writeText(QString("library:%1\r\n").arg(libraryName)); - response.writeText(QString("libraryId:%1\r\n").arg(libraryId)); + response.write(QString("library:%1\r\n").arg(libraryName).toUtf8()); + response.write(QString("libraryId:%1\r\n").arg(libraryId).toUtf8()); if(remoteComic) //send previous and next comics id { QList siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId, true); @@ -99,9 +99,9 @@ void ComicController::service(HttpRequest& request, HttpResponse& response) if(found) { if(i>0) - response.writeText(QString("previousComic:%1\r\n").arg(siblings.at(i-1)->id)); + response.write(QString("previousComic:%1\r\n").arg(siblings.at(i-1)->id).toUtf8()); if(iid)); + response.write(QString("nextComic:%1\r\n").arg(siblings.at(i+1)->id).toUtf8()); } else { @@ -109,7 +109,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response) } qDeleteAll(siblings); } - response.writeText(comic.toTXT(),true); + response.write(comic.toTXT().toUtf8(),true); } else { diff --git a/YACReaderLibrary/server/controllers/comicdownloadinfocontroller.cpp b/YACReaderLibrary/server/controllers/comicdownloadinfocontroller.cpp index 8143ec82..2d35ea8e 100644 --- a/YACReaderLibrary/server/controllers/comicdownloadinfocontroller.cpp +++ b/YACReaderLibrary/server/controllers/comicdownloadinfocontroller.cpp @@ -21,6 +21,6 @@ void ComicDownloadInfoController::service(HttpRequest& request, HttpResponse& re ComicDB comic = DBHelper::getComicInfo(libraryId, comicId); //TODO: check if the comic wasn't found; - response.writeText(QString("fileName:%1\r\n").arg(comic.getFileName())); - response.writeText(QString("fileSize:%1\r\n").arg(comic.getFileSize()),true); + response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8()); + response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8(),true); } diff --git a/YACReaderLibrary/server/controllers/foldercontentcontroller.cpp b/YACReaderLibrary/server/controllers/foldercontentcontroller.cpp index 8d88c96a..995493a5 100644 --- a/YACReaderLibrary/server/controllers/foldercontentcontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontentcontroller.cpp @@ -32,7 +32,7 @@ void FolderContentController::service(HttpRequest& request, HttpResponse& respon serviceContent(libraryId, parentId, response); - response.writeText("",true); + response.write("",true); } void FolderContentController::serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response) @@ -54,17 +54,17 @@ void FolderContentController::serviceContent(const int &library, const qulonglon if((*itr)->isDir()) { currentFolder = (Folder *)(*itr); - response.writeText(QString("f\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentFolder->id).arg(currentFolder->name).arg(currentFolder->getNumChildren()).arg(currentFolder->getFirstChildHash())); + response.write(QString("f\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentFolder->id).arg(currentFolder->name).arg(currentFolder->getNumChildren()).arg(currentFolder->getFirstChildHash()).toUtf8()); } else { currentComic = (ComicDB *)(*itr); - response.writeText(QString("c\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()).arg(currentComic->info.hash)); + response.write(QString("c\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()).arg(currentComic->info.hash).toUtf8()); } } clock_t end = clock(); double msecs = double(end - begin); - response.writeText(QString("%1ms").arg(msecs)); + response.write(QString("%1ms").arg(msecs).toUtf8()); } diff --git a/YACReaderLibrary/server/controllers/foldercontroller.cpp b/YACReaderLibrary/server/controllers/foldercontroller.cpp index 3ec241a2..d279dd7b 100644 --- a/YACReaderLibrary/server/controllers/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontroller.cpp @@ -316,6 +316,5 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) t.setVariable("page",QString("%1").arg(page+1)); t.setVariable("pages",QString("%1").arg(numPages)); - response.writeText(t, true); - + response.write(t.toUtf8(), true); } diff --git a/YACReaderLibrary/server/controllers/folderinfocontroller.cpp b/YACReaderLibrary/server/controllers/folderinfocontroller.cpp index 6aaf9029..b88ed0c2 100644 --- a/YACReaderLibrary/server/controllers/folderinfocontroller.cpp +++ b/YACReaderLibrary/server/controllers/folderinfocontroller.cpp @@ -22,7 +22,7 @@ void FolderInfoController::service(HttpRequest& request, HttpResponse& response) serviceComics(libraryId, parentId, response); - response.writeText("",true); + response.write("",true); } void FolderInfoController::serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response) @@ -34,7 +34,7 @@ void FolderInfoController::serviceComics(const int &library, const qulonglong &f for(QList::const_iterator itr = folderComics.constBegin();itr!=folderComics.constEnd();itr++) { currentComic = (ComicDB *)(*itr); - response.writeText(QString("/library/%1/comic/%2:%3:%4\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize())); + response.write(QString("/library/%1/comic/%2:%3:%4\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()).toUtf8()); delete currentComic; } diff --git a/YACReaderLibrary/server/controllers/librariescontroller.cpp b/YACReaderLibrary/server/controllers/librariescontroller.cpp index ac66981c..eb65cffb 100644 --- a/YACReaderLibrary/server/controllers/librariescontroller.cpp +++ b/YACReaderLibrary/server/controllers/librariescontroller.cpp @@ -36,5 +36,5 @@ void LibrariesController::service(HttpRequest& request, HttpResponse& response) } response.setStatus(200,"OK"); - response.writeText(t,true); + response.write(t.toUtf8(),true); } diff --git a/YACReaderLibrary/server/controllers/synccontroller.cpp b/YACReaderLibrary/server/controllers/synccontroller.cpp index 8d945cc8..29cfea66 100644 --- a/YACReaderLibrary/server/controllers/synccontroller.cpp +++ b/YACReaderLibrary/server/controllers/synccontroller.cpp @@ -55,7 +55,7 @@ void SyncController::service(HttpRequest &request, HttpResponse &response) else { response.setStatus(412,"No comic info received"); - response.writeText("",true); + response.write("",true); return; } diff --git a/YACReaderLibrary/server/controllers/tagscontroller.cpp b/YACReaderLibrary/server/controllers/tagscontroller.cpp index d1aa877f..68f82708 100644 --- a/YACReaderLibrary/server/controllers/tagscontroller.cpp +++ b/YACReaderLibrary/server/controllers/tagscontroller.cpp @@ -23,8 +23,8 @@ void TagsController::service(HttpRequest& request, HttpResponse& response) foreach(LabelItem * tag, tags) { - response.writeText(QString("%1\t%2\t%3\r\n").arg(tag->getId()).arg(tag->name()).arg(labelColorToRGBString(tag->colorid()))); + response.write(QString("%1\t%2\t%3\r\n").arg(tag->getId()).arg(tag->name()).arg(labelColorToRGBString(tag->colorid())).toUtf8()); } - response.writeText("",true); + response.write("",true); } diff --git a/YACReaderLibrary/server/controllers/updatecomiccontroller.cpp b/YACReaderLibrary/server/controllers/updatecomiccontroller.cpp index 4682630a..edca4ef3 100644 --- a/YACReaderLibrary/server/controllers/updatecomiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/updatecomiccontroller.cpp @@ -38,7 +38,7 @@ void UpdateComicController::service(HttpRequest &request, HttpResponse &response else { response.setStatus(412,"No comic info received"); - response.writeText("",true); + response.write("",true); return; } diff --git a/YACReaderLibrary/server/controllers/versioncontroller.cpp b/YACReaderLibrary/server/controllers/versioncontroller.cpp index 341923c7..ca699994 100644 --- a/YACReaderLibrary/server/controllers/versioncontroller.cpp +++ b/YACReaderLibrary/server/controllers/versioncontroller.cpp @@ -6,5 +6,5 @@ void VersionController::service(HttpRequest& request, HttpResponse& response) { Q_UNUSED(request); - response.writeText(SERVER_VERSION_NUMBER,true); + response.write(SERVER_VERSION_NUMBER,true); }