Fix merge bug 3

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

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;

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:"<<val;
     for (int i = 0; i < lbls.count() ; ++i) {
         if(lbls[i]->text() == val) {

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;

src/json/jsonobject.cpp

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

src/json/jsonobject.h

@@ -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;

src/mainwindow.cpp

@@ -236,6 +236,7 @@ MainWindow::MainWindow(QWidget* parent) :
         msgDialog = nullptr;
         AppGlobalValues::setInProcessing(false);
     });
+    DeviceManager::Default()->initDevice();
 	centerWidgetHide();
 }