Fixed YACReaderLibrary compilation under Qt5 (untested at runtime)

TODO fix YACReader compilation under Qt5
     update poppler
     update server

YACReaderLibrary/YACReaderLibrary.pro

@@ -13,7 +13,7 @@ INCLUDEPATH += ../common \
 			   ./comic_vine \
 			   ./comic_vine/model
 
-DEFINES += SERVER_RELEASE
+DEFINES += SERVER_RELEASE NOMINMAX
 			   
 win32 {
 INCLUDEPATH += ../dependencies/poppler/include
@@ -143,6 +143,12 @@ TRANSLATIONS    = yacreaderlibrary_es.ts \
 									yacreaderlibrary_fr.ts \
 									yacreaderlibrary_nl.ts \
 									yacreaderlibrary_source.ts
-
-Release:DESTDIR = ../release
-Debug:DESTDIR = ../debug
+contains(QT_MINOR_VERSION, 5) {
+    Release:DESTDIR = ../release5
+    Debug:DESTDIR = ../debug5
+}
+!contains(QT_MINOR_VERSION, 5)
+{
+    Release:DESTDIR = ../release
+    Debug:DESTDIR = ../debug
+}

YACReaderLibrary/library_window.cpp

@@ -16,6 +16,7 @@
 #include <QMatrix>
 #include <QSettings>
 #include <QGLFormat>
+#include <QHeaderView>
 
 #include <iterator>
 #include <typeinfo>
@@ -939,7 +940,11 @@ void LibraryWindow::loadCovers(const QModelIndex & mi)
 	
 	comicView->setModel(dmCV);
 	comicView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
+#if QT_VERSION >= 0x050100
+	comicView->horizontalHeader()->setSectionsMovable(true);
+#else
 	comicView->horizontalHeader()->setMovable(true);
+#endif
 	//TODO parametrizar la configuración de las columnas
 	for(int i = 0;i<comicView->horizontalHeader()->count();i++)
 		comicView->horizontalHeader()->hideSection(i);
@@ -1730,4 +1735,4 @@ void LibraryWindow::updateComicsView(quint64 libraryId, const ComicDB & comic)
 		dmCV->reload(comic);
 		comicFlow->setMarks(dmCV->getReadList());
 	}
-}
+}

YACReaderLibrary/properties_dialog.cpp

@@ -16,6 +16,11 @@
 #include <QTabWidget>
 #include <QIntValidator>
 #include <QFileInfo>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <QToolButton>
+#include <QPushButton>
+#include <QMessageBox>
 
 PropertiesDialog::PropertiesDialog(QWidget * parent)
 :QDialog(parent)

YACReaderLibrary/server/lib/bfHttpServer/httpresponse.cpp

@@ -112,7 +112,7 @@ void HttpResponse::write(QByteArray data, bool lastPart) {
 
 void HttpResponse::writeText(QString text, bool lastPart)
 {
-	write(text.toAscii(),lastPart);
+	write(text.toLatin1(),lastPart);
 }
 
 bool HttpResponse::hasSentLastPart() const {

YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp

@@ -13,7 +13,7 @@ HttpSession::HttpSession(bool canStore) {
 		dataPtr=new HttpSessionData();
 		dataPtr->refCount=1;
 		dataPtr->lastAccess=QDateTime::currentMSecsSinceEpoch();
-		dataPtr->id=QUuid::createUuid().toString().toAscii();
+		dataPtr->id=QUuid::createUuid().toString().toLatin1();
 		dataPtr->yacreaderSessionData.comic = 0;
 		dataPtr->yacreaderSessionData.comicId = 0;
 #ifdef SUPERVERBOSE
@@ -306,4 +306,4 @@ int HttpSession::topPage()
 	if(dataPtr)
 		return dataPtr->yacreaderSessionData.navigationPath.top();
 	return 0;
-}
+}

YACReaderLibrary/server/lib/bfLogging/logger.cpp

@@ -9,6 +9,7 @@
 #include <QMutex>
 #include <QDateTime>
 #include <QThread>
+#include <QtGlobal>
 
 Logger* Logger::defaultLogger=0;
 
@@ -72,7 +73,12 @@ void Logger::msgHandler(const QtMsgType type, const char* message) {
 
 Logger::~Logger() {
     if (defaultLogger==this) {
-        qInstallMsgHandler(0);
+#if QT_VERSION >= 0x050100
+	qInstallMessageHandler(0);
+#else
+	qInstallMsgHandler(0);
+#endif
+
         defaultLogger=0;
     }
 }
@@ -86,7 +92,11 @@ void Logger::write(const LogMessage* logMessage) {
 
 void Logger::installMsgHandler() {
     defaultLogger=this;
-    qInstallMsgHandler(msgHandler);
+#if QT_VERSION >= 0x050100
+	//qInstallMessageHandler(msgHandler); TODO Qt5
+#else
+	qInstallMsgHandler(msgHandler);
+#endif
 }
 
 

YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp

@@ -30,7 +30,7 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
         textCodec=QTextCodec::codecForLocale();
     }
     else {
-       textCodec=QTextCodec::codecForName(encoding.toAscii());
+	   textCodec=QTextCodec::codecForName(encoding.toLatin1());
    }
    qDebug("TemplateLoader: path=%s, codec=%s",qPrintable(templatePath),textCodec->name().data());
 }

common/check_new_version.h

@@ -5,8 +5,6 @@
 #include "yacreader_global.h"
 
 #include <QWidget>
-#include <QHttp>
-#include <QHttpResponseHeader>
 #include <QByteArray>
 #include <QThread>
 

common/comic.cpp

@@ -6,6 +6,8 @@
 #include <algorithm>
 #include <QDir>
 #include <QFileInfoList>
+#include <QApplication>
+
 #include "bookmarks.h" //TODO desacoplar la dependencia con bookmarks
 #include "qnaturalsorting.h"
 #include "compressed_archive.h"
@@ -698,4 +700,4 @@ Comic * FactoryComic::newComic(const QString & path)
 	else
 		return NULL;
 
-}
+}

common/http_worker.h

@@ -2,8 +2,6 @@
 #define __HTTP_WORKER_H
 
 #include <QWidget>
-#include <QHttp>
-#include <QHttpResponseHeader>
 #include <QByteArray>
 #include <QThread>
 #include <QUrl>

custom_widgets/yacreader_table_view.cpp

@@ -31,15 +31,27 @@ YACReaderTableView::YACReaderTableView(QWidget *parent) :
 	setContextMenuPolicy(Qt::ActionsContextMenu);
 
 	setShowGrid(false);
-
+#if QT_VERSION >= 0x050100
+	verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
+#else
 	verticalHeader()->setResizeMode(QHeaderView::Fixed);
+#endif
 
 	//comicView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
 	horizontalHeader()->setStretchLastSection(true);
+#if QT_VERSION >= 0x050100
+	horizontalHeader()->setSectionsClickable(false);
+#else
 	horizontalHeader()->setClickable(false);
+#endif
 	//comicView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
 	verticalHeader()->setDefaultSectionSize(24);
+#if QT_VERSION >= 0x050100
+	verticalHeader()->setSectionsClickable(false); //TODO comportamiento anómalo
+#else
 	verticalHeader()->setClickable(false); //TODO comportamiento anómalo
+#endif
+
 	setCornerButtonEnabled(false);
 
 	setSelectionBehavior(QAbstractItemView::SelectRows);