From 8bf03133314064ec052873b01647c79b69a5b681 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 25 Feb 2016 13:47:23 +0000 Subject: more shit removed git-svn-id: http://svn.miranda-ng.org/main/trunk@16336 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/QuotesProviderBase.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'plugins/Quotes/src/QuotesProviderBase.cpp') diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp index c97126e9fe..204e4a7d4a 100644 --- a/plugins/Quotes/src/QuotesProviderBase.cpp +++ b/plugins/Quotes/src/QuotesProviderBase.cpp @@ -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 == quotes_stricmp(_T("symbol"), sName.c_str())) { + if (0 == mir_tstrcmpi(_T("symbol"), sName.c_str())) { sSymbol = pNode->GetText(); if (true == sSymbol.empty()) return false; } - else if (0 == quotes_stricmp(_T("description"), sName.c_str())) { + else if (0 == mir_tstrcmpi(_T("description"), sName.c_str())) { sDescription = pNode->GetText(); } - else if (0 == quotes_stricmp(_T("id"), sName.c_str())) { + else if (0 == mir_tstrcmpi(_T("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 == quotes_stricmp(_T("section"), sName.c_str())) { + if (0 == mir_tstrcmpi(_T("section"), sName.c_str())) { CQuotesProviderBase::CQuoteSection qs1; if (true == parse_section(pNode, qs1)) aSections.push_back(qs1); } - else if (0 == quotes_stricmp(_T("quote"), sName.c_str())) { + else if (0 == mir_tstrcmpi(_T("quote"), sName.c_str())) { CQuotesProviderBase::CQuote q; if (true == parse_quote(pNode, q)) aQuotes.push_back(q); } - else if (0 == quotes_stricmp(_T("name"), sName.c_str())) { + else if (0 == mir_tstrcmpi(_T("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 == quotes_stricmp(_T("Provider"), sName.c_str())) { + if (0 == mir_tstrcmpi(_T("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 == quotes_stricmp(_T("section"), sName.c_str())) { + if (0 == mir_tstrcmpi(_T("section"), sName.c_str())) { CQuotesProviderBase::CQuoteSection qs; if (true == parse_section(pNode, qs)) aSections.push_back(qs); } - else if (0 == quotes_stricmp(_T("Name"), sName.c_str())) + else if (0 == mir_tstrcmpi(_T("Name"), sName.c_str())) res.m_pi.m_sName = pNode->GetText(); - else if (0 == quotes_stricmp(_T("ref"), sName.c_str())) + else if (0 == mir_tstrcmpi(_T("ref"), sName.c_str())) res.m_pi.m_sURL = pNode->GetText(); - else if (0 == quotes_stricmp(_T("url"), sName.c_str())) + else if (0 == mir_tstrcmpi(_T("url"), sName.c_str())) res.m_sURL = pNode->GetText(); } } @@ -509,10 +509,11 @@ bool show_popup(const IQuotesProvider* pProvider, pProvider->Accept(visitor); const tstring& sTitle = visitor.GetResult(); mir_tstrncpy(ppd.lptzContactName, sTitle.c_str(), MAX_CONTACTNAME); - - mir_safe_string ss(variables_parsedup((TCHAR*)rsFormat.c_str(), 0, hContact)); - tstring sText = format_rate(pProvider, hContact, ss.m_p); - mir_tstrncpy(ppd.lptzText, sText.c_str(), MAX_SECONDLINE); + { + ptrT ss(variables_parsedup((TCHAR*)rsFormat.c_str(), 0, hContact)); + tstring sText = format_rate(pProvider, hContact, tstring(ss)); + mir_tstrncpy(ppd.lptzText, sText.c_str(), MAX_SECONDLINE); + } if (CPopupSettings::colourDefault == ps.GetColourMode()) { ppd.colorText = CPopupSettings::GetDefColourText(); -- cgit v1.2.3