diff --git a/src/SelectDialog.cpp b/src/SelectDialog.cpp index 33321bd..867707c 100644 --- a/src/SelectDialog.cpp +++ b/src/SelectDialog.cpp @@ -30,6 +30,6 @@ QString SelectDialog::getSelectedValue() { return box->getSelectedValue(); } -void SelectDialog::setSelectedValue(QString & val) { +void SelectDialog::setSelectedValue(const QString & val) { box->setSelectedValue(val); } diff --git a/src/SelectDialog.h b/src/SelectDialog.h index b964657..548db61 100644 --- a/src/SelectDialog.h +++ b/src/SelectDialog.h @@ -14,7 +14,7 @@ public: ~SelectDialog() override; void setAvailableDates(QStringList dates); QString getSelectedValue(); - void setSelectedValue(QString& val); + void setSelectedValue(const QString& val); protected: bool updateReferenceData() override; SlidePickerBox* box = nullptr; diff --git a/src/components/SlidePickerBox.cpp b/src/components/SlidePickerBox.cpp index abc6000..dfbf22d 100644 --- a/src/components/SlidePickerBox.cpp +++ b/src/components/SlidePickerBox.cpp @@ -211,7 +211,7 @@ void SlidePickerBox::hideLabel(QLabel *label) { label->move(lp); } -void SlidePickerBox::setSelectedValue(QString& val) { +void SlidePickerBox::setSelectedValue(const QString& val) { qDebug()<<"set value:"<text() == val) { diff --git a/src/components/SlidePickerBox.h b/src/components/SlidePickerBox.h index e1acd03..fe6e45c 100644 --- a/src/components/SlidePickerBox.h +++ b/src/components/SlidePickerBox.h @@ -17,7 +17,7 @@ public: { this->items.append(item); } - void setSelectedValue(QString& val); + void setSelectedValue(const QString& val); protected: bool isDragging; diff --git a/src/json/cJSON.h b/src/json/cJSON.h index 2353a66..522f3b4 100644 --- a/src/json/cJSON.h +++ b/src/json/cJSON.h @@ -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); diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp index 784b277..604cf92 100644 --- a/src/json/jsonobject.cpp +++ b/src/json/jsonobject.cpp @@ -7,7 +7,7 @@ #include #include #include - +#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(); diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h index 450c90b..c6147ae 100644 --- a/src/json/jsonobject.h +++ b/src/json/jsonobject.h @@ -2,7 +2,6 @@ #define JSONOBJECT_H //#include -#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; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 78729a0..328b7bc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -236,6 +236,7 @@ MainWindow::MainWindow(QWidget* parent) : msgDialog = nullptr; AppGlobalValues::setInProcessing(false); }); + DeviceManager::Default()->initDevice(); centerWidgetHide(); }