From 0b498bba27581dfcfd11ce22f6691f966c981bef Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Mon, 24 Sep 2018 18:01:52 +0200
Subject: [PATCH 1/2] Fix up includes to nlohmann json

As written in the README of that project, see https://github.com/nlohmann/json/#integration
---
 src/Cache.h              | 2 +-
 src/MatrixClient.h       | 2 +-
 src/dialogs/RawMessage.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Cache.h b/src/Cache.h
index 5bdfb113..621558ae 100644
--- a/src/Cache.h
+++ b/src/Cache.h
@@ -24,7 +24,7 @@
 #include <QImage>
 #include <QString>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <lmdb++.h>
 #include <mtx/events/join_rules.hpp>
 #include <mtx/responses.hpp>
diff --git a/src/MatrixClient.h b/src/MatrixClient.h
index 981c6b1c..f61c3d41 100644
--- a/src/MatrixClient.h
+++ b/src/MatrixClient.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QString>
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include <mtx/responses.hpp>
 #include <mtxclient/http/client.hpp>
 
diff --git a/src/dialogs/RawMessage.h b/src/dialogs/RawMessage.h
index 5a7335f4..8ca00efc 100644
--- a/src/dialogs/RawMessage.h
+++ b/src/dialogs/RawMessage.h
@@ -6,7 +6,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 #include "Logging.h"
 #include "MainWindow.h"

From 8aae642aa9d177953829130f00eac6082f99ab23 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Mon, 24 Sep 2018 18:02:17 +0200
Subject: [PATCH 2/2] Change nlohmann json download location

---
 deps/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index f1905718..364dc3df 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -73,7 +73,7 @@ set(JSON_HEADER_URL
 set(JSON_HEADER_HASH
     ce6b5610a051ec6795fa11c33854abebb086f0fd67c311f5921c3c07f9531b44)
 
-file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/json.hpp
+file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/nlohmann/json.hpp
      EXPECTED_HASH SHA256=${JSON_HEADER_HASH})
 
 if(USE_BUNDLED_BOOST)