Quotes: major code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@16335 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 448 insertions, 640 deletions

diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp
index f66d976722..c97126e9fe 100644
--- a/plugins/Quotes/src/QuotesProviderBase.cpp
+++ b/plugins/Quotes/src/QuotesProviderBase.cpp
@@ -3,172 +3,138 @@
 extern bool g_bAutoUpdate;

 extern HANDLE g_hEventWorkThreadStop;

 

-

 struct CQuotesProviderBase::CXMLFileInfo

 {

-	CXMLFileInfo() : m_qs(_T("Unknown")){}

+	CXMLFileInfo() : m_qs(_T("Unknown")) {}

 	IQuotesProvider::CProviderInfo m_pi;

 	CQuotesProviderBase::CQuoteSection m_qs;

 	tstring m_sURL;

 };

 

-namespace

+inline tstring get_ini_file_name(LPCTSTR pszFileName)

 {

-	inline tstring get_ini_file_name(LPCTSTR pszFileName)

-	{

-		return CreateFilePath(pszFileName);

-	}

+	return CreateFilePath(pszFileName);

+}

 

-	bool parse_quote(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuote& q)

-	{

-		tstring sSymbol;

-		tstring sDescription;

-		tstring sID;

-

-		size_t cChild = pTop->GetChildCount();

-		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()))

-			{

-				sSymbol = pNode->GetText();

-				if (true == sSymbol.empty())

-				{

-					return false;

-				}

-			}

-			else if (0 == quotes_stricmp(_T("description"), sName.c_str()))

-			{

-				sDescription = pNode->GetText();

-			}

-			else if (0 == quotes_stricmp(_T("id"), sName.c_str()))

-			{

-				sID = pNode->GetText();

-				if (true == sID.empty())

-				{

-					return false;

-				}

-			}

+bool parse_quote(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuote& q)

+{

+	tstring sSymbol;

+	tstring sDescription;

+	tstring sID;

+

+	size_t cChild = pTop->GetChildCount();

+	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())) {

+			sSymbol = pNode->GetText();

+			if (true == sSymbol.empty())

+				return false;

+		}

+		else if (0 == quotes_stricmp(_T("description"), sName.c_str())) {

+			sDescription = pNode->GetText();

+		}

+		else if (0 == quotes_stricmp(_T("id"), sName.c_str())) {

+			sID = pNode->GetText();

+			if (true == sID.empty())

+				return false;

 		}

-

-		q = CQuotesProviderBase::CQuote(sID, TranslateTS(sSymbol.c_str()), TranslateTS(sDescription.c_str()));

-		return true;

 	}

 

-	bool parse_section(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuoteSection& qs)

-	{

-		CQuotesProviderBase::CQuoteSection::TSections aSections;

-		CQuotesProviderBase::CQuoteSection::TQuotes aQuotes;

-		tstring sSectionName;

-

-		size_t cChild = pTop->GetChildCount();

-		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()))

-			{

-				CQuotesProviderBase::CQuoteSection qs1;

-				if (true == parse_section(pNode, qs1))

-					aSections.push_back(qs1);

-			}

-			else if (0 == quotes_stricmp(_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()))

-			{

-				sSectionName = pNode->GetText();

-				if (true == sSectionName.empty())

-					return false;

-			}

-		}

+	q = CQuotesProviderBase::CQuote(sID, TranslateTS(sSymbol.c_str()), TranslateTS(sDescription.c_str()));

+	return true;

+}

 

-		qs = CQuotesProviderBase::CQuoteSection(TranslateTS(sSectionName.c_str()), aSections, aQuotes);

-		return true;

+bool parse_section(const IXMLNode::TXMLNodePtr& pTop, CQuotesProviderBase::CQuoteSection& qs)

+{

+	CQuotesProviderBase::CQuoteSection::TSections aSections;

+	CQuotesProviderBase::CQuoteSection::TQuotes aQuotes;

+	tstring sSectionName;

+

+	size_t cChild = pTop->GetChildCount();

+	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())) {

+			CQuotesProviderBase::CQuoteSection qs1;

+			if (true == parse_section(pNode, qs1))

+				aSections.push_back(qs1);

+		}

+		else if (0 == quotes_stricmp(_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())) {

+			sSectionName = pNode->GetText();

+			if (true == sSectionName.empty())

+				return false;

+		}

 	}

 

-	IXMLNode::TXMLNodePtr find_provider(const IXMLNode::TXMLNodePtr& pRoot)

-	{

-		IXMLNode::TXMLNodePtr pProvider;

-		size_t cChild = pRoot->GetChildCount();

-		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()))

-			{

-				pProvider = pNode;

-				break;

-			}

-			else

-			{

-				pProvider = find_provider(pNode);

-				if (pProvider)

-				{

-					break;

-				}

-			}

+	qs = CQuotesProviderBase::CQuoteSection(TranslateTS(sSectionName.c_str()), aSections, aQuotes);

+	return true;

+}

+

+IXMLNode::TXMLNodePtr find_provider(const IXMLNode::TXMLNodePtr& pRoot)

+{

+	IXMLNode::TXMLNodePtr pProvider;

+	size_t cChild = pRoot->GetChildCount();

+	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())) {

+			pProvider = pNode;

+			break;

 		}

 

-		return pProvider;

+		pProvider = find_provider(pNode);

+		if (pProvider)

+			break;

 	}

 

-	CQuotesProviderBase::CXMLFileInfo parse_ini_file(const tstring& rsXMLFile, bool& rbSucceded)

