Commit f345e373f6b6469efe815086e23f7237e12ba898

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

클래스 정의 수정

- 해당 메소드는 public이 맞음
 - 컴파일 경고 제거
Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
app/gui/oven_control/ovenstatics.h
@@ -411,14 +411,15 @@ private: @@ -411,14 +411,15 @@ private:
411 void processStateError(uint16_t errflat, time_t ltime); 411 void processStateError(uint16_t errflat, time_t ltime);
412 void processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc,const QString &MsgTitle, time_t ltime); 412 void processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc,const QString &MsgTitle, time_t ltime);
413 413
414 - bool loadWashState(void){return srvdata->loadWashState();};  
415 - bool setWashState(bool bval,bool save=true){return srvdata->setWashState(bval,save);};  
416 - uint32_t loadTotalCookingTime(void){return srvdata->loadTotalCookingTime();};  
417 - bool setTotalCookingTime(uint32_t val, bool save=true){return srvdata->setTotalCookingTime(val,save);};  
418 - bool addTotalCookingTime(uint32_t val, bool save=true){return srvdata->addTotalCookingTime(val,save);};  
419 - uint32_t loadTotalCookingCount(void){return srvdata->loadTotalCookingCount();};  
420 - bool setTotalCookingCount(uint32_t val,bool save = true){return srvdata->setTotalCookingCount(val,save);};  
421 - bool addTotalCookingCount(uint32_t val, bool save = true){return srvdata->addTotalCookingCount(val,save);}; 414 +public:
  415 + bool loadWashState(void){return srvdata->loadWashState();}
  416 + bool setWashState(bool bval,bool save=true){return srvdata->setWashState(bval,save);}
  417 + uint32_t loadTotalCookingTime(void){return srvdata->loadTotalCookingTime();}
  418 + bool setTotalCookingTime(uint32_t val, bool save=true){return srvdata->setTotalCookingTime(val,save);}
  419 + bool addTotalCookingTime(uint32_t val, bool save=true){return srvdata->addTotalCookingTime(val,save);}
  420 + uint32_t loadTotalCookingCount(void){return srvdata->loadTotalCookingCount();}
  421 + bool setTotalCookingCount(uint32_t val,bool save = true){return srvdata->setTotalCookingCount(val,save);}
  422 + bool addTotalCookingCount(uint32_t val, bool save = true){return srvdata->addTotalCookingCount(val,save);}
422 423
423 public slots: 424 public slots:
424 void onDataChanged(); 425 void onDataChanged();