diff options
author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /plugins/Folders/src/utils.cpp | |
parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) |
less TCHARs:
- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*
git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Folders/src/utils.cpp')
-rw-r--r-- | plugins/Folders/src/utils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp index 97ffef2eb6..2adc3b7035 100644 --- a/plugins/Folders/src/utils.cpp +++ b/plugins/Folders/src/utils.cpp @@ -20,12 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-CMString ExpandPath(const TCHAR *format)
+CMString ExpandPath(const wchar_t *format)
{
CMString res;
if (ServiceExists(MS_VARS_FORMATSTRING))
- res = VARST(ptrT(variables_parse((TCHAR*)format, NULL, NULL)));
+ res = VARST(ptrT(variables_parse((wchar_t*)format, NULL, NULL)));
else
res = VARST(format);
@@ -47,20 +47,20 @@ CMString ExpandPath(const TCHAR *format) return res;
}
-void RemoveDirectories(const TCHAR *path)
+void RemoveDirectories(const wchar_t *path)
{
- TCHAR *pos;
- TCHAR *buffer = NEWWSTR_ALLOCA(path);
+ wchar_t *pos;
+ wchar_t *buffer = NEWWSTR_ALLOCA(path);
if (!(GetFileAttributes(buffer) & FILE_ATTRIBUTE_REPARSE_POINT))
RemoveDirectory(buffer);
- while (pos = _tcsrchr(buffer, '\\')) {
+ while (pos = wcsrchr(buffer, '\\')) {
pos[0] = '\0';
if (!(GetFileAttributes(buffer) & FILE_ATTRIBUTE_REPARSE_POINT))
RemoveDirectory(buffer);
}
}
-bool DirectoryExists(const TCHAR *path)
+bool DirectoryExists(const wchar_t *path)
{
DWORD dwAttributes = GetFileAttributes(path);
if (dwAttributes == INVALID_FILE_ATTRIBUTES || !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
|