From 806ba96e13d3cf277c4f33989ef9b6c03796ea31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Thu, 21 Mar 2019 11:43:14 +0100
Subject: [PATCH] Revert "add quazip as a dependency"

This reverts commit f619e13dfe7f003d828cc86202da3a5f312953a7.
---
 OpenBoard.pro                               | 12 ++++++------
 plugins/cffadaptor/src/UBCFFAdaptor.cpp     | 12 +++---------
 src/adaptors/UBExportDocument.cpp           |  9 ++-------
 src/adaptors/UBExportDocumentSetAdaptor.cpp |  9 ++-------
 src/adaptors/UBExportDocumentSetAdaptor.h   |  9 ++-------
 src/adaptors/UBExportWeb.cpp                |  9 ++-------
 src/adaptors/UBImportCFF.cpp                | 12 +++---------
 src/adaptors/UBImportDocument.cpp           | 12 +++---------
 src/adaptors/UBImportDocumentSetAdaptor.cpp | 12 +++---------
 src/frameworks/UBFileSystemUtils.cpp        |  6 +-----
 10 files changed, 27 insertions(+), 75 deletions(-)

diff --git a/OpenBoard.pro b/OpenBoard.pro
index 0b04032b..d332fac9 100644
--- a/OpenBoard.pro
+++ b/OpenBoard.pro
@@ -70,6 +70,11 @@ include(src/pdf-merger/pdfMerger.pri)
 include(plugins/plugins.pri)
 INCLUDEPATH += plugins/cffadaptor/src
 
+#ThirdParty
+DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
+INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+
 FORMS += resources/forms/mainWindow.ui \
    resources/forms/preferences.ui \
    resources/forms/brushProperties.ui \
@@ -110,10 +115,7 @@ RCC_DIR = $$BUILD_DIR/rcc
 UI_DIR = $$BUILD_DIR/ui
 
 win32 {
-    #ThirdParty
-    DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
-    INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
-    include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+
 
    LIBS += -lUser32
    LIBS += -lGdi32
@@ -161,7 +163,6 @@ macx {
    LIBS += -framework AVFoundation
    LIBS += -framework CoreMedia
    LIBS += -lcrypto
-   LIBS += -lquazip
 
    CONFIG(release, debug|release):CONFIG += x86_64
    CONFIG(debug, debug|release):CONFIG += x86_64
@@ -419,7 +420,6 @@ macx {
 linux-g++* {
     CONFIG += link_prl
     LIBS += -lcrypto
-    LIBS += -lquazip
     #LIBS += -lprofiler
     LIBS += -lX11
     QMAKE_CFLAGS += -fopenmp
diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp
index 6d19f4ab..45d818e8 100644
--- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp
+++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp
@@ -34,15 +34,9 @@
 #include "UBCFFConstants.h"
 
 //THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
+#include "quazipfileinfo.h"
 //THIRD_PARTY_WARNINGS_ENABLE
 
 UBCFFAdaptor::UBCFFAdaptor()
diff --git a/src/adaptors/UBExportDocument.cpp b/src/adaptors/UBExportDocument.cpp
index 86e5e9a1..069baebc 100644
--- a/src/adaptors/UBExportDocument.cpp
+++ b/src/adaptors/UBExportDocument.cpp
@@ -40,13 +40,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/adaptors/UBExportDocumentSetAdaptor.cpp b/src/adaptors/UBExportDocumentSetAdaptor.cpp
index c074a200..b3a72d54 100644
--- a/src/adaptors/UBExportDocumentSetAdaptor.cpp
+++ b/src/adaptors/UBExportDocumentSetAdaptor.cpp
@@ -41,13 +41,8 @@
 #include "core/UBForeignObjectsHandler.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/adaptors/UBExportDocumentSetAdaptor.h b/src/adaptors/UBExportDocumentSetAdaptor.h
index 3171e219..144ff8f2 100644
--- a/src/adaptors/UBExportDocumentSetAdaptor.h
+++ b/src/adaptors/UBExportDocumentSetAdaptor.h
@@ -34,13 +34,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 class UBDocumentProxy;
diff --git a/src/adaptors/UBExportWeb.cpp b/src/adaptors/UBExportWeb.cpp
index bc733e7f..01442e77 100644
--- a/src/adaptors/UBExportWeb.cpp
+++ b/src/adaptors/UBExportWeb.cpp
@@ -40,13 +40,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/adaptors/UBImportCFF.cpp b/src/adaptors/UBImportCFF.cpp
index 3a602710..83497abd 100644
--- a/src/adaptors/UBImportCFF.cpp
+++ b/src/adaptors/UBImportCFF.cpp
@@ -44,15 +44,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
+#include "quazipfileinfo.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp
index ae128688..5e632f36 100644
--- a/src/adaptors/UBImportDocument.cpp
+++ b/src/adaptors/UBImportDocument.cpp
@@ -39,15 +39,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
+#include "quazipfileinfo.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/adaptors/UBImportDocumentSetAdaptor.cpp b/src/adaptors/UBImportDocumentSetAdaptor.cpp
index f7fe2ef5..a2397b21 100644
--- a/src/adaptors/UBImportDocumentSetAdaptor.cpp
+++ b/src/adaptors/UBImportDocumentSetAdaptor.cpp
@@ -37,15 +37,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
-    #include <quazip/quazip.h>
-    #include <quazip/quazipfile.h>
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
+#include "quazip.h"
+#include "quazipfile.h"
+#include "quazipfileinfo.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"
diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp
index b818a452..99f53453 100644
--- a/src/frameworks/UBFileSystemUtils.cpp
+++ b/src/frameworks/UBFileSystemUtils.cpp
@@ -36,11 +36,7 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#ifdef Q_OS_LINUX
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazipfile.h"
-#endif
+#include "quazipfile.h"
 #include <openssl/md5.h>
 THIRD_PARTY_WARNINGS_ENABLE