-	{

-		CQuotesProviderBase::CXMLFileInfo res;

-		CQuotesProviderBase::CQuoteSection::TSections aSections;

-

-		const CModuleInfo::TXMLEnginePtr& pXMLEngine = CModuleInfo::GetXMLEnginePtr();

-		IXMLNode::TXMLNodePtr pRoot = pXMLEngine->LoadFile(rsXMLFile);

-		if (pRoot)

-		{

-			IXMLNode::TXMLNodePtr pProvider = find_provider(pRoot);

-			if (pProvider)

-			{

-				rbSucceded = true;

-				size_t cChild = pProvider->GetChildCount();

-				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()))

-					{

-						CQuotesProviderBase::CQuoteSection qs;

-						if (true == parse_section(pNode, qs))

-						{

-							aSections.push_back(qs);

-						}

-					}

-					else if (0 == quotes_stricmp(_T("Name"), sName.c_str()))

-					{

-						res.m_pi.m_sName = pNode->GetText();

-					}

-					else if (0 == quotes_stricmp(_T("ref"), sName.c_str()))

-					{

-						res.m_pi.m_sURL = pNode->GetText();

-					}

-					else if (0 == quotes_stricmp(_T("url"), sName.c_str()))

-					{

-						res.m_sURL = pNode->GetText();

-					}

+	return pProvider;

+}

+

+CQuotesProviderBase::CXMLFileInfo parse_ini_file(const tstring& rsXMLFile, bool& rbSucceded)

+{

+	CQuotesProviderBase::CXMLFileInfo res;

+	CQuotesProviderBase::CQuoteSection::TSections aSections;

+

+	const CModuleInfo::TXMLEnginePtr& pXMLEngine = CModuleInfo::GetXMLEnginePtr();

+	IXMLNode::TXMLNodePtr pRoot = pXMLEngine->LoadFile(rsXMLFile);

+	if (pRoot) {

+		IXMLNode::TXMLNodePtr pProvider = find_provider(pRoot);

+		if (pProvider) {

+			rbSucceded = true;

+			size_t cChild = pProvider->GetChildCount();

+			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())) {

+					CQuotesProviderBase::CQuoteSection qs;

+					if (true == parse_section(pNode, qs))

+						aSections.push_back(qs);

 				}

+				else if (0 == quotes_stricmp(_T("Name"), sName.c_str()))

+					res.m_pi.m_sName = pNode->GetText();

+				else if (0 == quotes_stricmp(_T("ref"), sName.c_str()))

+					res.m_pi.m_sURL = pNode->GetText();

+				else if (0 == quotes_stricmp(_T("url"), sName.c_str()))

+					res.m_sURL = pNode->GetText();

 			}

 		}

-

-		res.m_qs = CQuotesProviderBase::CQuoteSection(res.m_pi.m_sName, aSections);

-		return res;

 	}

 

-	CQuotesProviderBase::CXMLFileInfo init_xml_info(LPCTSTR pszFileName, bool& rbSucceded)

-	{

-		rbSucceded = false;

-		tstring sIniFile = get_ini_file_name(pszFileName);

-		return parse_ini_file(sIniFile, rbSucceded);

-	}

+	res.m_qs = CQuotesProviderBase::CQuoteSection(res.m_pi.m_sName, aSections);

+	return res;

+}

+

+CQuotesProviderBase::CXMLFileInfo init_xml_info(LPCTSTR pszFileName, bool& rbSucceded)

+{

+	rbSucceded = false;

+	tstring sIniFile = get_ini_file_name(pszFileName);

+	return parse_ini_file(sIniFile, rbSucceded);

 }

 

 CQuotesProviderBase::CQuotesProviderBase()

