Commit d6955937b758b0c1755721c41ac19f7d2be62b87

Authored by 김태훈
1 parent cd944569cc
Exists in master and in 2 other branches fhd, fhd-demo

컴파일 경고 제거

app/gui/oven_control/config.cpp
@@ -482,7 +482,7 @@ void Config::allProgramInit() @@ -482,7 +482,7 @@ void Config::allProgramInit()
482 } 482 }
483 } 483 }
484 484
485 -bool Config::loadProductInfo() 485 +void Config::loadProductInfo()
486 { 486 {
487 QString strTemp; 487 QString strTemp;
488 QMap<QString , QString> mapInfos; 488 QMap<QString , QString> mapInfos;
app/gui/oven_control/config.h
@@ -112,7 +112,7 @@ const char hotline_service_item_name[3][32] ={ @@ -112,7 +112,7 @@ const char hotline_service_item_name[3][32] ={
112 }; 112 };
113 113
114 114
115 -static const char* g_strModelTypeName[] ={ 115 +const char g_strModelTypeName[16][64] ={
116 QT_TRANSLATE_NOOP("Config", "전기식 10단"), 116 QT_TRANSLATE_NOOP("Config", "전기식 10단"),
117 QT_TRANSLATE_NOOP("Config", "전기식 20단"), 117 QT_TRANSLATE_NOOP("Config", "전기식 20단"),
118 QT_TRANSLATE_NOOP("Config", "전기식 24단"), 118 QT_TRANSLATE_NOOP("Config", "전기식 24단"),
@@ -477,7 +477,7 @@ public: @@ -477,7 +477,7 @@ public:
477 void removeFavorite(Define::ConfigType idx); 477 void removeFavorite(Define::ConfigType idx);
478 void applyCurrentConfigLanguage(); 478 void applyCurrentConfigLanguage();
479 void allProgramInit(void); 479 void allProgramInit(void);
480 - bool loadProductInfo(void); 480 + void loadProductInfo(void);
481 481
482 482
483 483
app/gui/oven_control/manualcookwindow.cpp
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
29 ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : 29 ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
30 QMainWindow(parent), 30 QMainWindow(parent),
31 ui(new Ui::ManualCookWindow), 31 ui(new Ui::ManualCookWindow),
32 - repeat(false),  
33 - cookDone(false) 32 + cookDone(false),
  33 + repeat(false)
34 { 34 {
35 ui->setupUi(this); 35 ui->setupUi(this);
36 36