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/Quotes/src/ComHelper.cpp | 4 +- plugins/Quotes/src/CreateFilePath.cpp | 2 +- plugins/Quotes/src/CurrencyConverter.cpp | 4 +- plugins/Quotes/src/ImportExport.cpp | 38 +++++++-------- plugins/Quotes/src/Locale.cpp | 22 ++++----- plugins/Quotes/src/Log.cpp | 4 +- plugins/Quotes/src/QuoteChart.cpp | 10 ++-- plugins/Quotes/src/QuoteInfoDlg.cpp | 6 +-- plugins/Quotes/src/QuotesProviderBase.cpp | 32 ++++++------- plugins/Quotes/src/QuotesProviderBase.h | 6 +-- plugins/Quotes/src/QuotesProviderDukasCopy.cpp | 12 ++--- plugins/Quotes/src/QuotesProviderFinance.cpp | 2 +- plugins/Quotes/src/QuotesProviderGoogle.cpp | 8 ++-- plugins/Quotes/src/QuotesProviderGoogleFinance.cpp | 18 +++---- .../Quotes/src/QuotesProviderVisitorDbSettings.cpp | 24 +++++----- .../QuotesProviderVisitorFormatSpecificator.cpp | 56 +++++++++++----------- .../src/QuotesProviderVisitorFormatSpecificator.h | 2 +- .../Quotes/src/QuotesProviderVisitorFormater.cpp | 8 ++-- plugins/Quotes/src/QuotesProviderVisitorFormater.h | 2 +- plugins/Quotes/src/QuotesProviderYahoo.cpp | 8 ++-- plugins/Quotes/src/SettingsDlg.cpp | 12 ++--- plugins/Quotes/src/WinCtrlHelper.cpp | 2 +- plugins/Quotes/src/XMLEngineMI.cpp | 8 ++-- 23 files changed, 145 insertions(+), 145 deletions(-) (limited to 'plugins/Quotes') diff --git a/plugins/Quotes/src/ComHelper.cpp b/plugins/Quotes/src/ComHelper.cpp index 57cf21b15a..6228ae9526 100644 --- a/plugins/Quotes/src/ComHelper.cpp +++ b/plugins/Quotes/src/ComHelper.cpp @@ -7,7 +7,7 @@ tstring ComException2Msg(_com_error& e, const tstring& rsAdditionalInfo) if (false == rsAdditionalInfo.empty()) o << rsAdditionalInfo << "\n"; - o << e.ErrorMessage() << _T(" (") << std::hex << hError << _T(")"); + o << e.ErrorMessage() << L" (" << std::hex << hError << L")"; IErrorInfo* p = e.ErrorInfo(); CComPtr pErrorInfo(p); @@ -15,7 +15,7 @@ tstring ComException2Msg(_com_error& e, const tstring& rsAdditionalInfo) p->Release(); if (pErrorInfo) - o << _T("\n") << e.Description(); + o << L"\n" << e.Description(); return o.str(); } diff --git a/plugins/Quotes/src/CreateFilePath.cpp b/plugins/Quotes/src/CreateFilePath.cpp index ef728791d3..4e2c47a96c 100644 --- a/plugins/Quotes/src/CreateFilePath.cpp +++ b/plugins/Quotes/src/CreateFilePath.cpp @@ -28,6 +28,6 @@ tstring CreateFilePath(const tstring& rsName) tstring s(rsName); prepare_name(s); tostringstream o; - o << szPath << _T("\\Quotes\\") << s; + o << szPath << L"\\Quotes\\" << s; return o.str(); } \ No newline at end of file diff --git a/plugins/Quotes/src/CurrencyConverter.cpp b/plugins/Quotes/src/CurrencyConverter.cpp index 9836b1e365..45f5628890 100644 --- a/plugins/Quotes/src/CurrencyConverter.cpp +++ b/plugins/Quotes/src/CurrencyConverter.cpp @@ -122,7 +122,7 @@ INT_PTR CALLBACK CurrencyConverterDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM const IQuotesProvider::CProviderInfo& pi = pProvider->GetInfo(); tostringstream o; - o << TranslateT("Info provided by") << _T(" ") << pi.m_sName << _T(""); + o << TranslateT("Info provided by") << L" " << pi.m_sName << L""; ::SetDlgItemText(hDlg, IDC_SYSLINK_PROVIDER, o.str().c_str()); @@ -242,7 +242,7 @@ INT_PTR CALLBACK CurrencyConverterDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM case NM_CLICK: if (IDC_SYSLINK_PROVIDER == wp) { PNMLINK pNMLink = reinterpret_cast(pNMHDR); - ::ShellExecute(hDlg, _T("open"), pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); + ::ShellExecute(hDlg, L"open", pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); } break; } diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp index 29b5f0f8e6..9e7d15d711 100644 --- a/plugins/Quotes/src/ImportExport.cpp +++ b/plugins/Quotes/src/ImportExport.cpp @@ -1,19 +1,19 @@ #include "StdAfx.h" -LPCTSTR g_pszXmlValue = _T("Value"); -LPCTSTR g_pszXmlName = _T("Name"); -LPCTSTR g_pszXmlSetting = _T("Setting"); -LPCTSTR g_pszXmlModule = _T("Module"); -LPCTSTR g_pszXmlContact = _T("Contact"); -LPCTSTR g_pszXmlContacts = _T("Contacts"); -LPCTSTR g_pszXmlType = _T("type"); -LPCTSTR g_pszXmlTypeByte = _T("byte"); -LPCTSTR g_pszXmlTypeWord = _T("word"); -LPCTSTR g_pszXmlTypeDword = _T("dword"); -LPCTSTR g_pszXmlTypeAsciiz = _T("asciiz"); -LPCTSTR g_pszXmlTypeWchar = _T("wchar"); -LPCTSTR g_pszXmlTypeUtf8 = _T("utf8"); -LPCTSTR g_pszXmlTypeBlob = _T("blob"); +LPCTSTR g_pszXmlValue = L"Value"; +LPCTSTR g_pszXmlName = L"Name"; +LPCTSTR g_pszXmlSetting = L"Setting"; +LPCTSTR g_pszXmlModule = L"Module"; +LPCTSTR g_pszXmlContact = L"Contact"; +LPCTSTR g_pszXmlContacts = L"Contacts"; +LPCTSTR g_pszXmlType = L"type"; +LPCTSTR g_pszXmlTypeByte = L"byte"; +LPCTSTR g_pszXmlTypeWord = L"word"; +LPCTSTR g_pszXmlTypeDword = L"dword"; +LPCTSTR g_pszXmlTypeAsciiz = L"asciiz"; +LPCTSTR g_pszXmlTypeWchar = L"wchar"; +LPCTSTR g_pszXmlTypeUtf8 = L"utf8"; +LPCTSTR g_pszXmlTypeBlob = L"blob"; struct CEnumContext { @@ -144,7 +144,7 @@ LPCTSTR prepare_filter(LPTSTR pszBuffer, size_t cBuffer) size_t nLen = mir_tstrlen(pszXml) + 1; p += nLen; if (nLen < cBuffer) { - mir_tstrncpy(p, _T("*.xml"), (int)(cBuffer - nLen)); + mir_tstrncpy(p, L"*.xml", (int)(cBuffer - nLen)); p += 6; nLen += 6; } @@ -158,7 +158,7 @@ LPCTSTR prepare_filter(LPTSTR pszBuffer, size_t cBuffer) } if (nLen < cBuffer) { - mir_tstrncpy(p, _T("*.*"), (int)(cBuffer - nLen)); + mir_tstrncpy(p, L"*.*", (int)(cBuffer - nLen)); p += 4; nLen += 4; } @@ -181,7 +181,7 @@ bool show_open_file_dialog(bool bOpen, tstring& rsFile) ofn.hwndOwner = NULL; ofn.lpstrFilter = prepare_filter(szFilter, MAX_PATH); ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER; - ofn.lpstrDefExt = _T("xml"); + ofn.lpstrDefExt = L"xml"; if (bOpen) ofn.Flags |= OFN_FILEMUSTEXIST; else @@ -255,7 +255,7 @@ bool handle_module(MCONTACT hContact, const IXMLNode::TXMLNodePtr& pXmlModule) std::string s = quotes_t2a(sModuleName.c_str()); dbs.szModule = s.c_str();//T2CA(sModuleName.c_str()); - bool bCListModule = 0 == mir_tstrcmpi(sModuleName.c_str(), _T("CList")); + bool bCListModule = 0 == mir_tstrcmpi(sModuleName.c_str(), L"CList"); size_t cChild = pXmlModule->GetChildCount(); for (size_t i = 0; i < cChild; ++i) { @@ -348,7 +348,7 @@ bool handle_module(MCONTACT hContact, const IXMLNode::TXMLNodePtr& pXmlModule) } } - if ((true == bCListModule) && (0 == mir_tstrcmpi(sName.c_str(), _T("Group")))) + if ((true == bCListModule) && (0 == mir_tstrcmpi(sName.c_str(), L"Group"))) Clist_GroupCreate(NULL, sValue.c_str()); } } diff --git a/plugins/Quotes/src/Locale.cpp b/plugins/Quotes/src/Locale.cpp index 4e72558cff..07c9f1a105 100644 --- a/plugins/Quotes/src/Locale.cpp +++ b/plugins/Quotes/src/Locale.cpp @@ -10,7 +10,7 @@ tstring get_int_registry_value(LPCTSTR pszValueName) tstring sResult; HKEY hKey = NULL; LONG lResult = ::RegOpenKeyEx(HKEY_CURRENT_USER, - _T("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey); + L"Control Panel\\International", 0, KEY_QUERY_VALUE, &hKey); if ((ERROR_SUCCESS == lResult) && (NULL != hKey)) { DWORD dwType = 0; DWORD dwSize = 0; @@ -33,27 +33,27 @@ tstring get_int_registry_value(LPCTSTR pszValueName) LPCTSTR date_win_2_boost(const tstring& sFrmt) { - if (sFrmt == _T("dd/MM/yy")) - return _T("%d/%m/%y"); - if (sFrmt == _T("yyyy-MM-dd")) - return _T("%y-%m-%d"); - return _T("%d.%m.%y"); + if (sFrmt == L"dd/MM/yy") + return L"%d/%m/%y"; + if (sFrmt == L"yyyy-MM-dd") + return L"%y-%m-%d"; + return L"%d.%m.%y"; } LPCTSTR time_win_2_boost(const tstring& sFrmt) { - if (sFrmt == _T("H:mm") || sFrmt == _T("HH:mm")) - return _T("%H:%M"); + if (sFrmt == L"H:mm" || sFrmt == L"HH:mm") + return L"%H:%M"; - return _T("%H:%M:%S"); + return L"%H:%M:%S"; } LPCTSTR Quotes_GetDateFormat(bool bShort) { - return date_win_2_boost(get_int_registry_value(bShort ? _T("sShortDate") : _T("sLongDate"))); + return date_win_2_boost(get_int_registry_value(bShort ? L"sShortDate" : L"sLongDate")); } LPCTSTR Quotes_GetTimeFormat(bool bShort) { - return time_win_2_boost(get_int_registry_value(bShort ? _T("sShortTime") : _T("sTimeFormat"))); + return time_win_2_boost(get_int_registry_value(bShort ? L"sShortTime" : L"sTimeFormat")); } diff --git a/plugins/Quotes/src/Log.cpp b/plugins/Quotes/src/Log.cpp index fea13ef91b..055fb22937 100644 --- a/plugins/Quotes/src/Log.cpp +++ b/plugins/Quotes/src/Log.cpp @@ -6,7 +6,7 @@ namespace tstring get_log_file_name() { - return CreateFilePath(_T("Quotes.log")); + return CreateFilePath(L"Quotes.log"); } bool is_log_enabled() @@ -26,7 +26,7 @@ namespace { TCHAR szTime[20]; _tstrtime_s(szTime); - file << szTime << _T(" ================================>\n") << rsMsg << _T("\n\n"); + file << szTime << L" ================================>\n" << rsMsg << L"\n\n"; } } } diff --git a/plugins/Quotes/src/QuoteChart.cpp b/plugins/Quotes/src/QuoteChart.cpp index 48938faef2..47dca6bfce 100644 --- a/plugins/Quotes/src/QuoteChart.cpp +++ b/plugins/Quotes/src/QuoteChart.cpp @@ -3,7 +3,7 @@ #ifdef CHART_IMPLEMENT #define WINDOW_PREFIX "Quotes Chart_" -#define CHART_CTRL_CLASS _T("DioksinChart") +#define CHART_CTRL_CLASS L"DioksinChart" struct CTimeConvert { @@ -15,7 +15,7 @@ struct CTimeConvert static tstring ToString(const boost::posix_time::ptime& v) { tostringstream k; - k.imbue(std::locale(GetSystemLocale(), new ttime_facet(_T("%d/%m/%y %H:%M:%S")))); + k.imbue(std::locale(GetSystemLocale(), new ttime_facet(L"%d/%m/%y %H:%M:%S"))); k << v; return k.str(); } @@ -33,7 +33,7 @@ bool read_log_file(MCONTACT hContact, TChart& rChart) { tstring sLogFileName = GetContactLogFileName(hContact); if (false == sLogFileName.empty()) { - std::locale loc(GetSystemLocale(), new ttime_input_facet(_T("%d.%m.%y %H:%M:%S"))); + std::locale loc(GetSystemLocale(), new ttime_input_facet(L"%d.%m.%y %H:%M:%S")); boost::posix_time::ptime oDateTime; double dRate; @@ -195,7 +195,7 @@ INT_PTR CALLBACK ChartDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) MCONTACT hContact = reinterpret_cast(lp); tstring sName = get_window_text(hDlg); - sName += _T(" - "); + sName += L" - "; sName += GetContactName(hContact); ::SetWindowText(hDlg, sName.c_str()); @@ -290,7 +290,7 @@ INT_PTR CALLBACK ChartDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) case NM_CLICK: if (IDC_SYSLINK_PROVIDER == wp) { PNMLINK pNMLink = reinterpret_cast(pNMHDR); - ::ShellExecute(hDlg, _T("open"), pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); + ::ShellExecute(hDlg, L"open", pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); } break; } diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index fdb60d15ab..da74285271 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -70,7 +70,7 @@ INT_PTR CALLBACK QuoteInfoDlgProcImpl(MCONTACT hContact, HWND hdlg, UINT msg, WP const IQuotesProvider::CProviderInfo& pi = pProvider->GetInfo(); tostringstream o; - o << TranslateT("Info provided by") << _T(" ") << pi.m_sName << _T(""); + o << TranslateT("Info provided by") << L" " << pi.m_sName << L""; ::SetDlgItemText(hdlg, IDC_SYSLINK_PROVIDER, o.str().c_str()); } @@ -82,7 +82,7 @@ INT_PTR CALLBACK QuoteInfoDlgProcImpl(MCONTACT hContact, HWND hdlg, UINT msg, WP case NM_CLICK: if (IDC_SYSLINK_PROVIDER == wParam) { PNMLINK pNMLink = reinterpret_cast(pNMHDR); - ::ShellExecute(hdlg, _T("open"), pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); + ::ShellExecute(hdlg, L"open", pNMLink->item.szUrl, NULL, NULL, SW_SHOWNORMAL); } break; } @@ -144,7 +144,7 @@ INT_PTR QuotesMenu_OpenLogFile(WPARAM wp, LPARAM) tstring sLogFileName; if ((true == get_log_file(hContact, sLogFileName)) && (false == sLogFileName.empty())) - ::ShellExecute(NULL, _T("open"), sLogFileName.c_str(), NULL, NULL, SW_SHOWNORMAL); + ::ShellExecute(NULL, L"open", sLogFileName.c_str(), NULL, NULL, SW_SHOWNORMAL); return 0; } diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp index 204e4a7d4a..b98dd35d51 100644 --- a/plugins/Quotes/src/QuotesProviderBase.cpp +++ b/plugins/Quotes/src/QuotesProviderBase.cpp @@ -5,7 +5,7 @@ extern HANDLE g_hEventWorkThreadStop; struct CQuotesProviderBase::CXMLFileInfo { - CXMLFileInfo() : m_qs(_T("Unknown")) {} + CXMLFileInfo() : m_qs(L"Unknown") {} IQuotesProvider::CProviderInfo m_pi; CQuotesProviderBase::CQuoteSection m_qs; tstring m_sURL; @@ -26,15 +26,15 @@ bool parse_quote(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuote& for (size_t i = 0; i < cChild; ++i) { IXMLNode::TXMLNodePtr pNode = pTop->GetChildNode(i); tstring sName = pNode->GetName(); - if (0 == mir_tstrcmpi(_T("symbol"), sName.c_str())) { + if (0 == mir_tstrcmpi(L"symbol", sName.c_str())) { sSymbol = pNode->GetText(); if (true == sSymbol.empty()) return false; } - else if (0 == mir_tstrcmpi(_T("description"), sName.c_str())) { + else if (0 == mir_tstrcmpi(L"description", sName.c_str())) { sDescription = pNode->GetText(); } - else if (0 == mir_tstrcmpi(_T("id"), sName.c_str())) { + else if (0 == mir_tstrcmpi(L"id", sName.c_str())) { sID = pNode->GetText(); if (true == sID.empty()) return false; @@ -55,17 +55,17 @@ bool parse_section(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuot for (size_t i = 0; i < cChild; ++i) { IXMLNode::TXMLNodePtr pNode = pTop->GetChildNode(i); tstring sName = pNode->GetName(); - if (0 == mir_tstrcmpi(_T("section"), sName.c_str())) { + if (0 == mir_tstrcmpi(L"section", sName.c_str())) { CQuotesProviderBase::CQuoteSection qs1; if (true == parse_section(pNode, qs1)) aSections.push_back(qs1); } - else if (0 == mir_tstrcmpi(_T("quote"), sName.c_str())) { + else if (0 == mir_tstrcmpi(L"quote", sName.c_str())) { CQuotesProviderBase::CQuote q; if (true == parse_quote(pNode, q)) aQuotes.push_back(q); } - else if (0 == mir_tstrcmpi(_T("name"), sName.c_str())) { + else if (0 == mir_tstrcmpi(L"name", sName.c_str())) { sSectionName = pNode->GetText(); if (true == sSectionName.empty()) return false; @@ -83,7 +83,7 @@ IXMLNode::TXMLNodePtr find_provider(const IXMLNode::TXMLNodePtr& pRoot) for (size_t i = 0; i < cChild; ++i) { IXMLNode::TXMLNodePtr pNode = pRoot->GetChildNode(i); tstring sName = pNode->GetName(); - if (0 == mir_tstrcmpi(_T("Provider"), sName.c_str())) { + if (0 == mir_tstrcmpi(L"Provider", sName.c_str())) { pProvider = pNode; break; } @@ -111,16 +111,16 @@ CQuotesProviderBase::CXMLFileInfo parse_ini_file(const tstring& rsXMLFile, bool& for (size_t i = 0; i < cChild; ++i) { IXMLNode::TXMLNodePtr pNode = pProvider->GetChildNode(i); tstring sName = pNode->GetName(); - if (0 == mir_tstrcmpi(_T("section"), sName.c_str())) { + if (0 == mir_tstrcmpi(L"section", sName.c_str())) { CQuotesProviderBase::CQuoteSection qs; if (true == parse_section(pNode, qs)) aSections.push_back(qs); } - else if (0 == mir_tstrcmpi(_T("Name"), sName.c_str())) + else if (0 == mir_tstrcmpi(L"Name", sName.c_str())) res.m_pi.m_sName = pNode->GetText(); - else if (0 == mir_tstrcmpi(_T("ref"), sName.c_str())) + else if (0 == mir_tstrcmpi(L"ref", sName.c_str())) res.m_pi.m_sURL = pNode->GetText(); - else if (0 == mir_tstrcmpi(_T("url"), sName.c_str())) + else if (0 == mir_tstrcmpi(L"url", sName.c_str())) res.m_sURL = pNode->GetText(); } } @@ -384,10 +384,10 @@ tstring format_rate(const IQuotesProvider *pProvider, MCONTACT hContact, const t if (i != rsFrmt.end()) { TCHAR t = *i; switch (t) { - case _T('%'): sResult += _T("%"); break; - case _T('t'): sResult += _T("\t"); break; - case _T('n'): sResult += _T("\n"); break; - case _T('\\'): sResult += _T("\\"); break; + case _T('%'): sResult += L"%"; break; + case _T('t'): sResult += L"\t"; break; + case _T('n'): sResult += L"\n"; break; + case _T('\\'): sResult += L"\\"; break; default: sResult += chr; sResult += t; break; } ++i; diff --git a/plugins/Quotes/src/QuotesProviderBase.h b/plugins/Quotes/src/QuotesProviderBase.h index b7f226fab3..7370318b3d 100644 --- a/plugins/Quotes/src/QuotesProviderBase.h +++ b/plugins/Quotes/src/QuotesProviderBase.h @@ -7,7 +7,7 @@ public: class CQuote { public: - CQuote(const tstring& rsID = _T(""), const tstring& rsSymbol = _T(""), const tstring& rsName = _T("")) + CQuote(const tstring& rsID = L"", const tstring& rsSymbol = L"", const tstring& rsName = L"") : m_sSymbol(rsSymbol), m_sName(rsName), m_sID(rsID){} const tstring& GetSymbol()const{ return m_sSymbol; } @@ -27,7 +27,7 @@ public: typedef std::vector TQuotes; public: - CQuoteSection(const tstring& rsName = _T(""), const TSections& raSections = TSections(), const TQuotes& raQuotes = TQuotes()) + CQuoteSection(const tstring& rsName = L"", const TSections& raSections = TSections(), const TQuotes& raQuotes = TQuotes()) : m_sName(rsName), m_aSections(raSections), m_aQuotes(raQuotes){} const tstring& GetName()const @@ -89,7 +89,7 @@ protected: MCONTACT CreateNewContact(const tstring& rsName); static bool IsOnline(); static void SetContactStatus(MCONTACT hContact, int nNewStatus); - void WriteContactRate(MCONTACT hContact, double dRate, const tstring& rsSymbol = _T("")); + void WriteContactRate(MCONTACT hContact, double dRate, const tstring& rsSymbol = L""); private: virtual void RefreshQuotes(TContracts& anContacts) = 0; diff --git a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp index 3fafe3423d..e010f98577 100644 --- a/plugins/Quotes/src/QuotesProviderDukasCopy.cpp +++ b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp @@ -67,7 +67,7 @@ tstring CQuotesProviderDukasCopy::BuildHTTPURL()const MCONTACT hContact = *i; tstring sID = get_quote_id(hContact); if (false == sID.empty()) - sURL << sID << _T(","); + sURL << sID << L","; } } @@ -103,18 +103,18 @@ bool string2double(const TCHAR* pszText, double& rValue) void parse_row(const THTMLNodePtr& pRow, TEconomicRates& raRates) { CEconomicRateInfo ri; - ri.m_sID = pRow->GetAttribute(_T("sid")); + ri.m_sID = pRow->GetAttribute(L"sid"); if (false == ri.m_sID.empty()) { unsigned short cColsHandled = 0; tostringstream sSidID; - sSidID << _T("id") << ri.m_sID; + sSidID << L"id" << ri.m_sID; size_t cNodes = pRow->GetChildCount(); for (size_t i = 0; i < cNodes && cColsHandled < 2; ++i) { THTMLNodePtr pCol = pRow->GetChildPtr(i); if (pCol) { - tstring sColID = pCol->GetAttribute(_T("id")); + tstring sColID = pCol->GetAttribute(L"id"); if (false == sColID.empty()) { - if (0 == mir_tstrcmpi(sColID.c_str(), _T("stock"))) { + if (0 == mir_tstrcmpi(sColID.c_str(), L"stock")) { ri.m_sName = pCol->GetText(); if (false == ri.m_sName.empty()) { ++cColsHandled; @@ -125,7 +125,7 @@ void parse_row(const THTMLNodePtr& pRow, TEconomicRates& raRates) if ((false == sRate.empty()) && (true == string2double(sRate.c_str(), ri.m_dCurRate))) { ri.m_dPrevRate = ri.m_dCurRate; ++cColsHandled; - tstring sOldRate = pCol->GetAttribute(_T("oldPrice")); + tstring sOldRate = pCol->GetAttribute(L"oldPrice"); if (false == sOldRate.empty()) { string2double(sOldRate.c_str(), ri.m_dPrevRate); } diff --git a/plugins/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp index 4dd036fe3e..b200715fa5 100644 --- a/plugins/Quotes/src/QuotesProviderFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderFinance.cpp @@ -159,7 +159,7 @@ namespace if (LB_ERR == is_quote_added(hwndList, sQuoteSymbol)) { CQuotesProviderBase::CQuote quote(sQuoteSymbol, sQuoteSymbol); if (add_quote_to_wnd(quote, hwndList) >= 0) { - SetDlgItemText(hDlg, IDC_EDIT_QUOTE, _T("")); + SetDlgItemText(hDlg, IDC_EDIT_QUOTE, L""); SetFocus(hEdit); PropSheet_Changed(::GetParent(hDlg), hDlg); } diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp index a91f71fc27..096def469d 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp @@ -11,7 +11,7 @@ CQuotesProviderGoogle::~CQuotesProviderGoogle() inline tstring make_contact_name(const tstring& rsSymbolFrom, const tstring& rsSymbolTo) { tostringstream o; - o << rsSymbolFrom << _T("/") << rsSymbolTo; + o << rsSymbolFrom << L"/" << rsSymbolTo; return o.str(); } @@ -86,7 +86,7 @@ bool CQuotesProviderGoogle::GetWatchedRateInfo(size_t nIndex, CRateInfo& rRateIn static tstring build_url(const tstring& rsURL, const tstring& from, const tstring& to, double dAmount) { tostringstream o; - o << rsURL << _T("?a=") << std::fixed << dAmount << _T("&from=") << from << _T("&to=") << to; + o << rsURL << L"?a=" << std::fixed << dAmount << L"&from=" << from << L"&to=" << to; return o.str(); } @@ -101,8 +101,8 @@ typedef IHTMLNode::THTMLNodePtr THTMLNodePtr; bool parse_html_node(const THTMLNodePtr& pNode, double& rdRate) { - tstring sID = pNode->GetAttribute(_T("id")); - if ((false == sID.empty()) && (0 == mir_tstrcmpi(sID.c_str(), _T("currency_converter_result")))) { + tstring sID = pNode->GetAttribute(L"id"); + if ((false == sID.empty()) && (0 == mir_tstrcmpi(sID.c_str(), L"currency_converter_result"))) { size_t cChild = pNode->GetChildCount(); // assert(1 == cChild); if (cChild > 0) { diff --git a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp index 25efbdfc55..8219497148 100644 --- a/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp @@ -11,7 +11,7 @@ CQuotesProviderGoogleFinance::~CQuotesProviderGoogleFinance() static tstring build_url(MCONTACT hContact, const tstring& rsURL) { tostringstream o; - o << rsURL << _T("?q=") << Quotes_DBGetStringT(hContact, QUOTES_MODULE_NAME, DB_STR_QUOTE_ID); + o << rsURL << L"?q=" << Quotes_DBGetStringT(hContact, QUOTES_MODULE_NAME, DB_STR_QUOTE_ID); return o.str(); } @@ -41,18 +41,18 @@ struct CGoogleInfo tstring make_rate_id_value(const tstring& rsCmpID, int nFlags) { tostringstream o; - o << _T("ref_") << rsCmpID; + o << L"ref_" << rsCmpID; switch (nFlags) { default: assert(!"Unknown type of value"); case CGoogleInfo::giRate: - o << _T("_l"); + o << L"_l"; break; case CGoogleInfo::giPercentChangeAfterHours: - o << _T("_ecp"); + o << L"_ecp"; break; case CGoogleInfo::giPercentChangeToYesterdayClose: - o << _T("_cp"); + o << L"_cp"; break; } @@ -79,7 +79,7 @@ tstring get_var_value(const tstring& rsHTML, LPCTSTR pszVarName, size_t cVarName tstring get_company_id(const tstring& rsHTML) { - static LPCTSTR pszVarName = _T("setCompanyId("); + static LPCTSTR pszVarName = L"setCompanyId("; static size_t cVarNameLength = mir_tstrlen(pszVarName); tstring sResult; @@ -99,7 +99,7 @@ tstring get_company_id(const tstring& rsHTML) tstring get_company_name(const tstring& rsHTML) { - static LPCTSTR pszVarName = _T("var _companyName = "); + static LPCTSTR pszVarName = L"var _companyName = "; static size_t cVarNameLength = mir_tstrlen(pszVarName); tstring s = get_var_value(rsHTML, pszVarName, cVarNameLength); @@ -151,7 +151,7 @@ bool get_inline_data(const IHTMLNode::THTMLNodePtr& pNode, CGoogleInfo& rInfo) IHTMLNode::THTMLNodePtr pName = pChild->GetChildPtr(0); tstring sName = pName->GetText(); - if (0 == mir_tstrcmpi(sName.c_str(), _T("Open"))) { + if (0 == mir_tstrcmpi(sName.c_str(), L"Open")) { IHTMLNode::THTMLNodePtr pValue = pChild->GetChildPtr(1); tstring sValue = pValue->GetText(); if (true == get_double_value(sValue, rInfo.m_dOpenValue)) { @@ -210,7 +210,7 @@ bool parse_responce(const tstring& rsHTML, CGoogleInfo& rInfo) if (pRate && get_rate(pRate, rInfo)) { rInfo.m_sCmpName = get_company_name(rsHTML); - IHTMLNode::THTMLNodePtr pInline = pRoot->GetElementByID(_T("snap-data")); + IHTMLNode::THTMLNodePtr pInline = pRoot->GetElementByID(L"snap-data"); if (pInline) { get_inline_data(pInline, rInfo); } diff --git a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp index b8c2a7c68a..c1cd208545 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp @@ -26,7 +26,7 @@ CQuotesProviderVisitorDbSettings::CQuotesProviderVisitorDbSettings() m_pszDbPopupDelayTimeout(NULL), m_pszDbPopupHistoryFlag(NULL), m_pszDbTendencyFormat(nullptr), - m_pszDefTendencyFormat(_T("%r>%p")) + m_pszDefTendencyFormat(L"%r>%p") { } @@ -36,9 +36,9 @@ CQuotesProviderVisitorDbSettings::~CQuotesProviderVisitorDbSettings() void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderBase&/* rProvider*/) { - m_pszDefLogFileFormat = _T("%s\\t%t\\t%r\\n"); - m_pszDefHistoryFormat = _T("%s %r"); - m_pszDefPopupFormat = _T("\\nCurrent = %r\\nPrevious = %p"); + m_pszDefLogFileFormat = L"%s\\t%t\\t%r\\n"; + m_pszDefHistoryFormat = L"%s %r"; + m_pszDefPopupFormat = L"\\nCurrent = %r\\nPrevious = %p"; } void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderDukasCopy&/* rProvider*/) @@ -46,8 +46,8 @@ void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderDukasCopy&/* r m_pszDbRefreshRateType = DB_STR_REFRESH_RATE_TYPE; m_pszDbRefreshRateValue = DB_STR_REFRESH_RATE_VALUE; m_pszDbDisplayNameFormat = DB_STR_DC_DISPLAY_NAME_FORMAT; - m_pszDefDisplayFormat = _T("%s %r"); - m_pszXMLIniFileName = _T("Dukascopy.xml"); + m_pszDefDisplayFormat = L"%s %r"; + m_pszXMLIniFileName = L"Dukascopy.xml"; m_pszDbStatusMsgFormat = "DC_StatusMessageFormat"; m_pszDbLogMode = "DC_LogMode"; @@ -73,8 +73,8 @@ void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderGoogle&/* rPro m_pszDbRefreshRateType = DB_STR_GOOGLE_REFRESH_RATE_TYPE; m_pszDbRefreshRateValue = DB_STR_GOOGLE_REFRESH_RATE_VALUE; m_pszDbDisplayNameFormat = DB_STR_GOOGLE_DISPLAY_NAME_FORMAT; - m_pszDefDisplayFormat = _T("1 %f = %r %i"); - m_pszXMLIniFileName = _T("Google.xml"); + m_pszDefDisplayFormat = L"1 %f = %r %i"; + m_pszXMLIniFileName = L"Google.xml"; m_pszDbStatusMsgFormat = "Google_StatusMessageFormat"; m_pszDbLogMode = "Google_LogMode"; @@ -101,8 +101,8 @@ void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderGoogleFinance& m_pszDbRefreshRateType = "GoogleFinance_RefreshRateType"; m_pszDbRefreshRateValue = "GoogleFinance_RefreshRateValue"; m_pszDbDisplayNameFormat = "GoogleFinance_DspNameFrmt"; - m_pszDefDisplayFormat = _T("%s %r"); - m_pszXMLIniFileName = _T("GoogleFinance.xml"); + m_pszDefDisplayFormat = L"%s %r"; + m_pszXMLIniFileName = L"GoogleFinance.xml"; m_pszDbStatusMsgFormat = "GoogleFinance_StatusMessageFormat"; m_pszDbLogMode = "GoogleFinance_LogMode"; @@ -129,8 +129,8 @@ void CQuotesProviderVisitorDbSettings::Visit(const CQuotesProviderYahoo&) m_pszDbRefreshRateType = "Yahoo_RefreshRateType"; m_pszDbRefreshRateValue = "Yahoo_RefreshRateValue"; m_pszDbDisplayNameFormat = "Yahoo_DspNameFrmt"; - m_pszDefDisplayFormat = _T("%s %r"); - m_pszXMLIniFileName = _T("Yahoo.xml"); + m_pszDefDisplayFormat = L"%s %r"; + m_pszXMLIniFileName = L"Yahoo.xml"; m_pszDbStatusMsgFormat = "Yahoo_StatusMessageFormat"; m_pszDbLogMode = "Yahoo_LogMode"; diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp index 26cfef3cfa..5dc1bd1848 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp @@ -10,39 +10,39 @@ CQuotesProviderVisitorFormatSpecificator::~CQuotesProviderVisitorFormatSpecifica void CQuotesProviderVisitorFormatSpecificator::Visit(const CQuotesProviderDukasCopy&/* rProvider*/) { - m_aSpecificators.push_back(CFormatSpecificator(_T("%s"), TranslateT("Quote Symbol"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%d"), TranslateT("Quote Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%s", TranslateT("Quote Symbol"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%d", TranslateT("Quote Name"))); } void CQuotesProviderVisitorFormatSpecificator::Visit(const CQuotesProviderGoogle&/* rProvider*/) { - m_aSpecificators.push_back(CFormatSpecificator(_T("%F"), TranslateT("From Currency Full Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%f"), TranslateT("From Currency Short Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%I"), TranslateT("Into Currency Full Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%i"), TranslateT("Into Currency Short Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%s"), TranslateT("Short notation for \"%f/%i\""))); + m_aSpecificators.push_back(CFormatSpecificator(L"%F", TranslateT("From Currency Full Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%f", TranslateT("From Currency Short Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%I", TranslateT("Into Currency Full Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%i", TranslateT("Into Currency Short Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%s", TranslateT("Short notation for \"%f/%i\""))); } void CQuotesProviderVisitorFormatSpecificator::Visit(const CQuotesProviderBase&/* rProvider*/) { - m_aSpecificators.push_back(CFormatSpecificator(_T("%S"), TranslateT("Source of Information"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%r"), TranslateT("Rate Value"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%p"), TranslateT("Previous Rate Value"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%X"), TranslateT("Fetch Time"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%x"), TranslateT("Fetch Date"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%t"), TranslateT("Fetch Time and Date"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("\\%"), TranslateT("Percentage Character (%)"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("\\t"), TranslateT("Tabulation"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("\\\\"), TranslateT("Left slash (\\)"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%S", TranslateT("Source of Information"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%r", TranslateT("Rate Value"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%p", TranslateT("Previous Rate Value"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%X", TranslateT("Fetch Time"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%x", TranslateT("Fetch Date"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%t", TranslateT("Fetch Time and Date"))); + m_aSpecificators.push_back(CFormatSpecificator(L"\\%", TranslateT("Percentage Character (%)"))); + m_aSpecificators.push_back(CFormatSpecificator(L"\\t", TranslateT("Tabulation"))); + m_aSpecificators.push_back(CFormatSpecificator(L"\\\\", TranslateT("Left slash (\\)"))); } void CQuotesProviderVisitorFormatSpecificator::Visit(const CQuotesProviderGoogleFinance&/* rProvider*/) { - m_aSpecificators.push_back(CFormatSpecificator(_T("%s"), TranslateT("Quote Symbol"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%n"), TranslateT("Quote Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%o"), TranslateT("Open Price"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%d"), TranslateT("Percent Change to After Hours"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%y"), TranslateT("Percent Change to Yesterday Close"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%s", TranslateT("Quote Symbol"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%n", TranslateT("Quote Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%o", TranslateT("Open Price"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%d", TranslateT("Percent Change to After Hours"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%y", TranslateT("Percent Change to Yesterday Close"))); } const CQuotesProviderVisitorFormatSpecificator::TFormatSpecificators& CQuotesProviderVisitorFormatSpecificator::GetSpecificators()const @@ -52,11 +52,11 @@ const CQuotesProviderVisitorFormatSpecificator::TFormatSpecificators& CQuotesPro void CQuotesProviderVisitorFormatSpecificator::Visit(const CQuotesProviderYahoo&) { - m_aSpecificators.push_back(CFormatSpecificator(_T("%s"), TranslateT("Quote Symbol"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%n"), TranslateT("Quote Name"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%o"), TranslateT("Open Price"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%h"), TranslateT("Day's High"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%g"), TranslateT("Day's Low"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%P"), TranslateT("Previous Close"))); - m_aSpecificators.push_back(CFormatSpecificator(_T("%c"), TranslateT("Change"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%s", TranslateT("Quote Symbol"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%n", TranslateT("Quote Name"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%o", TranslateT("Open Price"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%h", TranslateT("Day's High"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%g", TranslateT("Day's Low"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%P", TranslateT("Previous Close"))); + m_aSpecificators.push_back(CFormatSpecificator(L"%c", TranslateT("Change"))); } diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h index 0d5fc265fd..25bb88b15e 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h +++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h @@ -6,7 +6,7 @@ class CQuotesProviderVisitorFormatSpecificator : public CQuotesProviderVisitor public: struct CFormatSpecificator { - CFormatSpecificator(const tstring& rsSymbol = _T(""), const tstring& rsDec = _T("")) + CFormatSpecificator(const tstring& rsSymbol = L"", const tstring& rsDec = L"") : m_sSymbol(rsSymbol), m_sDesc(rsDec){} tstring m_sSymbol; diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp index b6bb075b88..04d3fe7662 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp +++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp @@ -87,7 +87,7 @@ void CQuotesProviderVisitorFormater::Visit(const CQuotesProviderBase& rProvider) case _T('t'): { tstring sFrmt = Quotes_GetDateFormat(true); - sFrmt += _T(" "); + sFrmt += L" "; sFrmt += Quotes_GetTimeFormat(true); m_sResult = format_fetch_time(rProvider, m_hContact, sFrmt); } @@ -109,10 +109,10 @@ void CQuotesProviderVisitorFormater::Visit(const CQuotesProviderGoogleFinance&/* FormatDoubleHelper(DB_STR_GOOGLE_FINANCE_OPEN_VALUE); break; case _T('d'): - FormatDoubleHelper(DB_STR_GOOGLE_FINANCE_DIFF, _T("0")); + FormatDoubleHelper(DB_STR_GOOGLE_FINANCE_DIFF, L"0"); break; case _T('y'): - FormatDoubleHelper(DB_STR_GOOGLE_FINANCE_PERCENT_CHANGE_TO_YERSTERDAY_CLOSE, _T("0")); + FormatDoubleHelper(DB_STR_GOOGLE_FINANCE_PERCENT_CHANGE_TO_YERSTERDAY_CLOSE, L"0"); break; case _T('n'): m_sResult = Quotes_DBGetStringT(m_hContact, QUOTES_MODULE_NAME, DB_STR_QUOTE_DESCRIPTION); @@ -134,7 +134,7 @@ tstring format_double(double dValue, int nWidth) } void CQuotesProviderVisitorFormater::FormatDoubleHelper(LPCSTR pszDbSet, - const tstring sInvalid/* = _T("-")*/) + const tstring sInvalid/* = L"-"*/) { double d = 0.0; if (true == Quotes_DBReadDouble(m_hContact, QUOTES_MODULE_NAME, pszDbSet, d)) diff --git a/plugins/Quotes/src/QuotesProviderVisitorFormater.h b/plugins/Quotes/src/QuotesProviderVisitorFormater.h index dc7481fa44..9ae3408d6a 100644 --- a/plugins/Quotes/src/QuotesProviderVisitorFormater.h +++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.h @@ -17,7 +17,7 @@ private: virtual void Visit(const CQuotesProviderYahoo& rProvider); private: - void FormatDoubleHelper(LPCSTR pszDbSet, const tstring sInvalid = _T("-")); + void FormatDoubleHelper(LPCSTR pszDbSet, const tstring sInvalid = L"-"); // void FormatChangeValueHelper(bool bPercentage); private: diff --git a/plugins/Quotes/src/QuotesProviderYahoo.cpp b/plugins/Quotes/src/QuotesProviderYahoo.cpp index 9b9ad36c4f..e590472834 100644 --- a/plugins/Quotes/src/QuotesProviderYahoo.cpp +++ b/plugins/Quotes/src/QuotesProviderYahoo.cpp @@ -43,7 +43,7 @@ bool get_double_from_parsed_line(MCONTACT hContact, const TStrings& rasParsedLin return Quotes_DBWriteDouble(hContact, QUOTES_MODULE_NAME, pszDbName, d); } - db_set_ts(hContact, QUOTES_MODULE_NAME, pszDbName, _T("")); + db_set_ts(hContact, QUOTES_MODULE_NAME, pszDbName, L""); return false; } @@ -55,7 +55,7 @@ void CQuotesProviderYahoo::RefreshQuotes(TContracts& anContacts) typedef std::map TQuoteID2ContractHandles; TQuoteID2ContractHandles aQuoteID2Handles; tostringstream oURL; - oURL << sURL << _T("dioksin.txt?s="); + oURL << sURL << L"dioksin.txt?s="; for (TContracts::const_iterator i = anContacts.begin(); i != anContacts.end() && IsOnline(); ++i) { MCONTACT hContact = *i; if (bUseExtendedStatus) @@ -64,13 +64,13 @@ void CQuotesProviderYahoo::RefreshQuotes(TContracts& anContacts) tstring sQuoteID = Quotes_DBGetStringT(hContact, QUOTES_MODULE_NAME, DB_STR_QUOTE_ID); aQuoteID2Handles[sQuoteID] = hContact; if (i != anContacts.begin()) - oURL << _T("+"); + oURL << L"+"; oURL << sQuoteID; } if (true == IsOnline()) { - oURL << _T("&f=snl1ohgpc1"); + oURL << L"&f=snl1ohgpc1"; CHTTPSession http; if ((true == http.OpenURL(oURL.str())) && (true == IsOnline())) { tstring sFile; diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp index e58f70833f..ee548a211e 100644 --- a/plugins/Quotes/src/SettingsDlg.cpp +++ b/plugins/Quotes/src/SettingsDlg.cpp @@ -2,8 +2,8 @@ #define WINDOW_PREFIX_SETTINGS "Edit Settings_" -LPCTSTR g_pszVariableQuoteName = _T("%quotename%"); -LPCTSTR g_pszVariableUserProfile = _T("%miranda_userdata%"); +LPCTSTR g_pszVariableQuoteName = L"%quotename%"; +LPCTSTR g_pszVariableUserProfile = L"%miranda_userdata%"; void update_file_controls(HWND hDlg) { @@ -85,7 +85,7 @@ void update_all_controls(HWND hDlg) std::vector get_filter() { std::vector aFilter; - LPCTSTR pszFilterParts[] = { LPGENT("Log Files (*.txt,*.log)"), _T("*.txt;*.log"), LPGENT("All files (*.*)"), _T("*.*") }; + LPCTSTR pszFilterParts[] = { LPGENT("Log Files (*.txt,*.log)"), L"*.txt;*.log", LPGENT("All files (*.*)"), L"*.*" }; for (int i = 0; i < sizeof(pszFilterParts) / sizeof(pszFilterParts[0]); ++i) { tstring sPart = TranslateTS(pszFilterParts[i]); std::copy(sPart.begin(), sPart.end(), std::back_inserter(aFilter)); @@ -111,7 +111,7 @@ void select_log_file(HWND hDlg) ofn.lpstrFilter = pszFilter; ofn.nFilterIndex = 1; ofn.hInstance = g_hInstance; - ofn.lpstrDefExt = _T("log"); + ofn.lpstrDefExt = L"log"; ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER; BOOL b = GetOpenFileName(&ofn); @@ -663,9 +663,9 @@ CAdvProviderSettings::CAdvProviderSettings(const IQuotesProvider* pQuotesProvide m_sLogFileName = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbLogFile); if (true == m_sLogFileName.empty()) { m_sLogFileName = g_pszVariableUserProfile; - m_sLogFileName += _T("\\Quotes\\"); + m_sLogFileName += L"\\Quotes\\"; m_sLogFileName += g_pszVariableQuoteName; - m_sLogFileName += _T(".log"); + m_sLogFileName += L".log"; } m_sFormatLogFile = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbLogFormat, visitor.m_pszDefLogFileFormat); diff --git a/plugins/Quotes/src/WinCtrlHelper.cpp b/plugins/Quotes/src/WinCtrlHelper.cpp index 9ca18a6811..18662cb0cd 100644 --- a/plugins/Quotes/src/WinCtrlHelper.cpp +++ b/plugins/Quotes/src/WinCtrlHelper.cpp @@ -15,7 +15,7 @@ static INT_PTR CALLBACK VariableListDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPAR std::for_each(raSpec.begin(), raSpec.end(), [&o](const CQuotesProviderVisitorFormatSpecificator::CFormatSpecificator& spec) { - o << spec.m_sSymbol << _T('\t') << spec.m_sDesc << _T("\r\n"); + o << spec.m_sSymbol << _T('\t') << spec.m_sDesc << L"\r\n"; }); ::SetDlgItemText(hWnd, IDC_EDIT_VARIABLE, o.str().c_str()); } diff --git a/plugins/Quotes/src/XMLEngineMI.cpp b/plugins/Quotes/src/XMLEngineMI.cpp index 59c76ed58f..5f694a31d0 100644 --- a/plugins/Quotes/src/XMLEngineMI.cpp +++ b/plugins/Quotes/src/XMLEngineMI.cpp @@ -99,7 +99,7 @@ IXMLNode::TXMLNodePtr CXMLEngineMI::LoadFile(const tstring& rsFileName)const { IXMLNode::TXMLNodePtr pResult; FILE *stream; - if (0 == ::_tfopen_s(&stream, rsFileName.c_str(), _T("r"))) { + if (0 == ::_tfopen_s(&stream, rsFileName.c_str(), L"r")) { struct _stat st; if (-1 != ::_fstat(::_fileno(stream), &st)) { std::vector aBuffer(st.st_size + 1); @@ -139,10 +139,10 @@ bool CXMLEngineMI::SaveFile(const tstring& rsFileName, const IXMLNode::TXMLNodeP if (pXML) { tofstream file(rsFileName.c_str()); if (file.good()) { - IXMLNode::TXMLNodePtr pRoot(create_node(_T("xml"), tstring(), true)); + IXMLNode::TXMLNodePtr pRoot(create_node(L"xml", tstring(), true)); if (pRoot) { - pRoot->AddAttribute(_T("version"), _T("1.0")); - pRoot->AddAttribute(_T("encoding"), _T("UTF-8")); + pRoot->AddAttribute(L"version", L"1.0"); + pRoot->AddAttribute(L"encoding", L"UTF-8"); file << *pRoot; } -- cgit v1.2.3