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/Dropbox/src/dropbox_utils.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Dropbox/src/dropbox_utils.cpp') diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp index 67994b6e1b..28bf244984 100644 --- a/plugins/Dropbox/src/dropbox_utils.cpp +++ b/plugins/Dropbox/src/dropbox_utils.cpp @@ -16,7 +16,7 @@ char* CDropbox::PreparePath(const char *oldPath, char *newPath) return newPath; } -char* CDropbox::PreparePath(const TCHAR *oldPath, char *newPath) +char* CDropbox::PreparePath(const wchar_t *oldPath, char *newPath) { return PreparePath(ptrA(mir_utf8encodeW(oldPath)), newPath); } @@ -95,7 +95,7 @@ MEVENT CDropbox::AddEventToDb(MCONTACT hContact, WORD type, DWORD flags, DWORD c return db_event_add(hContact, &dbei); } -void CDropbox::SendToContact(MCONTACT hContact, const TCHAR *data) +void CDropbox::SendToContact(MCONTACT hContact, const wchar_t *data) { if (hContact == GetDefaultContact()) { char *message = mir_utf8encodeT(data); @@ -122,7 +122,7 @@ void CDropbox::SendToContact(MCONTACT hContact, const TCHAR *data) AddEventToDb(hContact, EVENTTYPE_MESSAGE, DBEF_UTF | DBEF_SENT, (DWORD)mir_strlen(message), (PBYTE)message); } -void CDropbox::PasteToInputArea(MCONTACT hContact, const TCHAR *data) +void CDropbox::PasteToInputArea(MCONTACT hContact, const wchar_t *data) { MessageWindowInputData mwid = { sizeof(MessageWindowInputData) }; mwid.hContact = hContact; @@ -137,17 +137,17 @@ void CDropbox::PasteToInputArea(MCONTACT hContact, const TCHAR *data) } } -void CDropbox::PasteToClipboard(const TCHAR *data) +void CDropbox::PasteToClipboard(const wchar_t *data) { if (OpenClipboard(NULL)) { EmptyClipboard(); - size_t size = sizeof(TCHAR) * (mir_tstrlen(data) + 1); + size_t size = sizeof(wchar_t) * (mir_tstrlen(data) + 1); HGLOBAL hClipboardData = GlobalAlloc(NULL, size); if (hClipboardData) { - TCHAR *pchData = (TCHAR*)GlobalLock(hClipboardData); + wchar_t *pchData = (wchar_t*)GlobalLock(hClipboardData); if (pchData) { - memcpy(pchData, (TCHAR*)data, size); + memcpy(pchData, (wchar_t*)data, size); GlobalUnlock(hClipboardData); SetClipboardData(CF_UNICODETEXT, hClipboardData); } @@ -156,7 +156,7 @@ void CDropbox::PasteToClipboard(const TCHAR *data) } } -void CDropbox::Report(MCONTACT hContact, const TCHAR *data) +void CDropbox::Report(MCONTACT hContact, const wchar_t *data) { if (db_get_b(NULL, MODULE, "UrlAutoSend", 1)) SendToContact(hContact, data); -- cgit v1.2.3