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/Twitter/src/StringUtil.cpp | 2 +- protocols/Twitter/src/chat.cpp | 6 +++--- protocols/Twitter/src/connection.cpp | 2 +- protocols/Twitter/src/proto.cpp | 8 ++++---- protocols/Twitter/src/ui.cpp | 30 +++++++++++++++--------------- protocols/Twitter/src/utility.cpp | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/StringUtil.cpp b/protocols/Twitter/src/StringUtil.cpp index 0ac892cd1f..d9b7123216 100644 --- a/protocols/Twitter/src/StringUtil.cpp +++ b/protocols/Twitter/src/StringUtil.cpp @@ -71,7 +71,7 @@ tstring GetWord(const tstring& str, unsigned index, bool getRest) } else ++end; } - return _T(""); + return L""; } // takes a pointer to a string, and does an inplace replace of all the characters "from" found diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp index 9c5cb08cab..13d438c185 100644 --- a/protocols/Twitter/src/chat.cpp +++ b/protocols/Twitter/src/chat.cpp @@ -64,7 +64,7 @@ int TwitterProto::OnChatOutgoing(WPARAM, LPARAM lParam) switch (hook->pDest->iType) { case GC_USER_MESSAGE: - debugLog(_T("**Chat - Outgoing message: %s"), hook->ptszText); + debugLog(L"**Chat - Outgoing message: %s", hook->ptszText); { T2Utf text(hook->ptszText); @@ -95,7 +95,7 @@ void TwitterProto::AddChatContact(const char *name, const char *nick) gce.time = DWORD(time(0)); gce.ptszNick = mir_a2t(nick ? nick : name); gce.ptszUID = mir_a2t(name); - gce.ptszStatus = _T("Normal"); + gce.ptszStatus = L"Normal"; CallServiceSync(MS_GC_EVENT, 0, reinterpret_cast(&gce)); mir_free(const_cast(gce.ptszNick)); @@ -130,7 +130,7 @@ INT_PTR TwitterProto::OnJoinChat(WPARAM, LPARAM suppress) // ***** Create a group GCDEST gcd = { m_szModuleName, m_tszUserName, GC_EVENT_ADDGROUP }; GCEVENT gce = { sizeof(gce), &gcd }; - gce.ptszStatus = _T("Normal"); + gce.ptszStatus = L"Normal"; CallServiceSync(MS_GC_EVENT, 0, reinterpret_cast(&gce)); // ***** Hook events diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 642ccd08c3..87c5e25aaa 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -169,7 +169,7 @@ bool TwitterProto::NegotiateConnection() wchar_t buf[1024] = {}; mir_snwprintf(buf, _countof(buf), AuthorizeUrl.c_str(), oauthToken.c_str()); - debugLogW(_T("**NegotiateConnection - Launching %s"), buf); + debugLogW(L"**NegotiateConnection - Launching %s", buf); ShellExecute(NULL, L"open", buf, NULL, NULL, SW_SHOWNORMAL); ShowPinDialog(); diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 3c1d34920b..ffa2245609 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -60,7 +60,7 @@ TwitterProto::TwitterProto(const char *proto_name, const TCHAR *username) : ConsumerKey = OAUTH_CONSUMER_KEY; ConsumerSecret = OAUTH_CONSUMER_SECRET; - AuthorizeUrl = _T("https://api.twitter.com/oauth/authorize?oauth_token=%s"); + AuthorizeUrl = L"https://api.twitter.com/oauth/authorize?oauth_token=%s"; } TwitterProto::~TwitterProto() @@ -319,7 +319,7 @@ int TwitterProto::OnModulesLoaded(WPARAM, LPARAM) if (m_hNetlibUser == NULL) { TCHAR error[200]; mir_sntprintf(error, TranslateT("Unable to initialize Netlib for %s."), m_tszUserName); - MessageBox(NULL, error, _T("Miranda NG"), MB_OK | MB_ICONERROR); + MessageBox(NULL, error, L"Miranda NG", MB_OK | MB_ICONERROR); } // Create avatar network connection (TODO: probably remove this) @@ -332,7 +332,7 @@ int TwitterProto::OnModulesLoaded(WPARAM, LPARAM) if (hAvatarNetlib_ == NULL) { TCHAR error[200]; mir_sntprintf(error, TranslateT("Unable to initialize Netlib for %s."), TranslateT("Twitter (avatars)")); - MessageBox(NULL, error, _T("Miranda NG"), MB_OK | MB_ICONERROR); + MessageBox(NULL, error, L"Miranda NG", MB_OK | MB_ICONERROR); } twit_.set_handle(this, m_hNetlibUser); @@ -455,7 +455,7 @@ void TwitterProto::UpdateSettings() std::tstring TwitterProto::GetAvatarFolder() { TCHAR path[MAX_PATH]; - mir_sntprintf(path, _T("%s\\%s"), VARST(_T("%miranda_avatarcache%")), m_tszUserName); + mir_sntprintf(path, L"%s\\%s", VARST(L"%miranda_avatarcache%"), m_tszUserName); return path; } diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index c042e43aa9..f82017d613 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -23,8 +23,8 @@ along with this program. If not, see . #include "twitter.h" static const TCHAR *sites[] = { - _T("https://api.twitter.com/"), - _T("https://identi.ca/api/") + L"https://api.twitter.com/", + L"https://identi.ca/api/" }; INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) @@ -109,11 +109,11 @@ INT_PTR CALLBACK tweet_proc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara proto = reinterpret_cast(lParam); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); SendDlgItemMessage(hwndDlg, IDC_TWEETMSG, EM_LIMITTEXT, 140, 0); - SetDlgItemText(hwndDlg, IDC_CHARACTERS, _T("140")); + SetDlgItemText(hwndDlg, IDC_CHARACTERS, L"140"); // Set window title TCHAR title[512]; - mir_sntprintf(title, _T("Send Tweet for %s"), proto->m_tszUserName); + mir_sntprintf(title, L"Send Tweet for %s", proto->m_tszUserName); SetWindowText(hwndDlg, title); return true; @@ -299,17 +299,17 @@ namespace popup_options TCHAR *text; } const quotes[] = { { - _T("Dorothy Parker"), _T("If, with the literate, I am\n") - _T("Impelled to try an epigram,\n") - _T("I never seek to take the credit;\n") - _T("We all assume that Oscar said it.") }, - { _T("Steve Ballmer"), _T("I have never, honestly, thrown a chair in my life.") }, - { _T("James Joyce"), _T("I think I would know Nora's fart anywhere. I think ") - _T("I could pick hers out in a roomful of farting women.") }, - { _T("Brooke Shields"), _T("Smoking kills. If you're killed, you've lost a very ") - _T("important part of your life.") }, - { _T("Yogi Berra"), _T("Always go to other peoples' funerals, otherwise ") - _T("they won't go to yours.") }, + L"Dorothy Parker", L"If, with the literate, I am\n" + L"Impelled to try an epigram,\n" + L"I never seek to take the credit;\n" + L"We all assume that Oscar said it." }, + { L"Steve Ballmer", L"I have never, honestly, thrown a chair in my life." }, + { L"James Joyce", L"I think I would know Nora's fart anywhere. I think " + L"I could pick hers out in a roomful of farting women." }, + { L"Brooke Shields", L"Smoking kills. If you're killed, you've lost a very " + L"important part of your life." }, + { L"Yogi Berra", L"Always go to other peoples' funerals, otherwise " + L"they won't go to yours." }, }; static void preview(HWND hwndDlg) diff --git a/protocols/Twitter/src/utility.cpp b/protocols/Twitter/src/utility.cpp index 6c7724739a..e8056e02a8 100644 --- a/protocols/Twitter/src/utility.cpp +++ b/protocols/Twitter/src/utility.cpp @@ -149,7 +149,7 @@ bool save_url(HANDLE hNetlib, const std::string &url, const std::tstring &filena CreateDirectoryTreeT(dir.c_str()); // Write to file - FILE *f = _tfopen(filename.c_str(), _T("wb")); + FILE *f = _tfopen(filename.c_str(), L"wb"); fwrite(resp->pData, 1, resp->dataLength, f); fclose(f); } -- cgit v1.2.3