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

9172 Remove dependency on QtScript

Browse Source 
* #9172 Update json encoding/decoding to avoid QtScript
* Janitor: remove unused debug code
* Janitor: minor cleanup
* Remove dependencies to Qt Script

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
This commit is contained in:
Kristian Bendiksen
2022-10-18 10:07:16 +02:00
committed by GitHub
parent 760bfaeec2
commit 806c9af82b
6 changed files with 17 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationLibCode/FileInterface/RifJsonEncodeDecode.h
View File

@@ -18,23 +18,9 @@
#pragma once
// Json parser based on code example found on:
// http://stackoverflow.com/questions/4169988/easiest-way-to-parse-json-in-qt-4-7
//#define IMPL_DUMP_TO_FILE
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QVariant>
#include <QtScript/QScriptValue>
#if IMPL_DUMP_TO_FILE
#include <cvfVector3.h>
#include <vector>
#endif
class QScriptEngine;
// Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser
namespace ResInsightInternalJson
@@ -43,23 +29,14 @@ class JsonReader
{
public:
QMap<QString, QVariant> decodeFile( QString filePath );
#if IMPL_DUMP_TO_FILE
void dumpToFile( std::vector<cvf::Vec3d>& points, QString filePath );
#endif
};
class Json
{
public:
Json(){};
QString encode( const QMap<QString, QVariant>& map, bool prettify );
QMap<QString, QVariant> decode( const QString& jsonStr );
private:
QScriptValue encodeInner( const QMap<QString, QVariant>& map, QScriptEngine* engine );
QMap<QString, QVariant> decodeInner( QScriptValue object );
QList<QVariant> decodeInnerToList( QScriptValue arrayValue );
static QString encode( const QMap<QString, QVariant>& map, bool prettify );
static QMap<QString, QVariant> decode( const QString& jsonStr );
static QMap<QString, QVariant> decode( const QByteArray& byteArray );
};
} // namespace ResInsightInternalJson
} // namespace ResInsightInternalJson