From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/src/avatar.cpp | 8 ++++---- protocols/Yahoo/src/chat.cpp | 6 +++--- protocols/Yahoo/src/file_transfer.cpp | 2 +- protocols/Yahoo/src/links.cpp | 8 ++++---- protocols/Yahoo/src/search.cpp | 8 ++++---- protocols/Yahoo/src/yahoo.cpp | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'protocols/Yahoo') diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp index 60a1579281..ec1696c65d 100644 --- a/protocols/Yahoo/src/avatar.cpp +++ b/protocols/Yahoo/src/avatar.cpp @@ -596,19 +596,19 @@ void CYahooProto::request_avatar(const char* who) void CYahooProto::GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, int cbLen, int type) { - int tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), VARST(_T("%miranda_avatarcache%")), m_szModuleName); + int tPathLen = mir_sntprintf(pszDest, cbLen, L"%s\\%S", VARST(L"%miranda_avatarcache%"), m_szModuleName); if (_taccess(pszDest, 0)) CreateDirectoryTreeT(pszDest); if (hContact != NULL) { int ck_sum = getDword(hContact, "PictCK", 0); - tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%lX"), ck_sum); + tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%lX", ck_sum); } else - tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%S avatar"), m_szModuleName); + tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%S avatar", m_szModuleName); - _tcsncpy_s((pszDest + tPathLen), (cbLen - tPathLen), (type == 1 ? _T(".swf") : _T(".png")), _TRUNCATE); + _tcsncpy_s((pszDest + tPathLen), (cbLen - tPathLen), (type == 1 ? L".swf" : L".png"), _TRUNCATE); } INT_PTR __cdecl CYahooProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam) diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp index 4999c4947c..105f86f19e 100644 --- a/protocols/Yahoo/src/chat.cpp +++ b/protocols/Yahoo/src/chat.cpp @@ -54,7 +54,7 @@ void ext_yahoo_conf_userdecline(int id, const char*, const char *who, const char TCHAR info[1024]; TCHAR *whot = mir_utf8decodeT(who); TCHAR *msgt = mir_utf8decodeT(msg); - mir_sntprintf(info, TranslateT("%s denied invitation with message: %s"), whot, msgt ? msgt : _T("")); + mir_sntprintf(info, TranslateT("%s denied invitation with message: %s"), whot, msgt ? msgt : L""); GETPROTOBYID(id)->ChatEvent(room, who, GC_EVENT_INFORMATION, info); mir_free(msgt); mir_free(whot); @@ -316,7 +316,7 @@ int __cdecl CYahooProto::OnGCMenuHook(WPARAM, LPARAM lParam) { { TranslateT("User &details"), 10, MENU_ITEM, FALSE }, { TranslateT("User &history"), 20, MENU_ITEM, FALSE }, - { _T(""), 100, MENU_SEPARATOR, FALSE }, + { L"", 100, MENU_SEPARATOR, FALSE }, { TranslateT("&Leave chat session"), 110, MENU_ITEM, FALSE } }; gcmi->nItems = _countof(Items); @@ -356,7 +356,7 @@ static void clist_chat_invite_send(MCONTACT hItem, HWND hwndList, YList* &who, c int chk = SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0); if (chk) { if (IsHContactInfo(hItem)) { - TCHAR buf[128] = _T(""); + TCHAR buf[128] = L""; SendMessage(hwndList, CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)buf); who = y_list_append(who, mir_t2a(buf)); diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp index aac588cf74..d5549b571c 100644 --- a/protocols/Yahoo/src/file_transfer.cpp +++ b/protocols/Yahoo/src/file_transfer.cpp @@ -297,7 +297,7 @@ static void dl_file(int id, INT_PTR fd, int error, const char*, unsigned long si * * Don't rely on workingDir to be right, since it's not used to check if file exists. */ - mir_sntprintf(filefull, _T("%s\\%s"), sf->pfts.tszWorkingDir, sf->pfts.tszCurrentFile); + mir_sntprintf(filefull, L"%s\\%s", sf->pfts.tszWorkingDir, sf->pfts.tszCurrentFile); FREE(sf->pfts.tszCurrentFile); sf->pfts.tszCurrentFile = _tcsdup(filefull); diff --git a/protocols/Yahoo/src/links.cpp b/protocols/Yahoo/src/links.cpp index 48af9ef88e..18be749700 100644 --- a/protocols/Yahoo/src/links.cpp +++ b/protocols/Yahoo/src/links.cpp @@ -95,7 +95,7 @@ static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam) if (!proto) return 1; /* add a contact to the list */ - if (!_tcsnicmp(arg, _T("addfriend?"), 10)) { + if (!_tcsnicmp(arg, L"addfriend?", 10)) { arg += 10; char *id = get_buddy(&arg); @@ -119,7 +119,7 @@ static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam) return 0; } /* send a message to a contact */ - else if (!_tcsnicmp(arg, _T("sendim?"), 7)) { + else if (!_tcsnicmp(arg, L"sendim?", 7)) { arg += 7; char *id = get_buddy(&arg); @@ -128,7 +128,7 @@ static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam) TCHAR *msg = NULL; while (arg) { - if (!_tcsnicmp(arg, _T("m="), 2)) { + if (!_tcsnicmp(arg, L"m=", 2)) { msg = arg + 2; url_decode(msg); break; @@ -146,7 +146,7 @@ static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam) return 0; } /* open a chatroom */ - else if (!_tcsnicmp(arg, _T("chat?"), 5)) { + else if (!_tcsnicmp(arg, L"chat?", 5)) { arg += 5; // char *id = get_buddy(&arg); diff --git a/protocols/Yahoo/src/search.cpp b/protocols/Yahoo/src/search.cpp index 852a911a71..9a606c4245 100644 --- a/protocols/Yahoo/src/search.cpp +++ b/protocols/Yahoo/src/search.cpp @@ -174,10 +174,10 @@ void __cdecl CYahooProto::searchadv_thread(void *pHWND) psr.id.t = _tcslwr(searchid); switch (SendDlgItemMessage(hwndDlg, IDC_SEARCH_PROTOCOL, CB_GETCURSEL, 0, 0)) { - case 0: psr.firstName.t = _T(""); psr.protocol = YAHOO_IM_YAHOO; break; - case 1: psr.firstName.t = _T(""); psr.protocol = YAHOO_IM_SAMETIME; break; - case 2: psr.firstName.t = _T(""); psr.protocol = YAHOO_IM_LCS; break; - case 3: psr.firstName.t = _T(""); psr.protocol = YAHOO_IM_MSN; break; + case 0: psr.firstName.t = L""; psr.protocol = YAHOO_IM_YAHOO; break; + case 1: psr.firstName.t = L""; psr.protocol = YAHOO_IM_SAMETIME; break; + case 2: psr.firstName.t = L""; psr.protocol = YAHOO_IM_LCS; break; + case 3: psr.firstName.t = L""; psr.protocol = YAHOO_IM_MSN; break; } /* diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index df465c1668..7cb6c76f34 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -926,7 +926,7 @@ void CYahooProto::ext_mail_notify(const char *from, const char *subj, int cnt) TCHAR z[MAX_SECONDLINE], title[MAX_CONTACTNAME]; if (from == NULL) { - mir_sntprintf(title, _T("%s: %s"), m_tszUserName, TranslateT("New Mail")); + mir_sntprintf(title, L"%s: %s", m_tszUserName, TranslateT("New Mail")); mir_sntprintf(z, TranslateT("You have %i unread messages"), cnt); } else { -- cgit v1.2.3