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/BasicHistory/src/Scheduler.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/BasicHistory/src/Scheduler.cpp')

diff --git a/plugins/BasicHistory/src/Scheduler.cpp b/plugins/BasicHistory/src/Scheduler.cpp
index dcd9dd5593..4b18ae58c3 100644
--- a/plugins/BasicHistory/src/Scheduler.cpp
+++ b/plugins/BasicHistory/src/Scheduler.cpp
@@ -219,7 +219,7 @@ bool IsValidTask(TaskOptions& to, std::list<TaskOptions>* top, std::wstring* err
 
 static void CALLBACK DoRebuildEventsInMainAPCFunc(ULONG_PTR dwParam)
 {
-	HCONTACT *contacts = (HCONTACT*)dwParam;
+	MCONTACT *contacts = (MCONTACT*)dwParam;
 	size_t size = (size_t)contacts[0];
 	for (size_t i = 1; i <= size; ++i)
 		HistoryWindow::RebuildEvents(contacts[i]);
@@ -277,7 +277,7 @@ bool DoTask(TaskOptions& to)
 		std::wstring filePath = to.filePath;
 		std::wstring dir;
 		std::list<std::wstring> files;
-		std::vector<HCONTACT> contacts;
+		std::vector<MCONTACT> contacts;
 		if (to.useFtp || to.compress) {
 			std::map<std::wstring, bool> existingContacts;
 			TCHAR temp[MAX_PATH];
@@ -352,7 +352,7 @@ bool DoTask(TaskOptions& to)
 		}
 
 		if (!error) {
-			std::list<HCONTACT> contactList;
+			std::list<MCONTACT> contactList;
 			for (std::list<std::wstring>::iterator it = files.begin(); it != files.end(); ++it) {
 				mExp.SetAutoImport(*it);
 				int ret = mExp.Import(to.importType, contacts);
@@ -410,10 +410,10 @@ bool DoTask(TaskOptions& to)
 			}
 			
 			if (contactList.size() > 0) {
-				HCONTACT *contacts = new HCONTACT[contactList.size() + 1];
-				contacts[0] = (HCONTACT)contactList.size();
+				MCONTACT *contacts = new MCONTACT[contactList.size() + 1];
+				contacts[0] = (MCONTACT)contactList.size();
 				int i = 1;
-				for (std::list<HCONTACT>::iterator it = contactList.begin(); it != contactList.end(); ++it)
+				for (std::list<MCONTACT>::iterator it = contactList.begin(); it != contactList.end(); ++it)
 					contacts[i++] = *it;
 
 				QueueUserAPC(DoRebuildEventsInMainAPCFunc, g_hMainThread, (ULONG_PTR) contacts);
-- 
cgit v1.2.3