From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 20:47:51 +0000
Subject: HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Quotes/src/ImportExport.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/Quotes/src/ImportExport.cpp')

diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index 6bf10e2de3..b41451ce8c 100644
--- a/plugins/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
@@ -21,7 +21,7 @@ namespace
 	{
 		CModuleInfo::TXMLEnginePtr m_pXmlEngine;
 		IXMLNode::TXMLNodePtr m_pNode;
-		HCONTACT m_hContact;
+		MCONTACT m_hContact;
 		LPCSTR m_pszModule;
 	};
 
@@ -151,7 +151,7 @@ namespace
 		return 0;
 	}
 
-	IXMLNode::TXMLNodePtr export_contact(HCONTACT 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)
@@ -271,7 +271,7 @@ INT_PTR Quotes_Export(WPARAM wp,LPARAM lp)
 	CModuleInfo::TXMLEnginePtr pXmlEngine = CModuleInfo::GetInstance().GetXMLEnginePtr();
 	CModuleInfo::TQuotesProvidersPtr pProviders = CModuleInfo::GetInstance().GetQuoteProvidersPtr();
 	IXMLNode::TXMLNodePtr pRoot = pXmlEngine->CreateNode(g_pszXmlContacts,tstring());
-	HCONTACT hContact = HCONTACT(wp);
+	MCONTACT hContact = MCONTACT(wp);
 	if(hContact)
 	{
 		CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact);
@@ -305,13 +305,13 @@ INT_PTR Quotes_Export(WPARAM wp,LPARAM lp)
 
 namespace
 {
-	bool set_contact_settings(HCONTACT hContact, DBCONTACTWRITESETTING& dbs)
+	bool set_contact_settings(MCONTACT hContact, DBCONTACTWRITESETTING& dbs)
 	{
 		assert(DBVT_DELETED != dbs.value.type);
 		return (0 == db_set(hContact, dbs.szModule, dbs.szSetting, &dbs.value));
 	}
 
-	bool handle_module(HCONTACT hContact,const IXMLNode::TXMLNodePtr& pXmlModule,UINT nFlags)
+	bool handle_module(MCONTACT hContact,const IXMLNode::TXMLNodePtr& pXmlModule,UINT nFlags)
 	{
 		size_t cCreatedRecords = 0;
 		tstring sModuleName = pXmlModule->GetText();
@@ -486,7 +486,7 @@ namespace
 	struct CContactState
 	{
 		CContactState() : m_hContact(NULL),m_bNewContact(false){}
-		HCONTACT m_hContact;
+		MCONTACT m_hContact;
 		CQuotesProviders::TQuotesProviderPtr m_pProvider;
 		bool m_bNewContact;
 	};
@@ -566,7 +566,7 @@ namespace
 			visitor(const IXMLNode::TXMLNodePtr& pXmlQuotes) 
 				: m_hContact(NULL),m_pXmlQuotes(pXmlQuotes){}
 
-			HCONTACT GetContact()const{return m_hContact;}
+			MCONTACT GetContact()const{return m_hContact;}
 
 		private:
 			virtual void Visit(const CQuotesProviderDukasCopy& rProvider)
@@ -644,7 +644,7 @@ namespace
 			}
 
 		private:
-			HCONTACT m_hContact;
+			MCONTACT m_hContact;
 			IXMLNode::TXMLNodePtr m_pXmlQuotes;
 		};
 
@@ -674,7 +674,7 @@ namespace
 		{
 			if(NULL == cst.m_hContact)
 			{
-				cst.m_hContact = HCONTACT(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)
-- 
cgit v1.2.3