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

46
src/json/cJSON.h
View File

@@ -40,36 +40,36 @@ extern "C"
#define cJSON_IsReference 256
/* The cJSON structure: */
typedef struct cJSON {
struct cJSON* next, * prev; /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
struct cJSON* child; /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
typedef struct cJSON {
struct cJSON *next,*prev; /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
struct cJSON *child; /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
int type; /* The type of the item, as above. */
int type; /* The type of the item, as above. */
char* valuestring; /* The item's string, if type==cJSON_String */
int valueint; /* The item's number, if type==cJSON_Number */
double valuedouble; /* The item's number, if type==cJSON_Number */
char *valuestring; /* The item's string, if type==cJSON_String */
int valueint; /* The item's number, if type==cJSON_Number */
double valuedouble; /* The item's number, if type==cJSON_Number */
char* string; /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
} cJSON;
char *string; /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
} cJSON;
typedef struct cJSON_Hooks {
void* (*malloc_fn)(size_t sz);
void (*free_fn)(void* ptr);
} cJSON_Hooks;
typedef struct cJSON_Hooks {
void *(*malloc_fn)(size_t sz);
void (*free_fn)(void *ptr);
} cJSON_Hooks;
/* Supply malloc, realloc and free functions to cJSON */
extern void cJSON_InitHooks(cJSON_Hooks* hooks);
/* Supply malloc, realloc and free functions to cJSON */
extern void cJSON_InitHooks(cJSON_Hooks* hooks);
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
extern cJSON* cJSON_Parse(const char* value);
/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
extern char* cJSON_Print(cJSON* item);
/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
extern char* cJSON_PrintUnformatted(cJSON* item);
/* Delete a cJSON entity and all subentities. */
extern void cJSON_Delete(cJSON* c);
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
extern cJSON *cJSON_Parse(const char *value);
/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
extern char *cJSON_Print(cJSON *item);
/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
extern char *cJSON_PrintUnformatted(cJSON *item);
/* Delete a cJSON entity and all subentities. */
extern void cJSON_Delete(cJSON *c);
/* Returns the number of items in an array (or object). */
extern int cJSON_GetArraySize(cJSON* array);

14
src/json/jsonobject.cpp
View File

@@ -7,7 +7,7 @@
#include <QTranslator>
#include <QDebug>
#include <QApplication>
#include "json/cJSON.h"
const char* strProductFileName = "./cfgs/usct-product.json";
JsonObject::JsonObject()
@@ -24,7 +24,7 @@ void JsonObject::setJsonString(const char* catergory, const char* stringName, co
if (!loadcfg())
return;
cJSON* first = cJSON_FindItemInObject(json_root, catergory);
cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, catergory);
if (!first) return;
cJSON* Item = cJSON_CreateString(stringValue);
@@ -38,7 +38,7 @@ char* JsonObject::getJsonString(const char* catergory, const char* stringName)
if (!loadcfg())
return "";
cJSON* first = cJSON_FindItemInObject(json_root, catergory);
cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, catergory);
if (!first) return "";
cJSON* second = cJSON_FindItemInObject(first, stringName);
@@ -53,7 +53,7 @@ QStringList JsonObject::protocals()
if (!loadcfg())
return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "protocol");
cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "protocol");
if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "lists");
@@ -90,7 +90,7 @@ QStringList JsonObject::worklistFilters()
if (!loadcfg())
return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "worklistfilter");
cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "worklistfilter");
if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "lists");
@@ -107,7 +107,7 @@ QStringList JsonObject::language()
if (!loadcfg())
return QStringList();
cJSON* first = cJSON_FindItemInObject(json_root, "general");
cJSON* first = cJSON_FindItemInObject((cJSON*)json_root, "general");
if (!first) return QStringList();
cJSON* second = cJSON_FindItemInObject(first, "language");
@@ -220,7 +220,7 @@ bool JsonObject::savecfg()
return -1;
}
char* strJsonData = cJSON_Print(json_root);
char* strJsonData = cJSON_Print((cJSON*)json_root);
std::stringstream ss;
ss << strJsonData;
outFile << ss.rdbuf();

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;