Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions

View File

@@ -28,12 +28,24 @@ namespace ResInsightInternalJson
class JsonReader
{
public:
QMap<QString, QVariant> decodeFile( QString filePath );
static QMap<QString, QVariant> decodeFile( QString filePath );
// Get a variant list from a map
static QVariantList getVariantList( const QMap<QString, QVariant>& map );
static QString rootKeyText();
private:
JsonReader(){};
};
class JsonWriter
{
public:
static bool encodeFile( QString filePath, QMap<QString, QVariant> map );
private:
JsonWriter(){};
};
class Json