Quotes: changed warning level to w4

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

1 files changed, 199 insertions, 199 deletions

diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index 6a01feb58f..ec5e9d44c3 100644
--- a/plugins/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
@@ -28,16 +28,16 @@ namespace
 	struct mir_safety_dbvar

 	{

 		mir_safety_dbvar(DBVARIANT* p) : m_p(p){}

-		~mir_safety_dbvar(){db_free(m_p);}

+		~mir_safety_dbvar(){ db_free(m_p); }

 		DBVARIANT* m_p;

 	};

 

-	static int enum_contact_settings(const char* szSetting,LPARAM lp)

+	static int enum_contact_settings(const char* szSetting, LPARAM lp)

 	{

 		CEnumContext* ctx = reinterpret_cast<CEnumContext*>(lp);

 

 		DBVARIANT dbv;

-		if(0 == db_get(ctx->m_hContact, ctx->m_pszModule, szSetting, &dbv))

+		if (0 == db_get(ctx->m_hContact, ctx->m_pszModule, szSetting, &dbv))

 		{

 			mir_safety_dbvar sdbvar(&dbv);

 

@@ -45,7 +45,7 @@ namespace
 			tostringstream sValue;

 			sValue.imbue(GetSystemLocale());

 

-			switch(dbv.type)

+			switch (dbv.type)

 			{

 			case DBVT_BYTE:

 				sValue << dbv.bVal;

@@ -61,40 +61,40 @@ namespace
 				break;

 			case DBVT_ASCIIZ:

 				sType = g_pszXmlTypeAsciiz;

-				if(dbv.pszVal)

+				if (dbv.pszVal)

 				{

 					sValue << dbv.pszVal;

-// 					mir_safe_string<char> mss(mir_utf8encode(dbv.pszVal));

-// 					if(mss.m_p)

-// 					{

-// 						sValue << mss.m_p;

-// 					}

+					// 					mir_safe_string<char> mss(mir_utf8encode(dbv.pszVal));

+					// 					if(mss.m_p)

+					// 					{

+					// 						sValue << mss.m_p;

+					// 					}

 				}

 				break;

 			case DBVT_WCHAR:

 				sType = g_pszXmlTypeWchar;

-				if(dbv.pwszVal)

+				if (dbv.pwszVal)

 				{

 					sValue << dbv.pwszVal;

-// 					mir_safe_string<char> mss(mir_utf8encodeW(dbv.pwszVal));

-// 					if(mss.m_p)

-// 					{

-// 						sValue << mss.m_p;

-// 					}

+					// 					mir_safe_string<char> mss(mir_utf8encodeW(dbv.pwszVal));

+					// 					if(mss.m_p)

+					// 					{

+					// 						sValue << mss.m_p;

+					// 					}

 				}

 				break;

 			case DBVT_UTF8:

 				sType = g_pszXmlTypeUtf8;

-				if(dbv.pszVal)

+				if (dbv.pszVal)

 				{

 					sValue << dbv.pszVal;

 				}

 				break;

 			case DBVT_BLOB:

 				sType = g_pszXmlTypeBlob;

-				if(dbv.pbVal)

+				if (dbv.pbVal)

 				{

-					ptrA buf( mir_base64_encode(dbv.pbVal, dbv.cpbVal));

+					ptrA buf(mir_base64_encode(dbv.pbVal, dbv.cpbVal));

 					if (buf) {

 						sValue << buf;

 					}

@@ -102,18 +102,18 @@ namespace
 				break;

 			}

 

-// 			mir_safe_string<char> mssSetting(mir_utf8encode(szSetting));

-// 			if(mssSetting.m_p)

+			// 			mir_safe_string<char> mssSetting(mir_utf8encode(szSetting));

+			// 			if(mssSetting.m_p)

 			{

-				IXMLNode::TXMLNodePtr pXmlSet = ctx->m_pXmlEngine->CreateNode(g_pszXmlSetting,tstring());

-				if(pXmlSet)

+				IXMLNode::TXMLNodePtr pXmlSet = ctx->m_pXmlEngine->CreateNode(g_pszXmlSetting, tstring());

+				if (pXmlSet)

 				{

-					IXMLNode::TXMLNodePtr pXmlName = ctx->m_pXmlEngine->CreateNode(g_pszXmlName,quotes_a2t(szSetting));

+					IXMLNode::TXMLNodePtr pXmlName = ctx->m_pXmlEngine->CreateNode(g_pszXmlName, quotes_a2t(szSetting));

 

-					IXMLNode::TXMLNodePtr pXmlValue = ctx->m_pXmlEngine->CreateNode(g_pszXmlValue,sValue.str());

-					if(pXmlName && pXmlValue)

+					IXMLNode::TXMLNodePtr pXmlValue = ctx->m_pXmlEngine->CreateNode(g_pszXmlValue, sValue.str());

+					if (pXmlName && pXmlValue)

 					{

-						pXmlValue->AddAttribute(g_pszXmlType,sType);

+						pXmlValue->AddAttribute(g_pszXmlType, sType);

 

 						pXmlSet->AddChild(pXmlName);

 						pXmlSet->AddChild(pXmlValue);

@@ -121,17 +121,17 @@ namespace
 					}

 				}

 			}

-		}		

+		}

 

 		return 0;

 	}

 

