From 0738f1b0e8b70c4440576bfc39f6e80d96d346a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Sat, 5 Oct 2013 15:57:49 +0200
Subject: [PATCH] fixed build issues

---
 YACReader/YACReader.pri               | 8 ++++----
 YACReaderLibrary/YACReaderLibrary.pro | 9 ++++-----
 {YACReader => common}/bookmarks.cpp   | 0
 {YACReader => common}/bookmarks.h     | 0
 {YACReader => common}/comic.cpp       | 0
 {YACReader => common}/comic.h         | 0
 compressed_archive/StdAfx.h.cpp       | 6 ------
 7 files changed, 8 insertions(+), 15 deletions(-)
 rename {YACReader => common}/bookmarks.cpp (100%)
 rename {YACReader => common}/bookmarks.h (100%)
 rename {YACReader => common}/comic.cpp (100%)
 rename {YACReader => common}/comic.h (100%)

diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri
index f8d7aa21..91097615 100644
--- a/YACReader/YACReader.pri
+++ b/YACReader/YACReader.pri
@@ -29,7 +29,7 @@ CONFIG += release
 CONFIG -= flat
 
 # Input
-HEADERS += $$PWD/comic.h \
+HEADERS += $$PWD/../common/comic.h \
     $$PWD/configuration.h \
     $$PWD/goto_dialog.h \
     $$PWD/magnifying_glass.h \
@@ -37,7 +37,7 @@ HEADERS += $$PWD/comic.h \
     $$PWD/viewer.h \
     $$PWD/goto_flow.h \
     $$PWD/options_dialog.h \
-    $$PWD/bookmarks.h \
+    $$PWD/../common/bookmarks.h \
     $$PWD/bookmarks_dialog.h \
     $$PWD/render.h \
     $$PWD/shortcuts_dialog.h \
@@ -62,7 +62,7 @@ HEADERS += $$PWD/comic.h \
 	$$PWD/yacreader_local_client.h \
 	$$PWD/../common/http_worker.h
 	
-SOURCES += $$PWD/comic.cpp \
+SOURCES += $$PWD/../common/comic.cpp \
     $$PWD/configuration.cpp \
     $$PWD/goto_dialog.cpp \
 	$$PWD/magnifying_glass.cpp \
@@ -70,7 +70,7 @@ SOURCES += $$PWD/comic.cpp \
     $$PWD/viewer.cpp \
     $$PWD/goto_flow.cpp \
     $$PWD/options_dialog.cpp \
-    $$PWD/bookmarks.cpp \
+    $$PWD/../common/bookmarks.cpp \
     $$PWD/bookmarks_dialog.cpp \
     $$PWD/render.cpp \
     $$PWD/shortcuts_dialog.cpp \
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 0c4aa358..4df1dd97 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -9,7 +9,6 @@ INCLUDEPATH += .
 INCLUDEPATH += ../common \
 	           ./server \
 			   ./db \
-			   ../YACReader  \
 			   ../custom_widgets
 
 DEFINES += SERVER_RELEASE
@@ -64,8 +63,8 @@ HEADERS += comic_flow.h \
 		   ../common/comic_db.h \
 		   ../common/folder.h \
 		   ../common/library_item.h \
-		   ../YACReader/comic.h \
-		   ../YACReader/bookmarks.h \
+		   ../common/comic.h \
+		   ../common/bookmarks.h \
 		   ../common/pictureflow.h \
            ../common/custom_widgets.h \
 		   ../common/qnaturalsorting.h \
@@ -107,8 +106,8 @@ SOURCES += comic_flow.cpp \
 		   ../common/comic_db.cpp \
 		   ../common/folder.cpp \
 		   ../common/library_item.cpp \
-		   ../YACReader/comic.cpp \
-		   ../YACReader/bookmarks.cpp \
+		   ../common/comic.cpp \
+		   ../common/bookmarks.cpp \
            ../common/pictureflow.cpp \
            ../common/custom_widgets.cpp \
 		   ../common/qnaturalsorting.cpp \
diff --git a/YACReader/bookmarks.cpp b/common/bookmarks.cpp
similarity index 100%
rename from YACReader/bookmarks.cpp
rename to common/bookmarks.cpp
diff --git a/YACReader/bookmarks.h b/common/bookmarks.h
similarity index 100%
rename from YACReader/bookmarks.h
rename to common/bookmarks.h
diff --git a/YACReader/comic.cpp b/common/comic.cpp
similarity index 100%
rename from YACReader/comic.cpp
rename to common/comic.cpp
diff --git a/YACReader/comic.h b/common/comic.h
similarity index 100%
rename from YACReader/comic.h
rename to common/comic.h
diff --git a/compressed_archive/StdAfx.h.cpp b/compressed_archive/StdAfx.h.cpp
index 2de6bedd..b86703cb 100644
--- a/compressed_archive/StdAfx.h.cpp
+++ b/compressed_archive/StdAfx.h.cpp
@@ -1,16 +1,10 @@
 /*-------------------------------------------------------------------- 
-* Precompiled header source file used by Visual Studio.NET to generate
-* the .pch file.
 *
 * Due to issues with the dependencies checker within the IDE, it
 * sometimes fails to recompile the PCH file, if we force the IDE to
-* create the PCH file directly from the header file.
-*
 * This file is auto-generated by qmake since no PRECOMPILED_SOURCE was
 * specified, and is used as the common stdafx.cpp. The file is only
-* generated when creating .vcxproj project files, and is not used for
 * command line compilations by nmake.
 *
-* WARNING: All changes made in this file will be lost.
 --------------------------------------------------------------------*/
 #include "StdAfx.h"