OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Magne Sjaastad
2016-06-06 10:43:36 +02:00
parent 4fd8e2503c
commit 7742fbe325
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/FileInterface/RifJsonEncodeDecode.cpp
View File

@@ -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

6
ApplicationCode/FileInterface/RifJsonEncodeDecode.h
View File

@@ -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