}\r
else\r
{\r
- LPCSTR lpszSubPath = NULL;\r
- CStringA sSubPath;\r
+ LPCTSTR lpszSubPath = NULL;\r
+ CString sSubPath;\r
CString s = path.GetWinPathString();\r
if (s.GetLength() > sProjectRoot.GetLength())\r
{\r
- sSubPath = CStringA(s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/));\r
+ sSubPath = s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/);\r
lpszSubPath = sSubPath;\r
}\r
\r
nFlags |= WGEFF_NoRecurse;\r
#endif\r
\r
- err = !wgEnumFiles(CStringA(sProjectRoot), lpszSubPath, nFlags, &getallstatus, &statuskind);\r
+ err = !wgEnumFiles(sProjectRoot, lpszSubPath, nFlags, &getallstatus, &statuskind);\r
\r
/*err = git_client_status4 (&youngest,\r
path.GetSVNApiPath(pool),\r
}\r
else\r
{\r
- LPCSTR lpszSubPath = NULL;\r
- CStringA sSubPath;\r
+ LPCTSTR lpszSubPath = NULL;\r
+ CString sSubPath;\r
CString s = path.GetWinPathString();\r
if (s.GetLength() > sProjectRoot.GetLength())\r
{\r
- sSubPath = CStringA(s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/));\r
+ sSubPath = s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/);\r
lpszSubPath = sSubPath;\r
}\r
\r
m_status.prop_status = m_status.text_status = git_wc_status_none;\r
\r
// NOTE: currently wgEnumFiles will not enumerate file if it isn't versioned (so status will be git_wc_status_none)\r
- m_err = !wgEnumFiles(CStringA(sProjectRoot), lpszSubPath, nFlags, &getstatus, &m_status);\r
+ m_err = !wgEnumFiles(sProjectRoot, lpszSubPath, nFlags, &getstatus, &m_status);\r
\r
/*m_err = git_client_status4 (&youngest,\r
path.GetGitApiPath(m_pool),\r