From d6955937b758b0c1755721c41ac19f7d2be62b87 Mon Sep 17 00:00:00 2001 From: victor Date: Thu, 4 Jan 2018 11:37:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=B4=ED=8C=8C=EC=9D=BC=20=EA=B2=BD?= =?UTF-8?q?=EA=B3=A0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/config.cpp | 2 +- app/gui/oven_control/config.h | 4 ++-- app/gui/oven_control/manualcookwindow.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 0b907eb..ff4584e 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -482,7 +482,7 @@ void Config::allProgramInit() } } -bool Config::loadProductInfo() +void Config::loadProductInfo() { QString strTemp; QMap mapInfos; diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 9d3dc77..5ce2154 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -112,7 +112,7 @@ const char hotline_service_item_name[3][32] ={ }; -static const char* g_strModelTypeName[] ={ +const char g_strModelTypeName[16][64] ={ QT_TRANSLATE_NOOP("Config", "전기식 10단"), QT_TRANSLATE_NOOP("Config", "전기식 20단"), QT_TRANSLATE_NOOP("Config", "전기식 24단"), @@ -477,7 +477,7 @@ public: void removeFavorite(Define::ConfigType idx); void applyCurrentConfigLanguage(); void allProgramInit(void); - bool loadProductInfo(void); + void loadProductInfo(void); diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index a498174..5895fea 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -29,8 +29,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), ui(new Ui::ManualCookWindow), - repeat(false), - cookDone(false) + cookDone(false), + repeat(false) { ui->setupUi(this); -- 2.1.4