컴파일 오류 제거

김태훈
1 parent 77522c349e
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
app/gui/oven_control/cookbook.cpp
app/gui/oven_control/slider.h
@@ -57,7 +57,7 @@ CookBook::CookBook(Define::CookType type)
     }
  
     int cookNameSection;
-    Define::language_type lang = (Define::language_type) Config::getConfigValue(Define::config_language).d32;
+    Define::language_type lang = (Define::language_type) Config::getInstance()->getConfigValue(Define::config_language).d32;
     switch (lang)
     {
     case Define::language_kr:
@@ -18,11 +18,11 @@ class Slider : public QWidget
     QPixmap sub;
     QPixmap handle;
  
-    int grooveMin;
-    int grooveMax;
+    int minSliderX;
+    int maxSliderX;
  
-    QPoint groovePoint;
-    QPoint subPoint;
+    QPoint grooveLeftTop;
+    QPoint subLeftTop;
  
     bool subVisible_;
     bool focused;
...	...	@@ -57,7 +57,7 @@ CookBook::CookBook(Define::CookType type)
57	57	}
58	58
59	59	int cookNameSection;
60		- Define::language_type lang = (Define::language_type) Config::getConfigValue(Define::config_language).d32;
	60	+ Define::language_type lang = (Define::language_type) Config::getInstance()->getConfigValue(Define::config_language).d32;
61	61	switch (lang)
62	62	{
63	63	case Define::language_kr:
...	...
...	...	@@ -18,11 +18,11 @@ class Slider : public QWidget
18	18	QPixmap sub;
19	19	QPixmap handle;
20	20
21		- int grooveMin;
22		- int grooveMax;
	21	+ int minSliderX;
	22	+ int maxSliderX;
23	23
24		- QPoint groovePoint;
25		- QPoint subPoint;
	24	+ QPoint grooveLeftTop;
	25	+ QPoint subLeftTop;
26	26
27	27	bool subVisible_;
28	28	bool focused;
...	...