-	int EnumDbModules(const char* szModuleName, DWORD ofsModuleName, LPARAM lp)

+	int EnumDbModules(const char* szModuleName, LPARAM lp)

 	{

 		CEnumContext* ctx = reinterpret_cast<CEnumContext*>(lp);

 		IXMLNode::TXMLNodePtr pXml = ctx->m_pNode;

-		IXMLNode::TXMLNodePtr pModule = ctx->m_pXmlEngine->CreateNode(g_pszXmlModule,quotes_a2t(szModuleName)/*A2CT(szModuleName)*/);

-		if(pModule)

+		IXMLNode::TXMLNodePtr pModule = ctx->m_pXmlEngine->CreateNode(g_pszXmlModule, quotes_a2t(szModuleName)/*A2CT(szModuleName)*/);

+		if (pModule)

 		{

 			ctx->m_pszModule = szModuleName;

 			ctx->m_pNode = pModule;

@@ -141,8 +141,8 @@ namespace
 			dbces.szModule = szModuleName;

 			dbces.lParam = reinterpret_cast<LPARAM>(ctx);

 

-			CallService(MS_DB_CONTACT_ENUMSETTINGS, WPARAM(ctx->m_hContact),reinterpret_cast<LPARAM>(&dbces));

-			if(pModule->GetChildCount() > 0)

+			CallService(MS_DB_CONTACT_ENUMSETTINGS, WPARAM(ctx->m_hContact), reinterpret_cast<LPARAM>(&dbces));

+			if (pModule->GetChildCount() > 0)

 				pXml->AddChild(pModule);

 

 			ctx->m_pNode = pXml;

@@ -151,52 +151,52 @@ namespace
 		return 0;

 	}

 

-	IXMLNode::TXMLNodePtr export_contact(MCONTACT hContact,const CModuleInfo::TXMLEnginePtr& pXmlEngine)

+	IXMLNode::TXMLNodePtr export_contact(MCONTACT hContact, const CModuleInfo::TXMLEnginePtr& pXmlEngine)

 	{

-		IXMLNode::TXMLNodePtr pNode = pXmlEngine->CreateNode(g_pszXmlContact,tstring());

-		if(pNode)

+		IXMLNode::TXMLNodePtr pNode = pXmlEngine->CreateNode(g_pszXmlContact, tstring());

+		if (pNode)

 		{

 			CEnumContext ctx;

 			ctx.m_pXmlEngine = pXmlEngine;

 			ctx.m_pNode = pNode;

 			ctx.m_hContact = hContact;

 

-			CallService(MS_DB_MODULES_ENUM,reinterpret_cast<WPARAM>(&ctx),reinterpret_cast<LPARAM>(EnumDbModules));

+			CallService(MS_DB_MODULES_ENUM, reinterpret_cast<WPARAM>(&ctx), reinterpret_cast<LPARAM>(EnumDbModules));

 		}

 		return pNode;

 	}

 

-	LPCTSTR prepare_filter(LPTSTR pszBuffer,size_t cBuffer)

+	LPCTSTR prepare_filter(LPTSTR pszBuffer, size_t cBuffer)

 	{

 		LPTSTR p = pszBuffer;

 		LPCTSTR pszXml = TranslateT("XML File (*.xml)");

-		mir_tstrncpy(p,pszXml, (int)cBuffer);

-		size_t nLen = mir_tstrlen(pszXml)+1;

-		p+= nLen;

-		if(nLen < cBuffer)

+		mir_tstrncpy(p, pszXml, (int)cBuffer);

+		size_t nLen = mir_tstrlen(pszXml) + 1;

+		p += nLen;

+		if (nLen < cBuffer)

 		{

-			mir_tstrncpy(p,_T("*.xml"),(int)(cBuffer-nLen));

-			p+= 6;

+			mir_tstrncpy(p, _T("*.xml"), (int)(cBuffer - nLen));

+			p += 6;

 			nLen += 6;

 		}

 

-		if(nLen < cBuffer)

+		if (nLen < cBuffer)

 		{

 			LPCTSTR pszAll = TranslateT("All files (*.*)");

-			mir_tstrncpy(p,pszAll,(int)(cBuffer-nLen));

-			size_t n = mir_tstrlen(pszAll)+1;

+			mir_tstrncpy(p, pszAll, (int)(cBuffer - nLen));

+			size_t n = mir_tstrlen(pszAll) + 1;

 			nLen += n;

-			p+= n;

+			p += n;

 		}

 

-		if(nLen < cBuffer)

+		if (nLen < cBuffer)

 		{

-			mir_tstrncpy(p,_T("*.*"),(int)(cBuffer-nLen));

-			p+= 4;

+			mir_tstrncpy(p, _T("*.*"), (int)(cBuffer - nLen));

+			p += 4;

 			nLen += 4;

 		}

 

-		if(nLen < cBuffer)

+		if (nLen < cBuffer)

 		{

 			*p = _T('\0');

 		}

@@ -204,20 +204,20 @@ namespace
 		return pszBuffer;

 	}

 

-	bool show_open_file_dialog(bool bOpen,tstring& rsFile)

+	bool show_open_file_dialog(bool bOpen, tstring& rsFile)

 	{

 		TCHAR szBuffer[MAX_PATH];

 		TCHAR szFilter[MAX_PATH];

 		OPENFILENAME ofn;

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

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

 

-		ofn.lStructSize       = sizeof(OPENFILENAME);

+		ofn.lStructSize = sizeof(OPENFILENAME);

 

-		ofn.hwndOwner         = NULL;

-		ofn.lpstrFilter       = prepare_filter(szFilter,MAX_PATH);

-		ofn.Flags             = OFN_PATHMUSTEXIST|OFN_HIDEREADONLY|OFN_EXPLORER;

-		ofn.lpstrDefExt		  = _T("xml");

-		if(true == bOpen)

+		ofn.hwndOwner = NULL;

+		ofn.lpstrFilter = prepare_filter(szFilter, MAX_PATH);

+		ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER;

+		ofn.lpstrDefExt = _T("xml");

+		if (true == bOpen)

 		{

 			ofn.Flags |= OFN_FILEMUSTEXIST;

 		}

@@ -225,20 +225,20 @@ namespace
 		{

 			ofn.Flags |= OFN_OVERWRITEPROMPT;

 		}

-		ofn.nMaxFile          = MAX_PATH;

-		ofn.lpstrFile         = szBuffer;

-		ofn.lpstrFile[0]	  =	_T('\0');

+		ofn.nMaxFile = MAX_PATH;

+		ofn.lpstrFile = szBuffer;

+		ofn.lpstrFile[0] = _T('\0');

 

-		if(bOpen)

+		if (bOpen)

 		{

-			if(FALSE == GetOpenFileName(&ofn))

+			if (FALSE == GetOpenFileName(&ofn))

 			{

 				return false;

 			}

 		}

 		else

 		{

-			if(FALSE == GetSaveFileName(&ofn))

+			if (FALSE == GetSaveFileName(&ofn))

 			{

 				return false;

 			}

@@ -250,35 +250,35 @@ namespace
 	}

 }

 

-INT_PTR Quotes_Export(WPARAM wp,LPARAM lp)

+INT_PTR Quotes_Export(WPARAM wp, LPARAM lp)

 {

-// 	USES_CONVERSION;

+	// 	USES_CONVERSION;

 

 	tstring sFileName;

 	const char* pszFile = reinterpret_cast<const char*>(lp);

-	if(NULL == pszFile)

+	if (NULL == pszFile)

 	{

-		if(false == show_open_file_dialog(false,sFileName))

+		if (false == show_open_file_dialog(false, sFileName))

 		{

 			return -1;

 		}

 	}

 	else

-	{		

+	{

 		sFileName = quotes_a2t(pszFile);//A2CT(pszFile);

-	}	

+	}

 

 	CModuleInfo::TXMLEnginePtr pXmlEngine = CModuleInfo::GetInstance().GetXMLEnginePtr();

 	CModuleInfo::TQuotesProvidersPtr pProviders = CModuleInfo::GetInstance().GetQuoteProvidersPtr();

-	IXMLNode::TXMLNodePtr pRoot = pXmlEngine->CreateNode(g_pszXmlContacts,tstring());

+	IXMLNode::TXMLNodePtr pRoot = pXmlEngine->CreateNode(g_pszXmlContacts, tstring());

 	MCONTACT hContact = MCONTACT(wp);

-	if(hContact)

+	if (hContact)

 	{

 		CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact);

-		if(pProvider)

+		if (pProvider)

 		{

-			IXMLNode::TXMLNodePtr pNode = export_contact(hContact,pXmlEngine);

-			if(pNode)

+			IXMLNode::TXMLNodePtr pNode = export_contact(hContact, pXmlEngine);

+			if (pNode)

 			{

 				pRoot->AddChild(pNode);

 			}

@@ -286,13 +286,13 @@ INT_PTR Quotes_Export(WPARAM wp,LPARAM lp)
 	}

 	else

 	{

-		for(hContact = db_find_first(QUOTES_MODULE_NAME); hContact; hContact = db_find_next(hContact, QUOTES_MODULE_NAME)) 

+		for (hContact = db_find_first(QUOTES_MODULE_NAME); hContact; hContact = db_find_next(hContact, QUOTES_MODULE_NAME))

 		{

 			CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact);

-			if(pProvider)

+			if (pProvider)

 			{

-				IXMLNode::TXMLNodePtr pNode = export_contact(hContact,pXmlEngine);

-				if(pNode)

+				IXMLNode::TXMLNodePtr pNode = export_contact(hContact, pXmlEngine);

+				if (pNode)

 				{

 					pRoot->AddChild(pNode);

 				}

@@ -300,7 +300,7 @@ INT_PTR Quotes_Export(WPARAM wp,LPARAM lp)
 		}

 	}

 

-	return ((true == pXmlEngine->SaveFile(sFileName,pRoot)) ? 0 : 1);

+	return ((true == pXmlEngine->SaveFile(sFileName, pRoot)) ? 0 : 1);

 }

 

 namespace

@@ -311,40 +311,40 @@ namespace
 		return (0 == db_set(hContact, dbs.szModule, dbs.szSetting, &dbs.value));

 	}

 

