diff options
| author | George Hazan <ghazan@miranda.im> | 2019-06-03 14:02:02 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-06-03 14:02:02 +0300 |
| commit | c1881274c8c431014368f4f5b9b49397e6c579f0 (patch) | |
| tree | 35534e17812aab00ec9e63b801ccb99a4ee221e9 /plugins/Folders | |
| parent | 240b4b12c1ec026be8a62b7ecd1f4702736b0e1b (diff) | |
Folders: old TCHAR helpers removed
Diffstat (limited to 'plugins/Folders')
| -rw-r--r-- | plugins/Folders/src/folderItem.cpp | 2 | ||||
| -rw-r--r-- | plugins/Folders/src/services.cpp | 8 | ||||
| -rw-r--r-- | plugins/Folders/src/utils.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp index 69c669153a..f6b96f153f 100644 --- a/plugins/Folders/src/folderItem.cpp +++ b/plugins/Folders/src/folderItem.cpp @@ -47,7 +47,7 @@ void CFolderItem::SetFormat(const wchar_t *newFormat) {
mir_free(m_tszOldFormat);
m_tszOldFormat = m_tszFormat;
- m_tszFormat = mir_wstrdup(*newFormat ? newFormat : MIRANDA_PATHT);
+ m_tszFormat = mir_wstrdup(*newFormat ? newFormat : MIRANDA_PATHW);
}
int CFolderItem::IsEqual(const CFolderItem *other)
diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp index a1d01aea9d..3fb2ab07fb 100644 --- a/plugins/Folders/src/services.cpp +++ b/plugins/Folders/src/services.cpp @@ -38,9 +38,9 @@ INT_PTR RegisterPathService(WPARAM, LPARAM lParam) CFolderItem *pNew;
if (data->flags & FF_UNICODE)
- pNew = new CFolderItem(data->szSection, data->szName, data->szFormatW, data->szUserNameW);
+ pNew = new CFolderItem(data->szSection, data->szName, data->szFormat.w, data->szUserName.w);
else
- pNew = new CFolderItem(data->szSection, data->szName, _A2T(data->szFormat), _A2T(data->szUserName));
+ pNew = new CFolderItem(data->szSection, data->szName, _A2T(data->szFormat.a), _A2T(data->szUserName.a));
lstRegisteredFolders.insert(pNew);
return (INT_PTR)pNew;
@@ -69,9 +69,9 @@ INT_PTR GetPathService(WPARAM wParam, LPARAM lParam) CMStringW buf(p->Expand());
if (data->flags & FF_UNICODE)
- wcsncpy_s(data->szPathT, data->nMaxPathSize, buf, _TRUNCATE);
+ wcsncpy_s(data->szPath.w, data->nMaxPathSize, buf, _TRUNCATE);
else
- strncpy_s(data->szPath, data->nMaxPathSize, _T2A(buf), _TRUNCATE);
+ strncpy_s(data->szPath.a, data->nMaxPathSize, _T2A(buf), _TRUNCATE);
return 0;
}
diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp index 5973546d38..e8da712012 100644 --- a/plugins/Folders/src/utils.cpp +++ b/plugins/Folders/src/utils.cpp @@ -29,10 +29,10 @@ CMStringW ExpandPath(const wchar_t *format) else
res = VARSW(format);
- res.Replace(PROFILE_PATHT, szCurrentProfilePath);
- res.Replace(CURRENT_PROFILET, szCurrentProfile);
- res.Replace(MIRANDA_PATHT, szMirandaPath);
- res.Replace(MIRANDA_USERDATAT, szUserDataPath);
+ res.Replace(PROFILE_PATHW, szCurrentProfilePath);
+ res.Replace(CURRENT_PROFILEW, szCurrentProfile);
+ res.Replace(MIRANDA_PATHW, szMirandaPath);
+ res.Replace(MIRANDA_USERDATAW, szUserDataPath);
res.Trim();
// also remove the trailing slash
|