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 --- plugins/BasicHistory/src/RichHtmlExport.cpp | 146 ++++++++++++++-------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'plugins/BasicHistory/src/RichHtmlExport.cpp') diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index 5301e76b9d..5b030b5721 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -32,7 +32,7 @@ extern bool g_SmileyAddAvail; std::wstring MakeTextHtmled(const std::wstring& message, std::queue >* positionMap = NULL) { std::wstring ret; - std::wstring search = _T("&<>\t\r\n"); + std::wstring search = L"&<>\t\r\n"; size_t start = 0; size_t find; size_t currentAdd = 0; @@ -40,19 +40,19 @@ std::wstring MakeTextHtmled(const std::wstring& message, std::queue'): - ret += _T(">"); + ret += L">"; break; case _T('\t'): - ret += _T(" "); + ret += L" "; break; case _T('\n'): - ret += _T("
"); + ret += L"
"; break; } @@ -73,8 +73,8 @@ std::wstring MakeTextHtmled(const std::wstring& message, std::queue\r\n"); - std::wstring search = _T("://"); + std::wstring htmlStop = L"\'\" []<>\r\n"; + std::wstring search = L"://"; size_t start = 0; size_t find; while((find = message.find(search, start)) < message.length()) { @@ -88,8 +88,8 @@ std::wstring UrlHighlightHtml(const std::wstring& message, bool& isUrl) ret += message.substr(start, (urlStart + 1) - start); std::wstring url = message.substr(urlStart + 1, urlEnd - urlStart - 1); start = urlEnd; - ret += _T("") + url + _T(""); + ret += L"" + url + L""; isUrl = true; } else { @@ -288,116 +288,116 @@ void RichHtmlExport::WriteHeader(const std::wstring &fileName, const std::wstrin folderName = GetName(folder); DeleteDirectory(folder.c_str()); CreateDirectory(folder.c_str(), NULL); - std::wstring css = folder + _T("\\history.css"); + std::wstring css = folder + L"\\history.css"; BOOL cssCopied = FALSE; if (!Options::instance->extCssHtml2.empty()) cssCopied = CopyFile(Options::instance->extCssHtml2.c_str(), css.c_str(), FALSE); if (!cssCopied) ExtractFile(IDR_CSS, css); - ExtractFile(IDR_JS, folder + _T("\\history.js")); + ExtractFile(IDR_JS, folder + L"\\history.js"); HICON ico = LoadIconEx(IDI_PLUSEX); - IcoSave(folder + _T("\\pnode.ico"), ico); + IcoSave(folder + L"\\pnode.ico", ico); IcoLib_ReleaseIcon(ico); ico = LoadIconEx(IDI_MINUSEX); - IcoSave(folder + _T("\\mnode.ico"), ico); + IcoSave(folder + L"\\mnode.ico", ico); IcoLib_ReleaseIcon(ico); ico = LoadIconEx(IDI_INM); - IcoSave(folder + _T("\\event0.ico"), ico); + IcoSave(folder + L"\\event0.ico", ico); IcoLib_ReleaseIcon(ico); ico = LoadIconEx(IDI_OUTM); - IcoSave(folder + _T("\\event1.ico"), ico); + IcoSave(folder + L"\\event1.ico", ico); IcoLib_ReleaseIcon(ico); - EXP_FILE << _T("\n"); - EXP_FILE << _T("\n\n"); - EXP_FILE << _T("") << TranslateT("History Log") << _T(" [") << MakeTextHtmled(myName) << _T("] - [") << MakeTextHtmled(name1) << _T("]\n"); - EXP_FILE << _T("\n"); - EXP_FILE << _T("\n"); - EXP_FILE << _T("\n"); - - EXP_FILE << _T("\n"); - EXP_FILE << _T("") << TranslateT("Menu") << _T("\n"); - EXP_FILE << _T("\n"); - EXP_FILE << _T("\n"); - EXP_FILE << _T("\n"); - EXP_FILE << _T("
\n"); - EXP_FILE << _T("") << TranslateT("Open all") << _T("\n"); - EXP_FILE << _T("
\n"); - EXP_FILE << _T("") << TranslateT("Close all") << _T("\n"); - EXP_FILE << _T("
\n"); - EXP_FILE << _T("\n"); - - EXP_FILE << _T("

") << TranslateT("History Log") << _T("

\n

"); + EXP_FILE << L"\n"; + EXP_FILE << L"\n\n"; + EXP_FILE << L"" << TranslateT("History Log") << L" [" << MakeTextHtmled(myName) << L"] - [" << MakeTextHtmled(name1) << L"]\n"; + EXP_FILE << L"\n"; + EXP_FILE << L"\n"; + EXP_FILE << L"\n"; + + EXP_FILE << L"\n"; + EXP_FILE << L"" << TranslateT("Menu") << L"\n"; + EXP_FILE << L"\n"; + EXP_FILE << L"\n"; + EXP_FILE << L"\n"; + EXP_FILE << L"
\n"; + EXP_FILE << L"" << TranslateT("Open all") << L"\n"; + EXP_FILE << L"
\n"; + EXP_FILE << L"" << TranslateT("Close all") << L"\n"; + EXP_FILE << L"
\n"; + EXP_FILE << L"\n"; + + EXP_FILE << L"

" << TranslateT("History Log") << L"

\n

"; EXP_FILE << MakeTextHtmled(myName); if (proto1.length() || myId.length()) - EXP_FILE << _T(" (") << MakeTextHtmled(proto1) << _T(": ") << MakeTextHtmled(myId) << _T(") - "); + EXP_FILE << L" (" << MakeTextHtmled(proto1) << L": " << MakeTextHtmled(myId) << L") - "; else - EXP_FILE << _T(" - "); + EXP_FILE << L" - "; EXP_FILE << MakeTextHtmled(name1); if (proto1.length() || id1.length()) - EXP_FILE << _T(" (") << MakeTextHtmled(proto1) << _T(": ") << MakeTextHtmled(id1) << _T(")

\n"); + EXP_FILE << L" (" << MakeTextHtmled(proto1) << L": " << MakeTextHtmled(id1) << L")\n"; else - EXP_FILE << _T("\n"); + EXP_FILE << L"\n"; - EXP_FILE << _T("
") << TranslateT("Filter:") << _T(" ") << MakeTextHtmled(filterName) << _T("
\n"); + EXP_FILE << L"
" << TranslateT("Filter:") << L" " << MakeTextHtmled(filterName) << L"
\n"; groupId = 0; } void RichHtmlExport::WriteFooter() { if (groupId > 0) - EXP_FILE << _T("\n"); + EXP_FILE << L"\n"; - EXP_FILE << _T("
\n\n"); + EXP_FILE << L"
\n\n"; } void RichHtmlExport::WriteGroup(bool isMe, const std::wstring &time, const std::wstring&, const std::wstring &eventText) { - TCHAR *id = isMe ? _T("out") : _T("inc"); - TCHAR* ev = (isMe ? _T("1") : _T("0")); + TCHAR *id = isMe ? L"out" : L"inc"; + TCHAR* ev = (isMe ? L"1" : L"0"); if (groupId > 0) - EXP_FILE << _T("\n"); + EXP_FILE << L"\n"; bool isUrl = false; std::wstring mes = ReplaceSmileys(isMe, eventText, isUrl); - EXP_FILE << _T("
\n"); - EXP_FILE << _T(""); - EXP_FILE << _T("\n"); - EXP_FILE << _T("") << time << _T("\n\n") << mes; - EXP_FILE << _T("\n
\n"); - EXP_FILE << _T("
\n"); + EXP_FILE << L"
\n"; + EXP_FILE << L""; + EXP_FILE << L"\n"; + EXP_FILE << L"" << time << L"\n\n" << mes; + EXP_FILE << L"\n
\n"; + EXP_FILE << L"
\n"; ++groupId; } void RichHtmlExport::WriteMessage(bool isMe, const std::wstring &longDate, const std::wstring &shortDate, const std::wstring &user, const std::wstring &message, const DBEVENTINFO&) { - TCHAR *id = isMe ? _T("out") : _T("inc"); - TCHAR* ev = (isMe ? _T("1") : _T("0")); + TCHAR *id = isMe ? L"out" : L"inc"; + TCHAR* ev = (isMe ? L"1" : L"0"); TCHAR* ev1 = ev; bool isUrl = false; std::wstring mes = ReplaceSmileys(isMe, message, isUrl); if (isUrl) - ev = _T("2"); - EXP_FILE << _T("
\n"); - EXP_FILE << _T("
") << _T("
\n"); - EXP_FILE << _T("
") << (Options::instance->exportHtml2ShowDate ? longDate : shortDate) << _T("
\n"); - EXP_FILE << _T("
") << MakeTextHtmled(user) << _T("
\n"); - EXP_FILE << _T("
\n"); + ev = L"2"; + EXP_FILE << L"
\n"; + EXP_FILE << L"
" << L"
\n"; + EXP_FILE << L"
" << (Options::instance->exportHtml2ShowDate ? longDate : shortDate) << L"
\n"; + EXP_FILE << L"
" << MakeTextHtmled(user) << L"
\n"; + EXP_FILE << L"
\n"; EXP_FILE << mes; - EXP_FILE << _T("\n
\n"); - EXP_FILE << _T("
\n"); + EXP_FILE << L"\n
\n"; + EXP_FILE << L"
\n"; } std::wstring RichHtmlExport::ReplaceSmileys(bool isMe, const std::wstring &msg, bool &isUrl) @@ -466,17 +466,17 @@ std::wstring RichHtmlExport::ReplaceSmileys(bool isMe, const std::wstring &msg, std::wstring smileyName = GetName(spr[i].filepath); if (smileys.find(smileyName) == smileys.end()) { smileys.insert(smileyName); - CopyFile(spr[i].filepath, (folder + _T("\\") + smileyName).c_str(), FALSE); + CopyFile(spr[i].filepath, (folder + L"\\" + smileyName).c_str(), FALSE); } std::wstring smileyText = newMsg.substr(startChar, size); - smileyMsg += _T("\"");"); + smileyMsg += L"\"/>"; } // Get next -- cgit v1.2.3