Refactoring: fix includes to match new headers paths

Matthieu Longo · Matthieu Longo · commit 395a2562fd11 · 2023-02-21T18:09:14.000Z
diff --git a/jsonld-cpp/include/jsonld-cpp/Context.h b/jsonld-cpp/include/jsonld-cpp/Context.h
@@ -1,9 +1,9 @@
 #ifndef LIBJSONLD_CPP_CONTEXT_H
 #define LIBJSONLD_CPP_CONTEXT_H
 
-#include "jsonld-cpp/jsoninc.h"
-#include "jsonld-cpp/JsonLdConsts.h"
-#include "jsonld-cpp/JsonLdOptions.h"
+#include <nlohmann/json.hpp>
+#include <jsonld-cpp/JsonLdConsts.h>
+#include <jsonld-cpp/JsonLdOptions.h>
 #include <string>
 #include <memory>
 
diff --git a/jsonld-cpp/include/jsonld-cpp/ContextProcessor.h b/jsonld-cpp/include/jsonld-cpp/ContextProcessor.h
@@ -1,8 +1,8 @@
 #ifndef JSONLD_CPP_LIBRARY_CONTEXTPROCESSOR_H
 #define JSONLD_CPP_LIBRARY_CONTEXTPROCESSOR_H
 
-#include "jsonld-cpp/Context.h"
-#include "jsonld-cpp/jsoninc.h"
+#include <jsonld-cpp/Context.h>
+#include <nlohmann/json.hpp>
 #include <string>
 
 struct ContextProcessor {
diff --git a/jsonld-cpp/include/jsonld-cpp/ExpansionProcessor.h b/jsonld-cpp/include/jsonld-cpp/ExpansionProcessor.h
@@ -1,7 +1,7 @@
 #ifndef JSONLD_CPP_LIBRARY_EXPANSIONPROCESSOR_H
 #define JSONLD_CPP_LIBRARY_EXPANSIONPROCESSOR_H
 
-#include "jsonld-cpp/jsoninc.h"
+#include <nlohmann/json.hpp>
 
 class Context;
 
diff --git a/jsonld-cpp/include/jsonld-cpp/FileLoader.h b/jsonld-cpp/include/jsonld-cpp/FileLoader.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_FILELOADER_H
 #define LIBJSONLD_CPP_FILELOADER_H
 
-#include "jsonld-cpp/DocumentLoader.h"
+#include <jsonld-cpp/DocumentLoader.h>
 
 class RemoteDocument;
 
diff --git a/jsonld-cpp/include/jsonld-cpp/JSONDocument.h b/jsonld-cpp/include/jsonld-cpp/JSONDocument.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_JSONDOCUMENT_H
 #define LIBJSONLD_CPP_JSONDOCUMENT_H
 
-#include "jsonld-cpp/RemoteDocument.h"
+#include <jsonld-cpp/RemoteDocument.h>
 
 namespace RDF {
     class RDFDataset;
diff --git a/jsonld-cpp/include/jsonld-cpp/JsonLdError.h b/jsonld-cpp/include/jsonld-cpp/JsonLdError.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_JSONLDERROR_H
 #define LIBJSONLD_CPP_JSONLDERROR_H
 
-#include "jsonld-cpp/jsoninc.h"
+#include <nlohmann/json.hpp>
 
 class JsonLdError : public std::runtime_error {
 public:
diff --git a/jsonld-cpp/include/jsonld-cpp/JsonLdOptions.h b/jsonld-cpp/include/jsonld-cpp/JsonLdOptions.h
@@ -4,9 +4,9 @@
 // The JsonLdOptions type as specified in "JSON-LD-API specification":
 // https://www.w3.org/TR/json-ld-api/#the-jsonldoptions-type
 
-#include "jsonld-cpp/jsoninc.h"
-#include "jsonld-cpp/DocumentLoader.h"
-#include "jsonld-cpp/JsonLdConsts.h"
+#include <nlohmann/json.hpp>
+#include <jsonld-cpp/DocumentLoader.h>
+#include <jsonld-cpp/JsonLdConsts.h>
 #include <string>
 #include <sstream>
 
diff --git a/jsonld-cpp/include/jsonld-cpp/JsonLdProcessor.h b/jsonld-cpp/include/jsonld-cpp/JsonLdProcessor.h
@@ -1,8 +1,8 @@
 #ifndef LIBJSONLD_CPP_JSONLDPROCESSOR_H
 #define LIBJSONLD_CPP_JSONLDPROCESSOR_H
 
-#include "jsonld-cpp/jsoninc.h"
-#include "jsonld-cpp/JsonLdOptions.h"
+#include <nlohmann/json.hpp>
+#include <jsonld-cpp/JsonLdOptions.h>
 
 namespace RDF {
     class RDFDataset;
diff --git a/jsonld-cpp/include/jsonld-cpp/JsonLdUtils.h b/jsonld-cpp/include/jsonld-cpp/JsonLdUtils.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_JSONLDUTILS_H
 #define LIBJSONLD_CPP_JSONLDUTILS_H
 
-#include "jsonld-cpp/jsoninc.h"
+#include <nlohmann/json.hpp>
 
 namespace JsonLdUtils {
 
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFDataset.h b/jsonld-cpp/include/jsonld-cpp/RDFDataset.h
@@ -1,9 +1,9 @@
 #ifndef LIBJSONLD_CPP_RDFDATASET_H
 #define LIBJSONLD_CPP_RDFDATASET_H
 
-#include "jsonld-cpp/RDFTriple.h"
-#include "jsonld-cpp/RDFQuad.h"
-#include "jsonld-cpp/JsonLdOptions.h"
+#include <jsonld-cpp/RDFTriple.h>
+#include <jsonld-cpp/RDFQuad.h>
+#include <jsonld-cpp/JsonLdOptions.h>
 #include <vector>
 #include <map>
 #include <string>
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFDatasetComparison.h b/jsonld-cpp/include/jsonld-cpp/RDFDatasetComparison.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_RDFDATASETCOMPARISON_H
 #define LIBJSONLD_CPP_RDFDATASETCOMPARISON_H
 
-#include "jsonld-cpp/RDFDataset.h"
+#include <jsonld-cpp/RDFDataset.h>
 
 // Thanks to titanium-json-ld for this class
 
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFDocument.h b/jsonld-cpp/include/jsonld-cpp/RDFDocument.h
@@ -1,9 +1,9 @@
 #ifndef LIBJSONLD_CPP_RDFDOCUMENT_H
 #define LIBJSONLD_CPP_RDFDOCUMENT_H
 
-#include "jsonld-cpp/RemoteDocument.h"
-#include "jsonld-cpp/RDFDataset.h"
-#include "jsonld-cpp/MediaType.h"
+#include <jsonld-cpp/RemoteDocument.h>
+#include <jsonld-cpp/RDFDataset.h>
+#include <jsonld-cpp/MediaType.h>
 
 
 class RDFDocument : public RemoteDocument {
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFNode.h b/jsonld-cpp/include/jsonld-cpp/RDFNode.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_RDFNODE_H
 #define LIBJSONLD_CPP_RDFNODE_H
 
-#include "jsonld-cpp/jsoninc.h"
+#include <nlohmann/json.hpp>
 #include <memory>
 #include <string>
 
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFQuad.h b/jsonld-cpp/include/jsonld-cpp/RDFQuad.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_RDFQUAD_H
 #define LIBJSONLD_CPP_RDFQUAD_H
 
-#include "jsonld-cpp/RDFNode.h"
+#include <jsonld-cpp/RDFNode.h>
 #include <memory>
 #include <string>
 
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFSerializationProcessor.h b/jsonld-cpp/include/jsonld-cpp/RDFSerializationProcessor.h
@@ -1,7 +1,7 @@
 #ifndef JSONLD_CPP_LIBRARY_RDFSERIALIZATIONPROCESSOR_H
 #define JSONLD_CPP_LIBRARY_RDFSERIALIZATIONPROCESSOR_H
 
-#include "jsonld-cpp/jsoninc.h"
+#include <nlohmann/json.hpp>
 
 
 class JsonLdOptions;
diff --git a/jsonld-cpp/include/jsonld-cpp/RDFTriple.h b/jsonld-cpp/include/jsonld-cpp/RDFTriple.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_RDFTRIPLE_H
 #define LIBJSONLD_CPP_RDFTRIPLE_H
 
-#include "jsonld-cpp/RDFNode.h"
+#include <jsonld-cpp/RDFNode.h>
 #include <memory>
 #include <string>
 
diff --git a/jsonld-cpp/include/jsonld-cpp/RemoteDocument.h b/jsonld-cpp/include/jsonld-cpp/RemoteDocument.h
@@ -1,8 +1,8 @@
 #ifndef LIBJSONLD_CPP_REMOTEDOCUMENT_H
 #define LIBJSONLD_CPP_REMOTEDOCUMENT_H
 
-#include "jsonld-cpp/jsoninc.h"
-#include "jsonld-cpp/MediaType.h"
+#include <nlohmann/json.hpp>
+#include <jsonld-cpp/MediaType.h>
 #include <string>
 
 namespace RDF {
diff --git a/test/implementation-report/ConfigReader.h b/test/implementation-report/ConfigReader.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <set>
 #include <vector>
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 
 /**
  * \brief   Interface for reading the configuration file
diff --git a/test/implementation-report/RdfDataBuilder.h b/test/implementation-report/RdfDataBuilder.h
@@ -3,7 +3,7 @@
 
 #include "RdfData.h"
 #include "TestResult.h"
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 #include <regex>
 
 /**
diff --git a/test/testjsonld-cpp/TestCase.h b/test/testjsonld-cpp/TestCase.h
@@ -1,7 +1,7 @@
 #ifndef LIBJSONLD_CPP_TESTCASE_H
 #define LIBJSONLD_CPP_TESTCASE_H
 
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 #include "TestCaseOptions.h"
 
 #include <string>
diff --git a/test/testjsonld-cpp/TestCaseOptions.h b/test/testjsonld-cpp/TestCaseOptions.h
@@ -2,7 +2,7 @@
 #define LIBJSONLD_CPP_TESTCASEOPTIONS_H
 
 #include <jsonld-cpp/JsonLdOptions.h>
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 
 struct TestCaseOptions {
     static TestCaseOptions create(nlohmann::json o, std::string baseUri);
diff --git a/test/testjsonld-cpp/test_FileLoader.cpp b/test/testjsonld-cpp/test_FileLoader.cpp
@@ -1,6 +1,6 @@
 #include <jsonld-cpp/FileLoader.h>
 #include <jsonld-cpp/RemoteDocument.h>
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 
 using nlohmann::json;
 
diff --git a/test/testjsonld-cpp/test_JsonLdUtils.cpp b/test/testjsonld-cpp/test_JsonLdUtils.cpp
@@ -1,5 +1,5 @@
 #include <jsonld-cpp/JsonLdUtils.h>
-#include <jsonld-cpp/jsoninc.h>
+#include <nlohmann/json.hpp>
 
 using nlohmann::json;
 
