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

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();