Index: src/ch/Structs.cpp =================================================================== diff -u -N -rb7020ced41c7859c2501bf64a6b484cd1fe242cb -r2758c0f90afc4dd061b45b520dd4e947aedc5052 --- src/ch/Structs.cpp (.../Structs.cpp) (revision b7020ced41c7859c2501bf64a6b484cd1fe242cb) +++ src/ch/Structs.cpp (.../Structs.cpp) (revision 2758c0f90afc4dd061b45b520dd4e947aedc5052) @@ -154,7 +154,7 @@ m_iMoveFile=-1; TCHAR xx[16]; - _itot(time(NULL), xx, 10); + _itot((int)time(NULL), xx, 10); m_strUniqueName=xx; } @@ -738,7 +738,7 @@ if (uiInterval != 0) { m_uiResumeInterval+=uiInterval; - if (m_uiResumeInterval < (UINT)GetConfig()->GetIntValue(PP_CMAUTORETRYINTERVAL)) + if (m_uiResumeInterval < (UINT)GetConfig()->get_signed_num(PP_CMAUTORETRYINTERVAL)) return false; else m_uiResumeInterval=0; @@ -998,7 +998,7 @@ m_cs.Lock(); if (m_lLastTime != -1) { - long lVal=time(NULL); + long lVal=(long)time(NULL); m_lTimeElapsed+=lVal-m_lLastTime; m_lLastTime=lVal; } @@ -1149,7 +1149,7 @@ CString CTask::GetLogName() { TCHAR szPath[_MAX_PATH]; - GetConfig()->GetStringValue(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); + GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); return GetApp()->ExpandPath(szPath)+GetUniqueName()+_T(".log"); } @@ -1282,7 +1282,7 @@ int i=GetSize(); TCHAR szPath[_MAX_PATH]; - GetConfig()->GetStringValue(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); + GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); GetApp()->ExpandPath(szPath); while (i) { @@ -1313,7 +1313,7 @@ { m_cs.Lock(); TCHAR szPath[_MAX_PATH]; - GetConfig()->GetStringValue(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); + GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); GetApp()->ExpandPath(szPath); for (int i=0;iGetStatus(); bFlag=((uiStatus & ST_STEP_MASK) == ST_FINISHED || (uiStatus & ST_STEP_MASK) == ST_CANCELLED || (uiStatus & ST_WORKING_MASK) == ST_PAUSED - || ((uiStatus & ST_WORKING_MASK) == ST_ERROR && !GetConfig()->GetBoolValue(PP_CMAUTORETRYONERROR))); + || ((uiStatus & ST_WORKING_MASK) == ST_ERROR && !GetConfig()->get_bool(PP_CMAUTORETRYONERROR))); } } @@ -1549,7 +1549,7 @@ m_pTask->FilesRemoveAll(); // save state of a task - GetConfig()->GetStringValue(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); + GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); GetApp()->ExpandPath(szPath); m_pTask->Store(szPath, true); m_pTask->Store(szPath, false); @@ -1571,7 +1571,7 @@ break; } - GetConfig()->GetStringValue(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); + GetConfig()->get_string(PP_PAUTOSAVEDIRECTORY, szPath, _MAX_PATH); GetApp()->ExpandPath(szPath); m_pTask->Store(szPath, false);