summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorredsky17 <joedonofry@gmail.com>2019-02-24 19:50:31 +0000
committerredsky17 <joedonofry@gmail.com>2019-02-24 20:05:11 +0000
commit75fb95855d9f48f531c62028c30d3b588a23710a (patch)
treeefa3aca1f0e3cadd3ff34320fc1c2a35f56de3e9 /src
parentMerge pull request #32 from Vistaus/master (diff)
downloadnheko-75fb95855d9f48f531c62028c30d3b588a23710a.tar.xz
Nlohmann build updates
Diffstat (limited to 'src')
-rw-r--r--src/Cache.h2
-rw-r--r--src/MatrixClient.h2
-rw-r--r--src/dialogs/RawMessage.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Cache.h b/src/Cache.h
index 1a133618..f06a7920 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..2af57267 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..c69fad60 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"