Index: src/ch/DirectoryChooser.cpp =================================================================== diff -u -rb26ced3298e3e7e51d91f3ac70b56746786da83b -rf102f95617e81f56adbed6403e42602ea8c509b5 --- src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) +++ src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision f102f95617e81f56adbed6403e42602ea8c509b5) @@ -24,14 +24,15 @@ #include "../libchcore/TPath.h" #include "CfgProperties.h" #include "resource.h" +#include "../libchengine/TConfigSerializers.h" namespace DirectoryChooser { -INT_PTR ChooseDirectory(chcore::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath) +INT_PTR ChooseDirectory(chengine::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath) { rSelectedPath.Clear(); - chcore::TConfig& rConfig = GetConfig(); + chengine::TConfig& rConfig = GetConfig(); // get dest folder CFolderDialog dlg; @@ -45,11 +46,11 @@ dlg.m_bdData.iView=GetPropValue(rConfig); dlg.m_bdData.bIgnoreDialogs=GetPropValue(rConfig); - dlg.m_bdData.strInitialDir=(dlg.m_bdData.cvRecent.size() > 0) ? dlg.m_bdData.cvRecent.at(0) : _T(""); + dlg.m_bdData.strInitialDir=(dlg.m_bdData.cvRecent.size() > 0) ? dlg.m_bdData.cvRecent.at(0) : CString(L""); - if(eOperation == chcore::eOperation_Copy) + if(eOperation == chengine::eOperation_Copy) dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLECOPY_STRING); - else if(eOperation == chcore::eOperation_Move) + else if(eOperation == chengine::eOperation_Move) dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEMOVE_STRING); else dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEUNKNOWNOPERATION_STRING);