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/MirFox/src/MirandaOptions.cpp | 12 ++++++------ plugins/MirFox/src/MirandaUtils.cpp | 6 +++--- plugins/MirFox/src/MirfoxData.cpp | 6 +++--- plugins/MirFox/src/MirfoxData.h | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins/MirFox/src') diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index b9dea187de..7ea8ece4f5 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -675,25 +675,25 @@ int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -790000000; odp.hInstance = hInst; - odp.ptszTitle = LPGENT(PLUGIN_OPTIONS_NAME); - odp.ptszGroup = LPGENT("Services"); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; + odp.pszTitle = LPGEN(PLUGIN_OPTIONS_NAME); + odp.pszGroup = LPGEN("Services"); + odp.flags = ODPF_BOLDGROUPS; //1 - options odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1); - odp.ptszTab = LPGENT("Options"); + odp.pszTab = LPGEN("Options"); odp.pfnDlgProc = DlgProcOpts_Tab1; Options_AddPage(wParam, &odp); //2 - contacts odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT2); - odp.ptszTab = LPGENT("Contacts"); + odp.pszTab = LPGEN("Contacts"); odp.pfnDlgProc = DlgProcOpts_Tab2; Options_AddPage(wParam, &odp); //3 - accounts odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT3); - odp.ptszTab = LPGENT("Accounts"); + odp.pszTab = LPGEN("Accounts"); odp.pfnDlgProc = DlgProcOpts_Tab3; Options_AddPage(wParam, &odp); return 0; diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index 06ea0e2092..b37be018a8 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -186,7 +186,7 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_ MirandaContact* mirandaContact = args->mirfoxDataPtr->getMirandaContactPtrByHandle((UINT_PTR)args->targetHandle); const wchar_t* contactNameW = NULL; - TCHAR* tszAccountName = NULL; + wchar_t* tszAccountName = NULL; if (mirandaContact){ contactNameW = mirandaContact->contactNameW.c_str(); MirandaAccount* mirandaAccount = mirandaContact->mirandaAccountPtr; @@ -342,7 +342,7 @@ int MirandaUtils::on_hook_OpenMW(WPARAM wParam, LPARAM lParam) OnHookOpenMvStruct* param = (OnHookOpenMvStruct*)wParam; if (param->msgBuffer != NULL){ - TCHAR *msgBuffer = mir_tstrdup(param->msgBuffer->c_str()); + wchar_t *msgBuffer = mir_tstrdup(param->msgBuffer->c_str()); CallServiceSync(MS_MSG_SENDMESSAGET, (WPARAM)param->targetHandle, (LPARAM)msgBuffer); mir_free(msgBuffer); @@ -392,7 +392,7 @@ void MirandaUtils::setStatusOnAccount(ActionThreadArgStruct* args) result = CallProtoService(args->accountSzModuleName, PS_SETAWAYMSG, status, (LPARAM)args->userActionSelection); MirandaAccount* mirandaAccount = args->mirfoxDataPtr->getMirandaAccountPtrBySzModuleName(args->accountSzModuleName); - TCHAR* tszAccountName = NULL; + wchar_t* tszAccountName = NULL; if (mirandaAccount) tszAccountName = mirandaAccount->tszAccountName; diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp index 22eb70e504..c3369ac897 100644 --- a/plugins/MirFox/src/MirfoxData.cpp +++ b/plugins/MirFox/src/MirfoxData.cpp @@ -245,7 +245,7 @@ MirfoxData::getMirandaAccountPtrBySzModuleName(char* szModuleName) // refresh support -void MirfoxData::refreshAccount_Add(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, TCHAR* tszAccountName, char* szProtoName) +void MirfoxData::refreshAccount_Add(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, wchar_t* tszAccountName, char* szProtoName) { MFLogger* logger = MFLogger::getInstance(); logger->log_p(L"MirfoxData::refreshAccount_Add proto [%S]", szModuleName); @@ -296,7 +296,7 @@ void MirfoxData::refreshAccount_Add(SharedMemoryUtils& sharedMemoryUtils, char* return; } -void MirfoxData::refreshAccount_Edit(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, TCHAR* tszAccountName) +void MirfoxData::refreshAccount_Edit(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, wchar_t* tszAccountName) { MFLogger* logger = MFLogger::getInstance(); logger->log_p(L"MirfoxData::refreshAccount_Edit proto [%S]", szModuleName); @@ -779,7 +779,7 @@ void MirfoxData::releaseMirfoxData() * class functions implementation */ -MirandaAccount::MirandaAccount(uint64_t idL, char* szModuleNameL, TCHAR* tszAccountNameL, char* szProtoNameL, int displayOrderL) +MirandaAccount::MirandaAccount(uint64_t idL, char* szModuleNameL, wchar_t* tszAccountNameL, char* szProtoNameL, int displayOrderL) { accountState = MFENUM_MIRANDAACCOUNT_STATE_UNKNOWN; id = idL; diff --git a/plugins/MirFox/src/MirfoxData.h b/plugins/MirFox/src/MirfoxData.h index 4806745396..b06f614241 100644 --- a/plugins/MirFox/src/MirfoxData.h +++ b/plugins/MirFox/src/MirfoxData.h @@ -118,8 +118,8 @@ public: MirandaAccount* getMirandaAccountPtrBySzModuleName(char* szModuleName); //refresh data support - void refreshAccount_Add(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, TCHAR* tszAccountName, char* szProtoName); - void refreshAccount_Edit(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, TCHAR* tszAccountName); + void refreshAccount_Add(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, wchar_t* tszAccountName, char* szProtoName); + void refreshAccount_Edit(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName, wchar_t* tszAccountName); void refreshAccount_Delete(SharedMemoryUtils& sharedMemoryUtils, char* szModuleName); void refreshContact_Add(SharedMemoryUtils& sharedMemoryUtils, MCONTACT hContact); void refreshContact_Edit(SharedMemoryUtils& sharedMemoryUtils, MCONTACT hContact); @@ -247,13 +247,13 @@ class MirandaAccount { public: - MirandaAccount(uint64_t idL, char* szModuleNameL, TCHAR* tszAccountNameL, char* szProtoNameL, int displayOrderL); + MirandaAccount(uint64_t idL, char* szModuleNameL, wchar_t* tszAccountNameL, char* szProtoNameL, int displayOrderL); ~MirandaAccount(void); MirandaAccount* getObjectPtr(); uint64_t id; //selfgenerated id, used in sm char* szModuleName; //unique string id of account - TCHAR* tszAccountName; //account name + wchar_t* tszAccountName; //account name char* szProtoName; //physical protocol name int displayOrder; //presentation order - not used now MFENUM_MIRANDAACCOUNT_STATE accountState; //state in options -- cgit v1.2.3