sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge bug 3

Browse Source
This commit is contained in:
Krad
2021-12-08 10:52:38 +08:00
parent 7d0d6600e6
commit fb6a46cc45
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/json/jsonobject.h
View File

@@ -2,7 +2,6 @@
#define JSONOBJECT_H
//#include <QObject>
#include "json/cJSON.h"
class QString;
class QStringList;
class QTranslator;
@@ -59,7 +58,7 @@ private:
JsonObject();
~JsonObject();
cJSON* json_root = nullptr;
void* json_root = nullptr;
bool m_bLoaded = false;
int counter;