Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser

ApplicationCode/CMakeLists.txt

@@ -290,7 +290,6 @@ if(RESINSIGHT_ENABLE_COTIRE)
   set_source_files_properties (${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc PROPERTIES COTIRE_EXCLUDED TRUE)
   
   # TODO: Revisit why opm-parser is not working
-  # Must namespace JsonReader in RifJsonEncodeDecode to guard agains crash with JSON in opm-parser
   set_source_files_properties (${ResInsight_SOURCE_DIR}/ApplicationCode/UnitTests/opm-parser-Test.cpp  PROPERTIES COTIRE_EXCLUDED TRUE)
  
    set_target_properties(ResInsight PROPERTIES

ApplicationCode/FileInterface/RifJsonEncodeDecode.cpp

@@ -26,6 +26,7 @@
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValueIterator>
 
+namespace ResInsightInternalJson {
 
 QMap<QString, QVariant> JsonReader::decodeFile(QString filePath)
 {
@@ -141,3 +142,5 @@ QList<QVariant> Json::decodeInnerToList(QScriptValue arrayValue)
     }
     return list;
 }
+
+} // end ResInsightInternalJson

ApplicationCode/FileInterface/RifJsonEncodeDecode.h

@@ -36,6 +36,9 @@
 
 class QScriptEngine;
 
+// Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser
+namespace ResInsightInternalJson {
+
 class JsonReader
 {
 public:
@@ -58,3 +61,6 @@ private:
     QMap<QString, QVariant> decodeInner(QScriptValue object);
     QList<QVariant> decodeInnerToList(QScriptValue arrayValue);
 };
+
+
+} // end ResInsightInternalJson

ApplicationCode/ProjectDataModel/RimWellPath.cpp

@@ -210,7 +210,7 @@ bool RimWellPath::readWellPathFile(QString* errorMessage, RifWellPathAsciiFileRe
 void RimWellPath::readJsonWellPathFile()
 {
     RigWellPath* wellPathGeom = new RigWellPath();
-    JsonReader jsonReader;
+    ResInsightInternalJson::JsonReader jsonReader;
     QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(filepath);
 
     // General well info

ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp

@@ -354,7 +354,7 @@ void RiuWellImportWizard::updateFieldsModel()
 
     if (QFile::exists(fileName))
     {
-        JsonReader jsonReader;
+        ResInsightInternalJson::JsonReader jsonReader;
         QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(fileName);
 
         QStringList regions;
@@ -581,7 +581,7 @@ void RiuWellImportWizard::parseWellsResponse(RimOilFieldEntry* oilFieldEntry)
 
     if (QFile::exists(oilFieldEntry->wellsFilePath))
     {
-        JsonReader jsonReader;
+        ResInsightInternalJson::JsonReader jsonReader;
         QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(oilFieldEntry->wellsFilePath);
 
         QMapIterator<QString, QVariant> it(jsonMap);