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/Boltun/src/actionQueue.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/Boltun/src/actionQueue.cpp')

diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp
index fab338a8dc..1c3bf5a25c 100644
--- a/plugins/Boltun/src/actionQueue.cpp
+++ b/plugins/Boltun/src/actionQueue.cpp
@@ -29,22 +29,22 @@ using namespace std;
 
 extern TalkBot* bot;
 
-typedef void (*ActionHandler)(HCONTACT hContact, const TalkBot::MessageInfo *inf);
+typedef void (*ActionHandler)(MCONTACT hContact, const TalkBot::MessageInfo *inf);
 
 typedef struct _QueueElement {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	const TalkBot::MessageInfo *inf;
 	ActionHandler Handler;
 	bool Sticky;
 	int TimeOffset;
-	_QueueElement(HCONTACT contact, ActionHandler handler, int timeOffset, const TalkBot::MessageInfo *info = NULL, bool sticky = false)
+	_QueueElement(MCONTACT contact, ActionHandler handler, int timeOffset, const TalkBot::MessageInfo *info = NULL, bool sticky = false)
 		:hContact(contact), Handler(handler), TimeOffset(timeOffset), inf(info), Sticky(sticky)
 	{
 	}
 } QueueElement;
 
 static list<QueueElement> actionQueue;
-static set<HCONTACT> typingContacts;
+static set<MCONTACT> typingContacts;
 UINT_PTR timerID = 0;
 
 CriticalSection cs;
@@ -72,7 +72,7 @@ void UpdateTimer()
 		timerID = 0;
 }
 
-static bool NotifyTyping(HCONTACT hContact)
+static bool NotifyTyping(MCONTACT hContact)
 {
 	int res = db_get_b(hContact, "SRMsg", "SupportTyping", 2);
 	if (res == 2)
@@ -80,7 +80,7 @@ static bool NotifyTyping(HCONTACT hContact)
 	return res != 0;
 }
 
-static void TimerAnswer(HCONTACT hContact, const TalkBot::MessageInfo* info)
+static void TimerAnswer(MCONTACT hContact, const TalkBot::MessageInfo* info)
 {
 	DBEVENTINFO ldbei;
 	int size = (int)info->Answer.length() + 1;
@@ -118,7 +118,7 @@ static void TimerAnswer(HCONTACT hContact, const TalkBot::MessageInfo* info)
 	typingContactsLock.Leave();
 }
 
-static void StartTyping(HCONTACT hContact, const TalkBot::MessageInfo*)
+static void StartTyping(MCONTACT hContact, const TalkBot::MessageInfo*)
 {
 	CallService(MS_PROTO_SELFISTYPING, (WPARAM)hContact, 
 		(LPARAM)PROTOTYPE_SELFTYPING_ON);
@@ -127,7 +127,7 @@ static void StartTyping(HCONTACT hContact, const TalkBot::MessageInfo*)
 	typingContactsLock.Leave();
 }
 
-void DoAnswer(HCONTACT hContact, const TalkBot::MessageInfo *info, bool sticky = false)
+void DoAnswer(MCONTACT hContact, const TalkBot::MessageInfo *info, bool sticky = false)
 {
 	if (info->Answer[0] == _T('\0'))
 		return;
@@ -206,7 +206,7 @@ void DoAnswer(HCONTACT hContact, const TalkBot::MessageInfo *info, bool sticky =
 	cs.Leave();
 }
 
-void AnswerToContact(HCONTACT hContact, const TCHAR* messageToAnswer)
+void AnswerToContact(MCONTACT hContact, const TCHAR* messageToAnswer)
 {
 	if (Config.TalkWarnContacts && db_get_b(hContact, BOLTUN_KEY, 
 		DB_CONTACT_WARNED, FALSE) == FALSE)
@@ -218,7 +218,7 @@ void AnswerToContact(HCONTACT hContact, const TCHAR* messageToAnswer)
 		DoAnswer(hContact, bot->Reply(hContact, messageToAnswer, false));
 }
 
-void StartChatting(HCONTACT hContact)
+void StartChatting(MCONTACT hContact)
 {
 	DoAnswer(hContact, new TalkBot::MessageInfo(bot->GetInitMessage(hContact)), true);
 }
-- 
cgit v1.2.3