@@ -187,8 +153,7 @@ CQuotesProviderBase::~CQuotesProviderBase()
 bool CQuotesProviderBase::Init()

 {

 	bool bSucceded = m_pXMLInfo != NULL;

-	if (!m_pXMLInfo)

-	{

+	if (!m_pXMLInfo) {

 		CQuotesProviderVisitorDbSettings visitor;

 		Accept(visitor);

 		assert(visitor.m_pszXMLIniFileName);

@@ -246,426 +211,337 @@ void CQuotesProviderBase::DeleteContact(MCONTACT hContact)
 

 	TContracts::iterator i = std::find(m_aContacts.begin(), m_aContacts.end(), hContact);

 	if (i != m_aContacts.end())

-	{

 		m_aContacts.erase(i);

-	}

 }

 

 void CQuotesProviderBase::SetContactStatus(MCONTACT hContact, int nNewStatus)

 {

 	int nStatus = db_get_w(hContact, QUOTES_PROTOCOL_NAME, DB_STR_STATUS, ID_STATUS_OFFLINE);

-	if (nNewStatus != nStatus)

-	{

+	if (nNewStatus != nStatus) {

 		db_set_w(hContact, QUOTES_PROTOCOL_NAME, DB_STR_STATUS, nNewStatus);

 

-		if (ID_STATUS_ONLINE != nNewStatus)

-		{

+		if (ID_STATUS_ONLINE != nNewStatus) {

 			db_unset(hContact, LIST_MODULE_NAME, STATUS_MSG_NAME);

 			tstring sSymbol = Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_SYMBOL);

 			if (false == sSymbol.empty())

-			{

 				db_set_ts(hContact, LIST_MODULE_NAME, CONTACT_LIST_NAME, sSymbol.c_str());

-			}

 

 			SetContactExtraImage(hContact, eiEmpty);

 		}

 	}

 }

 

-namespace

+class CTendency

 {

-	class CTendency

+	enum { NumValues = 2 };

+	enum EComparison

 	{

-		enum{ NumValues = 2 };

-		enum EComparison

-		{

-			NonValid,

-			Greater,

-			Less,

-			Equal,

-			GreaterOrEqual,

-			LessOrEqual

-		};

-

-	public:

-		enum EResult

-		{

-			NotChanged,

-			Up,

-			Down

-		};

-

-	public:

-		CTendency() : m_nComparison(NonValid){}

-

-		bool Parse(const IQuotesProvider* pProvider, const tstring& rsFrmt, MCONTACT hContact)

-		{

-			m_abValueFlags[0] = false;

-			m_abValueFlags[1] = false;

-			m_nComparison = NonValid;

-			bool bValid = true;

-			int nCurValue = 0;

-			for (tstring::const_iterator i = rsFrmt.begin(); i != rsFrmt.end() && bValid && nCurValue < NumValues;)

-			{

-				TCHAR chr = *i;

-				switch (chr)

-				{

-				default:

-					if (false == std::isspace(chr))

-					{

-						bValid = false;

-					}

-					else

-					{

-						++i;

-					}

-					break;

-				case _T('%'):

-					++i;

-					if (i != rsFrmt.end())

-					{

-						TCHAR t = *i;

-						++i;

-						CQuotesProviderVisitorTendency visitor(hContact, t);

-						pProvider->Accept(visitor);

-						if (false == visitor.IsValid())

-						{

-							bValid = false;

-						}

-						else

-						{

-							double d = visitor.GetResult();

-							m_adValues[nCurValue] = d;

-							m_abValueFlags[nCurValue] = true;

-							++nCurValue;

-						}

-					}

-					else

-					{

-						bValid = false;

-					}

-					break;

-				case _T('>'):

-					m_nComparison = Greater;

-					++i;

-					break;

-				case _T('<'):

-					m_nComparison = Less;

-					++i;

-					break;

-				case _T('='):

-					switch (m_nComparison)

-					{

-					default:

-						bValid = false;

-						break;

-					case NonValid:

-						m_nComparison = Equal;

-						break;

-					case Greater:

-						m_nComparison = GreaterOrEqual;

-						break;

-					case Less:

-						m_nComparison = LessOrEqual;

-						break;

-					}

-					++i;

-					break;

-				}

-			}

+		NonValid,

+		Greater,

+		Less,

+		Equal,

+		GreaterOrEqual,

+		LessOrEqual

+	};

 

-			return (bValid && IsValid());

-		}

+public:

+	enum EResult

+	{

+		NotChanged,

+		Up,

+		Down

+	};

 

-		bool IsValid()const{ return (m_abValueFlags[0] && m_abValueFlags[1] && (m_nComparison != NonValid)); }

+public:

+	CTendency() : m_nComparison(NonValid) {}

 

-		EResult Compare()const

-		{

-			switch (m_nComparison)

-			{

-			case Greater:

-				if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

-				{

-					return NotChanged;

-				}

-				else if (m_adValues[0] > m_adValues[1])

-				{

-					return Up;

-				}

-				else //if(m_adValues[0] < m_adValues[1])

-				{

-					return Down;

-				}

+	bool Parse(const IQuotesProvider* pProvider, const tstring& rsFrmt, MCONTACT hContact)

+	{

+		m_abValueFlags[0] = false;

+		m_abValueFlags[1] = false;

+		m_nComparison = NonValid;

+		bool bValid = true;

+		int nCurValue = 0;

+		for (tstring::const_iterator i = rsFrmt.begin(); i != rsFrmt.end() && bValid && nCurValue < NumValues;) {

+			TCHAR chr = *i;

+			switch (chr) {

+			default:

+				if (false == std::isspace(chr))

+					bValid = false;

+				else 

+					++i;

 				break;

-			case GreaterOrEqual:

-				if ((true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

-					|| (m_adValues[0] > m_adValues[1]))

-				{

-					return Up;

-				}

-				else //if(m_adValues[0] < m_adValues[1])

-				{

-					return Down;

+

+			case _T('%'):

+				++i;

+				if (i != rsFrmt.end()) {

+					TCHAR t = *i;

+					++i;

+					CQuotesProviderVisitorTendency visitor(hContact, t);

+					pProvider->Accept(visitor);

+					if (false == visitor.IsValid()) {

+						bValid = false;

+					}

+					else {

+						double d = visitor.GetResult();

+						m_adValues[nCurValue] = d;

+						m_abValueFlags[nCurValue] = true;

+						++nCurValue;

+					}

 				}

+				else bValid = false;

 				break;

-			case Less:

-				if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

-				{

-					return NotChanged;

-				}

-				else if (m_adValues[0] < m_adValues[1])

-				{

-					return Up;

-				}

-				else //if(m_adValues[0] > m_adValues[1])

-				{

-					return Down;

-				}

+			case _T('>'):

+				m_nComparison = Greater;

+				++i;

 				break;

-			case LessOrEqual:

-				if ((true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

-					|| (m_adValues[0] < m_adValues[1]))

-				{

-					return Up;

-				}

-				else //if(m_adValues[0] > m_adValues[1])

-				{

-					return Down;

-				}

+			case _T('<'):

+				m_nComparison = Less;

+				++i;

 				break;

-			case Equal:

-				if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

-				{

-					return Up;

-				}

-				else

-				{

-					return Down;

+			case _T('='):

+				switch (m_nComparison) {

+				default:

+					bValid = false;

+					break;

+				case NonValid:

+					m_nComparison = Equal;

+					break;

+				case Greater:

+					m_nComparison = GreaterOrEqual;

+					break;

+				case Less:

+					m_nComparison = LessOrEqual;

+					break;

 				}

+				++i;

 				break;

 			}

-			return NotChanged;

 		}

 

-	private:

-		double m_adValues[NumValues];

-		bool m_abValueFlags[NumValues];

-		EComparison m_nComparison;

-	};

+		return (bValid && IsValid());

+	}

 

-	tstring format_rate(const IQuotesProvider* pProvider,

-		MCONTACT hContact,

-		const tstring& rsFrmt)

+	bool IsValid()const { return (m_abValueFlags[0] && m_abValueFlags[1] && (m_nComparison != NonValid)); }

+

+	EResult Compare()const

 	{

-		tstring sResult;

+		switch (m_nComparison) {

+		case Greater:

+			if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

+				return NotChanged;

+

+			if (m_adValues[0] > m_adValues[1])

+				return Up;

+			return Down;

+

+		case GreaterOrEqual:

+			if ((true == IsWithinAccuracy(m_adValues[0], m_adValues[1])) || (m_adValues[0] > m_adValues[1]))

+				return Up;

+			return Down;

+

+		case Less:

+			if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

+				return NotChanged;

+

+			if (m_adValues[0] < m_adValues[1])

+				return Up;

+			return Down;

+

+		case LessOrEqual:

+			if ((true == IsWithinAccuracy(m_adValues[0], m_adValues[1])) || (m_adValues[0] < m_adValues[1]))

+				return Up;

+			return Down;

+

+		case Equal:

+			if (true == IsWithinAccuracy(m_adValues[0], m_adValues[1]))

+				return Up;

+			return Down;

+		}

+		return NotChanged;

+	}

 

-		for (tstring::const_iterator i = rsFrmt.begin(); i != rsFrmt.end();)

-		{

-			TCHAR chr = *i;

-			switch (chr)

-			{

-			default:

-				sResult += chr;

-				++i;

-				break;

-			case _T('\\'):

-				++i;

-				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;

-					default:sResult += chr; sResult += t; break;

-					}

-					++i;

-				}

-				else

-				{

-					sResult += chr;

+private:

+	double m_adValues[NumValues];

+	bool m_abValueFlags[NumValues];

+	EComparison m_nComparison;

+};

+

+tstring format_rate(const IQuotesProvider *pProvider, MCONTACT hContact, const tstring &rsFrmt)

+{

+	tstring sResult;

+

+	for (tstring::const_iterator i = rsFrmt.begin(); i != rsFrmt.end();) {

+		TCHAR chr = *i;

+		switch (chr) {

+		default:

+			sResult += chr;

+			++i;

+			break;

+		

+		case _T('\\'):

+			++i;

+			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;

+					default:       sResult += chr; sResult += t; break;

 				}

-				break;

-			case _T('%'):

 				++i;

-				if (i != rsFrmt.end())

-				{

-					chr = *i;

-

-					byte nWidth = 0;

-					if (::isdigit(chr))

-					{

-						nWidth = chr - 0x30;

-						++i;

-						if (i == rsFrmt.end())

-						{

-							sResult += chr;

-							break;

-						}

-						else

-						{

-							chr = *i;

-						}

-					}

+			}

+			else sResult += chr;

+			break;

 

-					CQuotesProviderVisitorFormater visitor(hContact, chr, nWidth);

-					pProvider->Accept(visitor);

-					const tstring& s = visitor.GetResult();

-					sResult += s;

+		case _T('%'):

+			++i;

+			if (i != rsFrmt.end()) {

+				chr = *i;

+

+				byte nWidth = 0;

+				if (::isdigit(chr)) {

+					nWidth = chr - 0x30;

 					++i;

+					if (i == rsFrmt.end()) {

+						sResult += chr;

+						break;

+					}

+					else chr = *i;

 				}

-				else

-				{

-					sResult += chr;

-				}

-				break;

+

+				CQuotesProviderVisitorFormater visitor(hContact, chr, nWidth);

+				pProvider->Accept(visitor);

+				const tstring& s = visitor.GetResult();

+				sResult += s;

+				++i;

 			}

+			else sResult += chr;

+			break;

 		}

-

-		return sResult;

 	}

 

-	void log_to_file(const IQuotesProvider* pProvider,

-		MCONTACT hContact,

-		const tstring& rsLogFileName,

-		const tstring& rsFormat)

-	{

-		// 		USES_CONVERSION;

-		// 		const char* pszPath = CT2A(rsLogFileName.c_str());

-		std::string sPath = quotes_t2a(rsLogFileName.c_str());

-

-		std::string::size_type n = sPath.find_last_of("\\/");

-		if (std::string::npos != n)

-		{

-			sPath.erase(n);

-		}

-		DWORD dwAttributes = ::GetFileAttributesA(sPath.c_str());

-		if ((0xffffffff == dwAttributes) || (0 == (dwAttributes&FILE_ATTRIBUTE_DIRECTORY)))

-			CreateDirectoryTree(sPath.c_str());

-

-		tofstream file(rsLogFileName.c_str(), std::ios::app | std::ios::out);

-		file.imbue(GetSystemLocale());

-		if (file.good())

-		{

-			tstring s = format_rate(pProvider, hContact, rsFormat);

-			file << s;

-		}

-	}

+	return sResult;

+}

 

-	void log_to_history(const IQuotesProvider* pProvider,

-		MCONTACT hContact,

-		time_t nTime,

-		const tstring& rsFormat)

-	{

+void log_to_file(const IQuotesProvider* pProvider,

+	MCONTACT hContact,

+	const tstring& rsLogFileName,

+	const tstring& rsFormat)

+{

+	std::string sPath = quotes_t2a(rsLogFileName.c_str());

+

+	std::string::size_type n = sPath.find_last_of("\\/");

+	if (std::string::npos != n)

+		sPath.erase(n);

+

+	DWORD dwAttributes = ::GetFileAttributesA(sPath.c_str());

+	if ((0xffffffff == dwAttributes) || (0 == (dwAttributes&FILE_ATTRIBUTE_DIRECTORY)))

+		CreateDirectoryTree(sPath.c_str());

+

+	tofstream file(rsLogFileName.c_str(), std::ios::app | std::ios::out);

+	file.imbue(GetSystemLocale());

+	if (file.good()) {

 		tstring s = format_rate(pProvider, hContact, rsFormat);

-		T2Utf psz(s.c_str());

-

-		DBEVENTINFO dbei = { sizeof(dbei) };

-		dbei.szModule = QUOTES_PROTOCOL_NAME;

-		dbei.timestamp = static_cast<DWORD>(nTime);

-		dbei.flags = DBEF_READ | DBEF_UTF;

-		dbei.eventType = EVENTTYPE_MESSAGE;

-		dbei.cbBlob = (int)::mir_strlen(psz) + 1;

-		dbei.pBlob = (PBYTE)(char*)psz;

-		db_event_add(hContact, &dbei);

+		file << s;

 	}

+}

 

-	bool do_set_contact_extra_icon(MCONTACT hContact, const CTendency& tendency)

-	{

-		CTendency::EResult nComparison = tendency.Compare();

+void log_to_history(const IQuotesProvider* pProvider,

+	MCONTACT hContact,

+	time_t nTime,

+	const tstring& rsFormat)

+{

+	tstring s = format_rate(pProvider, hContact, rsFormat);

+	T2Utf psz(s.c_str());

+

+	DBEVENTINFO dbei = { sizeof(dbei) };

+	dbei.szModule = QUOTES_PROTOCOL_NAME;

+	dbei.timestamp = static_cast<DWORD>(nTime);

+	dbei.flags = DBEF_READ | DBEF_UTF;

+	dbei.eventType = EVENTTYPE_MESSAGE;

+	dbei.cbBlob = (int)::mir_strlen(psz) + 1;

+	dbei.pBlob = (PBYTE)(char*)psz;

+	db_event_add(hContact, &dbei);

+}

 

-		//if(true == IsWithinAccuracy(dCurrRate,dPrevRate))

-		if (CTendency::NotChanged == nComparison)

-			return SetContactExtraImage(hContact, eiNotChanged);

+bool do_set_contact_extra_icon(MCONTACT hContact, const CTendency& tendency)

+{

+	CTendency::EResult nComparison = tendency.Compare();

 

-		if (CTendency::Up == nComparison)//(dCurrRate > dPrevRate)

-			return SetContactExtraImage(hContact, eiUp);

+	if (CTendency::NotChanged == nComparison)

+		return SetContactExtraImage(hContact, eiNotChanged);

 

-		if (CTendency::Down == nComparison)//(dCurrRate < dPrevRate)

-			return SetContactExtraImage(hContact, eiDown);

+	if (CTendency::Up == nComparison)

+		return SetContactExtraImage(hContact, eiUp);

 

-		return false;

-	}

+	if (CTendency::Down == nComparison)

+		return SetContactExtraImage(hContact, eiDown);

 

-	bool show_popup(const IQuotesProvider* pProvider,

-		MCONTACT hContact,

-		const CTendency& tendency,

-		const tstring& rsFormat,

-		const CPopupSettings& ps)

-	{

-		if (1 == ServiceExists(MS_POPUP_ADDPOPUPT))

-		{

-			POPUPDATAT ppd;

-			memset(&ppd, 0, sizeof(ppd));

-			ppd.lchContact = hContact;

-			//if((true == bValidPrevRate))

-			if (tendency.IsValid())

-			{

-				CTendency::EResult nComparison = tendency.Compare();

-				if (CTendency::NotChanged == nComparison)//(true == IsWithinAccuracy(dRate,dPrevRate))

-				{

-					ppd.lchIcon = Quotes_LoadIconEx(ICON_STR_QUOTE_NOT_CHANGED);

-				}

-				else if (CTendency::Up == nComparison)//(dRate > dPrevRate)

-				{

-					ppd.lchIcon = Quotes_LoadIconEx(ICON_STR_QUOTE_UP);

-				}

-				else if (CTendency::Down == nComparison)

-				{

-					ppd.lchIcon = Quotes_LoadIconEx(ICON_STR_QUOTE_DOWN);

-				}

-			}

+	return false;

+}

 

-			CQuotesProviderVisitorFormater visitor(hContact, _T('s'), 0);

-			pProvider->Accept(visitor);

-			const tstring& sTitle = visitor.GetResult();

-			mir_tstrncpy(ppd.lptzContactName, sTitle.c_str(), MAX_CONTACTNAME);

+bool show_popup(const IQuotesProvider* pProvider,

+	MCONTACT hContact,

+	const CTendency& tendency,

+	const tstring& rsFormat,

+	const CPopupSettings& ps)

+{

+	if (!ServiceExists(MS_POPUP_ADDPOPUPT))

+		return false;

 

-			mir_safe_string<TCHAR> 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);

+	POPUPDATAT ppd;

+	memset(&ppd, 0, sizeof(ppd));

+	ppd.lchContact = hContact;

 

-			if (CPopupSettings::colourDefault == ps.GetColourMode())

-			{

-				ppd.colorText = CPopupSettings::GetDefColourText();

-				ppd.colorBack = CPopupSettings::GetDefColourBk();

-			}

-			else

-			{

-				ppd.colorText = ps.GetColourText();

-				ppd.colorBack = ps.GetColourBk();

-			}

+	if (tendency.IsValid()) {

+		CTendency::EResult nComparison = tendency.Compare();

+		if (CTendency::NotChanged == nComparison)

+			ppd.lchIcon = Quotes_LoadIconEx(IDI_ICON_NOTCHANGED);

+		else if (CTendency::Up == nComparison)

+			ppd.lchIcon = Quotes_LoadIconEx(IDI_ICON_UP);

+		else if (CTendency::Down == nComparison)

+			ppd.lchIcon = Quotes_LoadIconEx(IDI_ICON_DOWN);

+	}

 

-			switch (ps.GetDelayMode())

-			{

-			default:

-				assert(!"Unknown popup delay mode");

-			case CPopupSettings::delayFromPopup:

-				ppd.iSeconds = 0;

-				break;

-			case CPopupSettings::delayPermanent:

-				ppd.iSeconds = -1;

-				break;

-			case CPopupSettings::delayCustom:

-				ppd.iSeconds = ps.GetDelayTimeout();

-				break;

-			}

+	CQuotesProviderVisitorFormater visitor(hContact, _T('s'), 0);

+	pProvider->Accept(visitor);

+	const tstring& sTitle = visitor.GetResult();

+	mir_tstrncpy(ppd.lptzContactName, sTitle.c_str(), MAX_CONTACTNAME);

 

-			LPARAM lp = 0;

-			if (false == ps.GetHistoryFlag())

-			{

-				lp |= 0x08;

-			}

+	mir_safe_string<TCHAR> 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);

 

-			return (0 == CallService(MS_POPUP_ADDPOPUPT, reinterpret_cast<WPARAM>(&ppd), lp));

-		}

-		else

-		{

-			return false;

-		}

+	if (CPopupSettings::colourDefault == ps.GetColourMode()) {

+		ppd.colorText = CPopupSettings::GetDefColourText();

+		ppd.colorBack = CPopupSettings::GetDefColourBk();

+	}

+	else {

+		ppd.colorText = ps.GetColourText();

+		ppd.colorBack = ps.GetColourBk();

+	}

+

+	switch (ps.GetDelayMode()) {

+	default:

+		assert(!"Unknown popup delay mode");

+	case CPopupSettings::delayFromPopup:

+		ppd.iSeconds = 0;

+		break;

+	case CPopupSettings::delayPermanent:

+		ppd.iSeconds = -1;

+		break;

+	case CPopupSettings::delayCustom:

+		ppd.iSeconds = ps.GetDelayTimeout();

+		break;

 	}

+

+	LPARAM lp = 0;

+	if (false == ps.GetHistoryFlag())

+		lp |= 0x08;

+

+	return (0 == CallService(MS_POPUP_ADDPOPUPT, reinterpret_cast<WPARAM>(&ppd), lp));

 }

 

 void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, const tstring& rsSymbol/* = ""*/)

@@ -673,16 +549,12 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 	time_t nTime = ::time(NULL);

 

 	if (false == rsSymbol.empty())

-	{

 		db_set_ts(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_SYMBOL, rsSymbol.c_str());

-	}

 

 	double dPrev = 0.0;

 	bool bValidPrev = Quotes_DBReadDouble(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_CURR_VALUE, dPrev);

 	if (true == bValidPrev)

-	{

 		Quotes_DBWriteDouble(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_PREV_VALUE, dPrev);

-	}

 

 	Quotes_DBWriteDouble(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_CURR_VALUE, dRate);

 	db_set_dw(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_FETCH_TIME, nTime);

@@ -691,17 +563,14 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 

 	tostringstream oNick;

 	oNick.imbue(GetSystemLocale());

-	if (false == m_sContactListFormat.empty())

-	{

+	if (false == m_sContactListFormat.empty()) {

 		tstring s = format_rate(this, hContact, m_sContactListFormat);

 		oNick << s;

 	}

-	else

-	{

+	else {

 		if (true == sSymbol.empty())

-		{

 			sSymbol = Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_SYMBOL);

-		}

+

 		oNick << std::setfill(_T(' ')) << std::setw(10) << std::left << sSymbol << std::setw(6) << std::right << dRate;

 	}

 	CTendency tendency;

@@ -713,13 +582,9 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 

 	tstring sStatusMsg = format_rate(this, hContact, m_sStatusMsgFormat);

 	if (false == sStatusMsg.empty())

-	{

 		db_set_ts(hContact, LIST_MODULE_NAME, STATUS_MSG_NAME, sStatusMsg.c_str());

-	}

 	else

-	{

 		db_unset(hContact, LIST_MODULE_NAME, STATUS_MSG_NAME);

-	}

 

 	bool bUseContactSpecific = (db_get_b(hContact, QUOTES_PROTOCOL_NAME, DB_STR_CONTACT_SPEC_SETTINGS, 0) > 0);

 

@@ -728,32 +593,27 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 	WORD dwMode = (bUseContactSpecific)

 		? db_get_w(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_LOG, static_cast<WORD>(lmDisabled))

 		: global_settings.GetLogMode();

-	if (dwMode&lmExternalFile)

-	{

+	if (dwMode&lmExternalFile) {

 		bool bAdd = true;

 		bool bOnlyIfChanged = (bUseContactSpecific)

 			? (db_get_w(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_LOG_FILE_CONDITION, 1) > 0)

 			: global_settings.GetLogOnlyChangedFlag();

-		if (true == bOnlyIfChanged)

-		{

+		if (true == bOnlyIfChanged) {

 			bAdd = ((false == bValidPrev) || (false == IsWithinAccuracy(dRate, dPrev)));

 		}

-		if (true == bAdd)

-		{

+		if (true == bAdd) {

 			tstring sLogFileName = (bUseContactSpecific)

 				? Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_LOG_FILE, global_settings.GetLogFileName().c_str())

 				: global_settings.GetLogFileName();

 

-			if (true == sSymbol.empty())

-			{

+			if (true == sSymbol.empty()) {

 				sSymbol = Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_SYMBOL);

 			}

 

 			sLogFileName = GenerateLogFileName(sLogFileName, sSymbol);

 

 			tstring sFormat = global_settings.GetLogFormat();

-			if (bUseContactSpecific)

-			{

+			if (bUseContactSpecific) {

 				CQuotesProviderVisitorDbSettings visitor;

 				Accept(visitor);

 				sFormat = Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_FORMAT_LOG_FILE, visitor.m_pszDefLogFileFormat);

@@ -762,19 +622,16 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 			log_to_file(this, hContact, sLogFileName, sFormat);

 		}

 	}

-	if (dwMode&lmInternalHistory)

-	{

+	if (dwMode&lmInternalHistory) {

 		bool bAdd = true;

 		bool bOnlyIfChanged = (bUseContactSpecific)

 			? (db_get_w(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_HISTORY_CONDITION, 1) > 0)

 			: global_settings.GetHistoryOnlyChangedFlag();

 

-		if (true == bOnlyIfChanged)

-		{

+		if (true == bOnlyIfChanged) {

 			bAdd = ((false == bValidPrev) || (false == IsWithinAccuracy(dRate, dPrev)));

 		}

-		if (true == bAdd)

-		{

+		if (true == bAdd) {

 			tstring sFormat = (bUseContactSpecific)

 				? Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_FORMAT_HISTORY, global_settings.GetHistoryFormat().c_str())

 				: global_settings.GetHistoryFormat();

@@ -783,14 +640,12 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 		}

 	}

 

-	if (dwMode&lmPopup)

-	{

+	if (dwMode&lmPopup) {

 		bool bOnlyIfChanged = (bUseContactSpecific)

 			? (1 == db_get_b(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_POPUP_CONDITION, 1) > 0)

 			: global_settings.GetShowPopupIfValueChangedFlag();

 		if ((false == bOnlyIfChanged)

-			|| ((true == bOnlyIfChanged) && (true == bValidPrev) && (false == IsWithinAccuracy(dRate, dPrev))))

-		{

+			|| ((true == bOnlyIfChanged) && (true == bValidPrev) && (false == IsWithinAccuracy(dRate, dPrev)))) {

 			tstring sFormat = (bUseContactSpecific)

 				? Quotes_DBGetStringT(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_FORMAT_POPUP, global_settings.GetPopupFormat().c_str())

 				: global_settings.GetPopupFormat();

@@ -801,11 +656,7 @@ void CQuotesProviderBase::WriteContactRate(MCONTACT hContact, double dRate, cons
 		}

 	}

 

-

-	// 	if((true == IsOnline()))

-	{

-		SetContactStatus(hContact, ID_STATUS_ONLINE);

-	}

+	SetContactStatus(hContact, ID_STATUS_ONLINE);

 }

 

 MCONTACT CQuotesProviderBase::CreateNewContact(const tstring& rsName)

@@ -830,67 +681,53 @@ MCONTACT CQuotesProviderBase::CreateNewContact(const tstring& rsName)
 	return hContact;

 }

 

-namespace

+DWORD get_refresh_timeout_miliseconds(const CQuotesProviderVisitorDbSettings& visitor)

 {

-	DWORD get_refresh_timeout_miliseconds(const CQuotesProviderVisitorDbSettings& visitor)

-	{

-		if (!g_bAutoUpdate)

-		{

-			return INFINITE;

-		}

+	if (!g_bAutoUpdate)

+		return INFINITE;

 

-		assert(visitor.m_pszDbRefreshRateType);

-		assert(visitor.m_pszDbRefreshRateValue);

+	assert(visitor.m_pszDbRefreshRateType);

+	assert(visitor.m_pszDbRefreshRateValue);

 

-		int nRefreshRateType = db_get_w(NULL, QUOTES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES);

-		if (nRefreshRateType < RRT_SECONDS || nRefreshRateType > RRT_HOURS)

-		{

-			nRefreshRateType = RRT_MINUTES;

-		}

+	int nRefreshRateType = db_get_w(NULL, QUOTES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES);

+	if (nRefreshRateType < RRT_SECONDS || nRefreshRateType > RRT_HOURS)

+		nRefreshRateType = RRT_MINUTES;

 

-		DWORD nTimeout = db_get_w(NULL, QUOTES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1);

-		switch (nRefreshRateType)

-		{

-		default:

-		case RRT_SECONDS:

-			if (nTimeout < 1 || nTimeout > 60)

-			{

-				nTimeout = 1;

-			}

-			nTimeout *= 1000;

-			break;

-		case RRT_MINUTES:

-			if (nTimeout < 1 || nTimeout > 60)

-			{

-				nTimeout = 1;

-			}

-			nTimeout *= 1000 * 60;

-			break;

-		case RRT_HOURS:

-			if (nTimeout < 1 || nTimeout > 24)

-			{

-				nTimeout = 1;

-			}

-			nTimeout *= 1000 * 60 * 60;

-			break;

-		}

+	DWORD nTimeout = db_get_w(NULL, QUOTES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1);

+	switch (nRefreshRateType) {

+	default:

+	case RRT_SECONDS:

+		if (nTimeout < 1 || nTimeout > 60)

+			nTimeout = 1;

 

-		return nTimeout;

+		nTimeout *= 1000;

+		break;

+	case RRT_MINUTES:

+		if (nTimeout < 1 || nTimeout > 60)

+			nTimeout = 1;

+

+		nTimeout *= 1000 * 60;

+		break;

+	case RRT_HOURS:

+		if (nTimeout < 1 || nTimeout > 24)

+			nTimeout = 1;

+

+		nTimeout *= 1000 * 60 * 60;

+		break;

 	}

+

+	return nTimeout;

 }

 

-namespace

+class CBoolGuard

 {

-	class CBoolGuard

-	{

-	public:

-		CBoolGuard(bool& rb) : m_b(rb){ m_b = true; }

-		~CBoolGuard(){ m_b = false; }

+public:

+	CBoolGuard(bool& rb) : m_b(rb) { m_b = true; }

+	~CBoolGuard() { m_b = false; }

 

-	private:

-		bool m_b;

-	};

-}

+private:

+	bool m_b;

+};

 

 void CQuotesProviderBase::Run()

 {

@@ -902,7 +739,8 @@ void CQuotesProviderBase::Run()
 	m_sStatusMsgFormat = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbStatusMsgFormat, visitor.m_pszDefStatusMsgFormat);

 	m_sTendencyFormat = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbTendencyFormat, visitor.m_pszDefTendencyFormat);

 

-	enum{

+	enum

+	{

 		STOP_THREAD = 0,

 		SETTINGS_CHANGED = 1,

 		REFRESH_CONTACT = 2,

@@ -922,49 +760,47 @@ void CQuotesProviderBase::Run()
 

 	bool bGoToBed = false;

 

-	if (g_bAutoUpdate)

-	{

+	if (g_bAutoUpdate) {

 		CBoolGuard bg(m_bRefreshInProgress);

 		RefreshQuotes(anContacts);

 	}

 

-	while (false == bGoToBed)

-	{

+	while (false == bGoToBed) {

 		anContacts.clear();

 

 		DWORD dwBegin = ::GetTickCount();

 		DWORD dwResult = ::WaitForMultipleObjects(COUNT_SYNC_OBJECTS, anEvents, FALSE, nTimeout);

-		switch (dwResult)

-		{

+		switch (dwResult) {

 		case WAIT_FAILED:

 			assert(!"WaitForMultipleObjects failed");

 			bGoToBed = true;

 			break;

+

 		case WAIT_ABANDONED_0 + STOP_THREAD:

 		case WAIT_ABANDONED_0 + SETTINGS_CHANGED:

 		case WAIT_ABANDONED_0 + REFRESH_CONTACT:

 			assert(!"WaitForMultipleObjects abandoned");

+

 		case WAIT_OBJECT_0 + STOP_THREAD:

 			bGoToBed = true;

 			break;

+

 		case WAIT_OBJECT_0 + SETTINGS_CHANGED:

 			nTimeout = get_refresh_timeout_miliseconds(visitor);

 			m_sContactListFormat = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbDisplayNameFormat, visitor.m_pszDefDisplayFormat);

 			m_sStatusMsgFormat = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbStatusMsgFormat, visitor.m_pszDefStatusMsgFormat);

 			m_sTendencyFormat = Quotes_DBGetStringT(NULL, QUOTES_PROTOCOL_NAME, visitor.m_pszDbTendencyFormat, visitor.m_pszDefTendencyFormat);

-

 			{

 				mir_cslock lck(m_cs);

 				anContacts = m_aContacts;

 			}

 			break;

 		case WAIT_OBJECT_0 + REFRESH_CONTACT:

-		{

-			DWORD dwTimeRest = ::GetTickCount() - dwBegin;

-			if (INFINITE != nTimeout && dwTimeRest < nTimeout)

 			{

-				nTimeout -= dwTimeRest;

-			}

+				DWORD dwTimeRest = ::GetTickCount() - dwBegin;

+				if (INFINITE != nTimeout && dwTimeRest < nTimeout) {

+					nTimeout -= dwTimeRest;

+				}

 

 				{

 					mir_cslock lck(m_cs);

@@ -976,8 +812,8 @@ void CQuotesProviderBase::Run()
 					CBoolGuard bg(m_bRefreshInProgress);

 					RefreshQuotes(anContacts);

 				}

-		}

-		break;

+			}

+			break;

 		case WAIT_TIMEOUT:

 			nTimeout = get_refresh_timeout_miliseconds(visitor);

 			{

@@ -989,6 +825,7 @@ void CQuotesProviderBase::Run()
 				RefreshQuotes(anContacts);

 			}

 			break;

+

 		default:

 			assert(!"What is the hell?");

 		}

@@ -1000,7 +837,7 @@ void CQuotesProviderBase::Run()
 void CQuotesProviderBase::OnEndRun()

 {

 	TContracts anContacts;

-	{// for CCritSection

+	{

 		mir_cslock lck(m_cs);

 		anContacts = m_aContacts;

 		m_aRefreshingContacts.clear();

@@ -1010,7 +847,7 @@ void CQuotesProviderBase::OnEndRun()
 	std::for_each(anContacts.begin(), anContacts.end(), boost::bind(&SetContactStatus, _1, ID_STATUS_OFFLINE));

 }

 

-void CQuotesProviderBase::Accept(CQuotesProviderVisitor& visitor)const

+void CQuotesProviderBase::Accept(CQuotesProviderVisitor &visitor)const

 {

 	visitor.Visit(*this);

 }

@@ -1026,7 +863,7 @@ void CQuotesProviderBase::RefreshAllContacts()
 	{// for CCritSection

 		mir_cslock lck(m_cs);

 		m_aRefreshingContacts.clear();

-		std::for_each(std::begin(m_aContacts), std::end(m_aContacts), [&](MCONTACT hContact){m_aRefreshingContacts.push_back(hContact); });

+		std::for_each(std::begin(m_aContacts), std::end(m_aContacts), [&](MCONTACT hContact) { m_aRefreshingContacts.push_back(hContact); });

 	}

 

 	BOOL b = ::SetEvent(m_hEventRefreshContact);

@@ -1043,32 +880,3 @@ void CQuotesProviderBase::RefreshContact(MCONTACT hContact)
 	BOOL b = ::SetEvent(m_hEventRefreshContact);

 	assert(b && "Failed to set event");

 }

-

-// void CQuotesProviderBase::SetContactExtraIcon(MCONTACT hContact)const

-// {

-// // 	tstring s = DBGetStringT(hContact,LIST_MODULE_NAME,CONTACT_LIST_NAME);

-// // 	tostringstream o;

-// // 	o << "Request on " << s << " refreshing\nIs online " << IsOnline() << ", is in progress " << m_bRefreshInProgress << "\n";

-// 

-// 	bool bResult = false;

-// 	if(/*true == IsOnline() && */(false == m_bRefreshInProgress))

-// 	{

-// 		CTendency tendency;

-// 		if(tendency.Parse(this,m_sTendencyFormat,hContact) && (false == m_bRefreshInProgress))

-// 		{

-// 			bResult = do_set_contact_extra_icon(hContact,tendency);

-// 		}

-// // 		double dCurrRate = 0.0;

-// // 		double dPrevRate = 0.0;

-// // 		if((true == Quotes_DBReadDouble(hContact,QUOTES_PROTOCOL_NAME,DB_STR_QUOTE_CURR_VALUE,dCurrRate))

-// // 			&& (true == Quotes_DBReadDouble(hContact,QUOTES_PROTOCOL_NAME,DB_STR_QUOTE_PREV_VALUE,dPrevRate))

-// // 			&& (false == m_bRefreshInProgress))

-// // 		{

-// // // 			o << "Curr rate = " << dCurrRate << ", prev rate " << dPrevRate << "\n";

-// // 			bResult = do_set_contact_extra_icon(hContact,dCurrRate,dPrevRate);

-// // 		}

-// 	}

-// 

-// // 	o << "Result is " << bResult;

-// // 	LogIt(Info,o.str());

-// }