-	bool handle_module(MCONTACT hContact,const IXMLNode::TXMLNodePtr& pXmlModule,UINT nFlags)

+	bool handle_module(MCONTACT hContact, const IXMLNode::TXMLNodePtr& pXmlModule)

 	{

 		size_t cCreatedRecords = 0;

 		tstring sModuleName = pXmlModule->GetText();

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

+		if (false == sModuleName.empty())

 		{

 			DBCONTACTWRITESETTING dbs;

 			std::string s = quotes_t2a(sModuleName.c_str());

 			dbs.szModule = s.c_str();//T2CA(sModuleName.c_str());

 

-			bool bCListModule = 0 == quotes_stricmp(sModuleName.c_str(),_T("CList"));

+			bool bCListModule = 0 == quotes_stricmp(sModuleName.c_str(), _T("CList"));

 

 			size_t cChild = pXmlModule->GetChildCount();

-			for(size_t i = 0;i < cChild;++i)

+			for (size_t i = 0; i < cChild; ++i)

 			{

 				IXMLNode::TXMLNodePtr pSetting = pXmlModule->GetChildNode(i);

 				tstring sSetting = pSetting->GetName();

-				if(0 == quotes_stricmp(g_pszXmlSetting,sSetting.c_str()))

+				if (0 == quotes_stricmp(g_pszXmlSetting, sSetting.c_str()))

 				{

 					size_t cSetChild = pSetting->GetChildCount();

-					if(cSetChild >= 2)

+					if (cSetChild >= 2)

 					{

 						tstring sName;

 						tstring sValue;

 						tstring sType;

-						for(size_t i = 0;i < cSetChild;++i)

+						for (size_t i = 0; i < cSetChild; ++i)

 						{

 							IXMLNode::TXMLNodePtr pNode = pSetting->GetChildNode(i);

 							tstring sNode = pNode->GetName();

-							if(0 == quotes_stricmp(g_pszXmlName,sNode.c_str()))

+							if (0 == quotes_stricmp(g_pszXmlName, sNode.c_str()))

 							{

 								sName = pNode->GetText();

 							}

-							else if(0 == quotes_stricmp(g_pszXmlValue,sNode.c_str()))

+							else if (0 == quotes_stricmp(g_pszXmlValue, sNode.c_str()))

 							{

 								sValue = pNode->GetText();

 								sType = pNode->GetAttributeValue(g_pszXmlType);

@@ -355,118 +355,118 @@ namespace
 						{

 							std::string s = quotes_t2a(sName.c_str());

 							dbs.szSetting = s.c_str();//T2CA(sName.c_str());

-							if(0 == quotes_stricmp(g_pszXmlTypeByte,sType.c_str()))

+							if (0 == quotes_stricmp(g_pszXmlTypeByte, sType.c_str()))

 							{

 								tistringstream in(sValue.c_str());

 								in.imbue(GetSystemLocale());

 								dbs.value.cVal = in.get();

-								if(in.good() && in.eof())

+								if (in.good() && in.eof())

 								{

 									dbs.value.type = DBVT_BYTE;

-									if(set_contact_settings(hContact,dbs))

+									if (set_contact_settings(hContact, dbs))

 										++cCreatedRecords;

 								}

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeWord,sType.c_str()))

-							{	

+							else if (0 == quotes_stricmp(g_pszXmlTypeWord, sType.c_str()))

+							{

 								tistringstream in(sValue.c_str());

 								in.imbue(GetSystemLocale());

 								in >> dbs.value.wVal;

-								if(in.good() || in.eof())

+								if (in.good() || in.eof())

 								{

 									dbs.value.type = DBVT_WORD;

-									if(set_contact_settings(hContact,dbs))

+									if (set_contact_settings(hContact, dbs))

 										++cCreatedRecords;

 								}

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeDword,sType.c_str()))

-							{		

+							else if (0 == quotes_stricmp(g_pszXmlTypeDword, sType.c_str()))

+							{

 								tistringstream in(sValue.c_str());

 								in.imbue(GetSystemLocale());

 								in >> dbs.value.dVal;

-								if(in.good() || in.eof())

+								if (in.good() || in.eof())

 								{

 									dbs.value.type = DBVT_DWORD;

-									if(set_contact_settings(hContact,dbs))

+									if (set_contact_settings(hContact, dbs))

 										++cCreatedRecords;

 								}

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeAsciiz,sType.c_str()))

-							{	

+							else if (0 == quotes_stricmp(g_pszXmlTypeAsciiz, sType.c_str()))

+							{

 								CT2A v(sValue.c_str());

 								dbs.value.pszVal = v;

 								dbs.value.type = DBVT_ASCIIZ;

-								if(set_contact_settings(hContact,dbs))

+								if (set_contact_settings(hContact, dbs))

 									++cCreatedRecords;

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeUtf8,sType.c_str()))

-							{					

+							else if (0 == quotes_stricmp(g_pszXmlTypeUtf8, sType.c_str()))

+							{

 								dbs.value.pszVal = mir_utf8encodeT(sValue.c_str());

 								dbs.value.type = DBVT_UTF8;

-								if(set_contact_settings(hContact,dbs))

+								if (set_contact_settings(hContact, dbs))

 									++cCreatedRecords;

 

 								mir_free(dbs.value.pszVal);

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeWchar,sType.c_str()))

-							{			

+							else if (0 == quotes_stricmp(g_pszXmlTypeWchar, sType.c_str()))

+							{

 								CT2W val(sValue.c_str());

 								dbs.value.pwszVal = val;

 								dbs.value.type = DBVT_WCHAR;

-								if(set_contact_settings(hContact,dbs))

+								if (set_contact_settings(hContact, dbs))

 									++cCreatedRecords;

 

 								mir_free(dbs.value.pwszVal);

 							}

-							else if(0 == quotes_stricmp(g_pszXmlTypeBlob,sType.c_str()))

+							else if (0 == quotes_stricmp(g_pszXmlTypeBlob, sType.c_str()))

 							{

 								unsigned bufLen;

 								mir_ptr<BYTE> buf((PBYTE)mir_base64_decode(_T2A(sValue.c_str()), &bufLen));

-								if(buf) {

+								if (buf) {

 									dbs.value.pbVal = buf;

 									dbs.value.cpbVal = (WORD)bufLen;

 									dbs.value.type = DBVT_BLOB;

 

-									if(set_contact_settings(hContact,dbs))

+									if (set_contact_settings(hContact, dbs))

 										++cCreatedRecords;

 								}

 							}

 

-							if ((true == bCListModule) && (0 == quotes_stricmp(sName.c_str(),_T("Group"))))

-								CallService(MS_CLIST_GROUPCREATE,NULL,reinterpret_cast<LPARAM>(sValue.c_str()));

+							if ((true == bCListModule) && (0 == quotes_stricmp(sName.c_str(), _T("Group"))))

+								CallService(MS_CLIST_GROUPCREATE, NULL, reinterpret_cast<LPARAM>(sValue.c_str()));

 						}

 					}

-				}		

+				}

 			}

 		}

 

 		return true;

 	}

 

-	size_t count_contacts(const IXMLNode::TXMLNodePtr& pXmlRoot,bool bInContactsGroup)

+	size_t count_contacts(const IXMLNode::TXMLNodePtr& pXmlRoot, bool bInContactsGroup)

 	{

 		size_t cContacts = 0;

 		size_t cChild = pXmlRoot->GetChildCount();

-		for(size_t i = 0;i < cChild;++i)

+		for (size_t i = 0; i < cChild; ++i)

 		{

 			IXMLNode::TXMLNodePtr pNode = pXmlRoot->GetChildNode(i);

 			tstring sName = pNode->GetName();

-			if(false == bInContactsGroup)

+			if (false == bInContactsGroup)

 			{

-				if(0 == quotes_stricmp(g_pszXmlContacts,sName.c_str()))

+				if (0 == quotes_stricmp(g_pszXmlContacts, sName.c_str()))

 				{

-					cContacts += count_contacts(pNode,true);

+					cContacts += count_contacts(pNode, true);

 				}

 				else

 				{

-					cContacts += count_contacts(pNode,false);

+					cContacts += count_contacts(pNode, false);

 				}

 			}

 			else

 			{

-				if(0 == quotes_stricmp(g_pszXmlContact,sName.c_str()))

+				if (0 == quotes_stricmp(g_pszXmlContact, sName.c_str()))

 				{

-					++ cContacts;

+					++cContacts;

 				}

 			}

 		}

@@ -476,7 +476,7 @@ namespace
 

 	struct CImportContext

 	{

-		CImportContext(size_t cTotalContacts) : m_cTotalContacts(cTotalContacts),m_cHandledContacts(0),m_nFlags(0){}

+		CImportContext(size_t cTotalContacts) : m_cTotalContacts(cTotalContacts), m_cHandledContacts(0), m_nFlags(0){}

 

 		size_t m_cTotalContacts;

 		size_t m_cHandledContacts;

@@ -485,7 +485,7 @@ namespace
 

 	struct CContactState

 	{

-		CContactState() : m_hContact(NULL),m_bNewContact(false){}

+		CContactState() : m_hContact(NULL), m_bNewContact(false){}

 		MCONTACT m_hContact;

 		CQuotesProviders::TQuotesProviderPtr m_pProvider;

 		bool m_bNewContact;

@@ -493,16 +493,16 @@ namespace
 

 	IXMLNode::TXMLNodePtr find_quotes_module(const IXMLNode::TXMLNodePtr& pXmlContact)

 	{

-// 		USES_CONVERSION;

-// 		LPCTSTR pszQuotes = A2T(QUOTES_MODULE_NAME);

+		// 		USES_CONVERSION;

+		// 		LPCTSTR pszQuotes = A2T(QUOTES_MODULE_NAME);

 		static const tstring g_sQuotes = quotes_a2t(QUOTES_MODULE_NAME);

 		size_t cChild = pXmlContact->GetChildCount();

-		for(size_t i = 0;i < cChild;++i)

+		for (size_t i = 0; i < cChild; ++i)

 		{

 			IXMLNode::TXMLNodePtr pNode = pXmlContact->GetChildNode(i);

 			tstring sName = pNode->GetName();

-			if ((0 == quotes_stricmp(g_pszXmlModule,sName.c_str()))

-				&& (0 == quotes_stricmp(g_sQuotes.c_str(),pNode->GetText().c_str())))

+			if ((0 == quotes_stricmp(g_pszXmlModule, sName.c_str()))

+				&& (0 == quotes_stricmp(g_sQuotes.c_str(), pNode->GetText().c_str())))

 			{

 				return pNode;

 			}

@@ -511,44 +511,44 @@ namespace
 		return IXMLNode::TXMLNodePtr();

 	}

 

-	typedef std::pair<tstring,tstring> TNameValue;//first is name,second is value

+	typedef std::pair<tstring, tstring> TNameValue;//first is name,second is value

 	TNameValue parse_setting_node(const IXMLNode::TXMLNodePtr& pXmlSetting)

 	{

 		assert(pXmlSetting);

-		

-		tstring sName,sValue;

+

+		tstring sName, sValue;

 		size_t cSettingChildItems = pXmlSetting->GetChildCount();

-		for(size_t j = 0;j < cSettingChildItems;++j)

+		for (size_t j = 0; j < cSettingChildItems; ++j)

 		{

 			IXMLNode::TXMLNodePtr pXMLSetChild = pXmlSetting->GetChildNode(j);

-			if(pXMLSetChild)

+			if (pXMLSetChild)

 			{

-				if(0 == quotes_stricmp(g_pszXmlName,pXMLSetChild->GetName().c_str()))

+				if (0 == quotes_stricmp(g_pszXmlName, pXMLSetChild->GetName().c_str()))

 				{

 					sName = pXMLSetChild->GetText();

 				}

-				else if(0 == quotes_stricmp(g_pszXmlValue,pXMLSetChild->GetName().c_str()))

+				else if (0 == quotes_stricmp(g_pszXmlValue, pXMLSetChild->GetName().c_str()))

 				{

 					sValue = pXMLSetChild->GetText();

 				}

 			}

 		}

 

-		return std::make_pair(sName,sValue);

+		return std::make_pair(sName, sValue);

 	}

 

 	CQuotesProviders::TQuotesProviderPtr find_provider(const IXMLNode::TXMLNodePtr& pXmlQuotesModule)

 	{

-// 		USES_CONVERSION;

+		// 		USES_CONVERSION;

 		static const tstring g_sQuotesProvider = quotes_a2t(DB_STR_QUOTE_PROVIDER);//A2CT(DB_STR_QUOTE_PROVIDER);

 		size_t cChild = pXmlQuotesModule->GetChildCount();

-		for(size_t i = 0;i < cChild;++i)

+		for (size_t i = 0; i < cChild; ++i)

 		{

 			IXMLNode::TXMLNodePtr pXMLSetting = pXmlQuotesModule->GetChildNode(i);

-			if(pXMLSetting && (0 == quotes_stricmp(g_pszXmlSetting,pXMLSetting->GetName().c_str())))

+			if (pXMLSetting && (0 == quotes_stricmp(g_pszXmlSetting, pXMLSetting->GetName().c_str())))

 			{

 				TNameValue Item = parse_setting_node(pXMLSetting);

-				if ((0 == quotes_stricmp(g_sQuotesProvider.c_str(),Item.first.c_str())) && (false == Item.second.empty()))

+				if ((0 == quotes_stricmp(g_sQuotesProvider.c_str(), Item.first.c_str())) && (false == Item.second.empty()))

 				{

 					return CModuleInfo::GetInstance().GetQuoteProvidersPtr()->FindProvider(Item.second);

 				}

@@ -558,21 +558,21 @@ namespace
 		return CQuotesProviders::TQuotesProviderPtr();

 	}

 

-	bool get_contact_state(const IXMLNode::TXMLNodePtr& pXmlContact,CContactState& cst)

+	bool get_contact_state(const IXMLNode::TXMLNodePtr& pXmlContact, CContactState& cst)

 	{

 		class visitor : public CQuotesProviderVisitor

 		{

 		public:

-			visitor(const IXMLNode::TXMLNodePtr& pXmlQuotes) 

-				: m_hContact(NULL),m_pXmlQuotes(pXmlQuotes){}

+			visitor(const IXMLNode::TXMLNodePtr& pXmlQuotes)

+				: m_hContact(NULL), m_pXmlQuotes(pXmlQuotes){}

 

-			MCONTACT GetContact()const{return m_hContact;}

+			MCONTACT GetContact()const{ return m_hContact; }

 

 		private:

 			virtual void Visit(const CQuotesProviderDukasCopy& rProvider)

 			{

 				tstring sQuoteID = GetXMLNodeValue(DB_STR_QUOTE_ID);

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

+				if (false == sQuoteID.empty())

 				{

 					m_hContact = rProvider.GetContactByQuoteID(sQuoteID);

 				}

@@ -580,24 +580,24 @@ namespace
 

 			virtual void Visit(const CQuotesProviderGoogle& rProvider)

 			{

-// 				USES_CONVERSION;

+				// 				USES_CONVERSION;

 				static const tstring g_sFromID = quotes_a2t(DB_STR_FROM_ID);//A2CT(DB_STR_FROM_ID);

 				static const tstring g_sToID = quotes_a2t(DB_STR_TO_ID);//A2CT(DB_STR_TO_ID);

 

 				tstring sFromID;

 				tstring sToID;

 				size_t cChild = m_pXmlQuotes->GetChildCount();

-				for(size_t i = 0;i < cChild;++i)

+				for (size_t i = 0; i < cChild; ++i)

 				{

 					IXMLNode::TXMLNodePtr pNode = m_pXmlQuotes->GetChildNode(i);

-					if(pNode && (0 == quotes_stricmp(g_pszXmlSetting, pNode->GetName().c_str())))

+					if (pNode && (0 == quotes_stricmp(g_pszXmlSetting, pNode->GetName().c_str())))

 					{

 						TNameValue Item = parse_setting_node(pNode);

-						if(0 == quotes_stricmp(g_sFromID.c_str(),Item.first.c_str()))

+						if (0 == quotes_stricmp(g_sFromID.c_str(), Item.first.c_str()))

 						{

 							sFromID = Item.second;

 						}

-						else if(0 == quotes_stricmp(g_sToID.c_str(),Item.first.c_str()))

+						else if (0 == quotes_stricmp(g_sToID.c_str(), Item.first.c_str()))

 						{

 							sToID = Item.second;

 						}

@@ -606,14 +606,14 @@ namespace
 

 				if ((false == sFromID.empty()) && (false == sToID.empty()))

 				{

-					m_hContact = rProvider.GetContactByID(sFromID,sToID);

+					m_hContact = rProvider.GetContactByID(sFromID, sToID);

 				}

 			}

 

 			virtual void Visit(const CQuotesProviderFinance& rProvider)

 			{

 				tstring sQuoteID = GetXMLNodeValue(DB_STR_QUOTE_ID);

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

+				if (false == sQuoteID.empty())

 				{

 					m_hContact = rProvider.GetContactByQuoteID(sQuoteID);

 				}

@@ -621,18 +621,18 @@ namespace
 

 			tstring GetXMLNodeValue(const char* pszXMLNodeName)const

 			{

-// 				USES_CONVERSION;

+				// 				USES_CONVERSION;

 				tstring sXMLNodeName = quotes_a2t(pszXMLNodeName);//A2CT(pszXMLNodeName);

 

 				tstring sValue;

 				size_t cChild = m_pXmlQuotes->GetChildCount();

-				for(size_t i = 0;i < cChild;++i)

+				for (size_t i = 0; i < cChild; ++i)

 				{

 					IXMLNode::TXMLNodePtr pNode = m_pXmlQuotes->GetChildNode(i);

-					if(pNode && (0 == quotes_stricmp(g_pszXmlSetting, pNode->GetName().c_str())))

+					if (pNode && (0 == quotes_stricmp(g_pszXmlSetting, pNode->GetName().c_str())))

 					{

 						TNameValue Item = parse_setting_node(pNode);

-						if(0 == quotes_stricmp(Item.first.c_str(),sXMLNodeName.c_str()))

+						if (0 == quotes_stricmp(Item.first.c_str(), sXMLNodeName.c_str()))

 						{

 							sValue = Item.second;

 							break;

@@ -649,10 +649,10 @@ namespace
 		};

 

 		IXMLNode::TXMLNodePtr pXmlQuotes = find_quotes_module(pXmlContact);

-		if(pXmlQuotes)

+		if (pXmlQuotes)

 		{

 			cst.m_pProvider = find_provider(pXmlQuotes);

-			if(cst.m_pProvider)

+			if (cst.m_pProvider)

 			{

 				visitor vs(pXmlQuotes);

 				cst.m_pProvider->Accept(vs);

@@ -664,38 +664,38 @@ namespace
 		return false;

 	}

 

-	bool import_contact(const IXMLNode::TXMLNodePtr& pXmlContact,CImportContext& impctx)

+	bool import_contact(const IXMLNode::TXMLNodePtr& pXmlContact, CImportContext& impctx)

 	{

-		++ impctx.m_cHandledContacts;

+		++impctx.m_cHandledContacts;

 

 		CContactState cst;

-		bool bResult = get_contact_state(pXmlContact,cst);

-		if(bResult)

+		bool bResult = get_contact_state(pXmlContact, cst);

+		if (bResult)

 		{

-			if(NULL == cst.m_hContact)

+			if (NULL == cst.m_hContact)

 			{

-				cst.m_hContact = MCONTACT(CallService(MS_DB_CONTACT_ADD,0,0));

+				cst.m_hContact = MCONTACT(CallService(MS_DB_CONTACT_ADD, 0, 0));

 				cst.m_bNewContact = true;

 			}

-			else if(impctx.m_nFlags&QUOTES_IMPORT_SKIP_EXISTING_CONTACTS)

+			else if (impctx.m_nFlags&QUOTES_IMPORT_SKIP_EXISTING_CONTACTS)

 			{

 				return true;

 			}

 

-			if(cst.m_hContact)

+			if (cst.m_hContact)

 			{

 				size_t cChild = pXmlContact->GetChildCount();

-				for(size_t i = 0;i < cChild && bResult;++i)

+				for (size_t i = 0; i < cChild && bResult; ++i)

 				{

 					IXMLNode::TXMLNodePtr pNode = pXmlContact->GetChildNode(i);

 					tstring sName = pNode->GetName();

-					if(0 == quotes_stricmp(g_pszXmlModule,sName.c_str()))

+					if (0 == quotes_stricmp(g_pszXmlModule, sName.c_str()))

 					{

-						bResult &= handle_module(cst.m_hContact,pNode,impctx.m_nFlags);

+						bResult &= handle_module(cst.m_hContact, pNode);

 					}

 				}

 

-				if(cst.m_bNewContact && bResult)

+				if (cst.m_bNewContact && bResult)

 				{

 					cst.m_pProvider->AddContact(cst.m_hContact);

 					cst.m_pProvider->RefreshContact(cst.m_hContact);

@@ -711,19 +711,19 @@ namespace
 

 	}

 

-	size_t import_contacts(const IXMLNode::TXMLNodePtr& pXmlContacts,CImportContext& impctx)

+	size_t import_contacts(const IXMLNode::TXMLNodePtr& pXmlContacts, CImportContext& impctx)

 	{

 		size_t cContacts = 0;

 		size_t cChild = pXmlContacts->GetChildCount();

-		for(size_t i = 0;i < cChild;++i)

+		for (size_t i = 0; i < cChild; ++i)

 		{

 			IXMLNode::TXMLNodePtr pNode = pXmlContacts->GetChildNode(i);

 			tstring sName = pNode->GetName();

-			if(0 == quotes_stricmp(g_pszXmlContact,sName.c_str()))

+			if (0 == quotes_stricmp(g_pszXmlContact, sName.c_str()))

 			{

-				if(true == import_contact(pNode,impctx))

+				if (true == import_contact(pNode, impctx))

 				{

-					++ cContacts;

+					++cContacts;

 				}

 			}

 		}

@@ -732,21 +732,21 @@ namespace
 

 	}

 

-	size_t handle_contacts_node(const IXMLNode::TXMLNodePtr& pXmlRoot,CImportContext& impctx)

+	size_t handle_contacts_node(const IXMLNode::TXMLNodePtr& pXmlRoot, CImportContext& impctx)

 	{

 		size_t cContacts = 0;

 		size_t cChild = pXmlRoot->GetChildCount();

-		for(size_t i = 0;i < cChild;++i)

+		for (size_t i = 0; i < cChild; ++i)

 		{

 			IXMLNode::TXMLNodePtr pNode = pXmlRoot->GetChildNode(i);

 			tstring sName = pNode->GetName();

-			if(0 == quotes_stricmp(g_pszXmlContacts,sName.c_str()))

+			if (0 == quotes_stricmp(g_pszXmlContacts, sName.c_str()))

 			{

-				cContacts += import_contacts(pNode,impctx);

+				cContacts += import_contacts(pNode, impctx);

 			}

 			else

 			{

-				cContacts += handle_contacts_node(pNode,impctx);

+				cContacts += handle_contacts_node(pNode, impctx);

 			}

 		}

 

@@ -754,52 +754,52 @@ namespace
 

 	}

 

-	bool do_import(const IXMLNode::TXMLNodePtr& pXmlRoot,UINT nFlags)

+	bool do_import(const IXMLNode::TXMLNodePtr& pXmlRoot, UINT nFlags)

 	{

-		CImportContext imctx(count_contacts(pXmlRoot,false));

+		CImportContext imctx(count_contacts(pXmlRoot, false));

 		imctx.m_cHandledContacts = 0;

 		imctx.m_nFlags = nFlags;

 

-		return (handle_contacts_node(pXmlRoot,imctx) > 0);

+		return (handle_contacts_node(pXmlRoot, imctx) > 0);

 	}

 }

 

-INT_PTR Quotes_Import(WPARAM wp,LPARAM lp)

+INT_PTR Quotes_Import(WPARAM wp, LPARAM lp)

 {

-// 	USES_CONVERSION;

+	// 	USES_CONVERSION;

 

 	tstring sFileName;

 	const char* pszFile = reinterpret_cast<const char*>(lp);

-	if(NULL == pszFile)

+	if (NULL == pszFile)

 	{

-		if(false == show_open_file_dialog(true,sFileName))

+		if (false == show_open_file_dialog(true, sFileName))

 		{

 			return -1;

 		}

 	}

 	else

-	{		

+	{

 		sFileName = quotes_a2t(pszFile);//A2CT(pszFile);

-	}	

+	}

 	CModuleInfo::TXMLEnginePtr pXmlEngine = CModuleInfo::GetInstance().GetXMLEnginePtr();

 	IXMLNode::TXMLNodePtr pXmlRoot = pXmlEngine->LoadFile(sFileName);

-	if(pXmlRoot)

+	if (pXmlRoot)

 	{

-		return ((true == do_import(pXmlRoot,wp)) ? 0 : 1);

+		return ((true == do_import(pXmlRoot, wp)) ? 0 : 1);

 	}

 

 	return 1;

 }

 

 #ifdef TEST_IMPORT_EXPORT

-INT_PTR QuotesMenu_ImportAll(WPARAM wp,LPARAM lp)

+INT_PTR QuotesMenu_ImportAll(WPARAM, LPARAM)

 {

-	return CallService(MS_QUOTES_IMPORT,0,0);

+	return CallService(MS_QUOTES_IMPORT, 0, 0);

 }

 

-INT_PTR QuotesMenu_ExportAll(WPARAM wp,LPARAM lp)

+INT_PTR QuotesMenu_ExportAll(WPARAM, LPARAM)

 {

-	return CallService(MS_QUOTES_EXPORT,0,0);

+	return CallService(MS_QUOTES_EXPORT, 0, 0);

 }

 #endif