From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: 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 --- plugins/HistoryStats/src/mu_common.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/HistoryStats/src/mu_common.cpp') diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 4bdf16a7f1..7b1ee72f8d 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -15,11 +15,11 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot) + HGENMENU addMainMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot) { // TODO: support for unicode-core with unicode-aware CList CMenuItem mi; - mi.name.t = (TCHAR*)pszName; + mi.name.w = (wchar_t*)pszName; mi.flags = flags | CMIF_TCHAR; mi.position = position; mi.hIcolibItem = hIcon; @@ -29,11 +29,11 @@ namespace mu return Menu_AddMainMenuItem(&mi); } - HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService) + HGENMENU addContactMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService) { // TODO: support for unicode-core with unicode-aware CList CMenuItem mi; - mi.name.t = (TCHAR*)pszName; + mi.name.w = (wchar_t*)pszName; mi.flags = flags | CMIF_TCHAR; mi.position = position; mi.hIcolibItem = hIcon; @@ -49,12 +49,12 @@ namespace mu namespace db { - int getProfilePath(int cbName, TCHAR* pszName) + int getProfilePath(int cbName, wchar_t* pszName) { return CallService(MS_DB_GETPROFILEPATHT, cbName, reinterpret_cast(pszName)); } - int getProfileName(int cbName, TCHAR* pszName) + int getProfileName(int cbName, wchar_t* pszName) { return CallService(MS_DB_GETPROFILENAMET, cbName, reinterpret_cast(pszName)); } @@ -95,11 +95,11 @@ namespace mu return true; } - void addIcon(const TCHAR* szSection, const TCHAR* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex) + void addIcon(const wchar_t* szSection, const wchar_t* szDescription, const char* szIconName, const char* szDefaultFile, int iDefaultIndex) { SKINICONDESC sid = { 0 }; - sid.section.t = const_cast(szSection); - sid.description.t = const_cast(szDescription); + sid.section.w = const_cast(szSection); + sid.description.w = const_cast(szDescription); sid.pszName = const_cast(szIconName); sid.defaultFile.a = const_cast(szDefaultFile); sid.iDefaultIndex = iDefaultIndex; @@ -119,16 +119,16 @@ namespace mu namespace opt { - void addPage(WPARAM addInfo, const TCHAR* pszGroup, const TCHAR* pszTitle, const TCHAR* pszTab, DLGPROC pfnDlgProc, const char* pszTemplate, HINSTANCE hInstance, DWORD flags /* = ODPF_BOLDGROUPS */) + void addPage(WPARAM addInfo, const wchar_t* pszGroup, const wchar_t* pszTitle, const wchar_t* pszTab, DLGPROC pfnDlgProc, const char* pszTemplate, HINSTANCE hInstance, DWORD flags /* = ODPF_BOLDGROUPS */) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.ptszTitle = const_cast(pszTitle); + odp.pwszTitle = const_cast(pszTitle); odp.pfnDlgProc = pfnDlgProc; odp.pszTemplate = const_cast(pszTemplate); odp.hInstance = hInstance; - odp.ptszGroup = const_cast(pszGroup); + odp.pwszGroup = const_cast(pszGroup); odp.flags = flags | ODPF_TCHAR; - odp.ptszTab = const_cast(pszTab); + odp.pwszTab = const_cast(pszTab); Options_AddPage(addInfo, &odp); } } -- cgit v1.2.3