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/DbEditorPP/src/exportimport.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/DbEditorPP/src/exportimport.cpp')

diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index b1c5cf436d..d15655fffb 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -81,7 +81,7 @@ char* StrReplace (char* Search, char* Replace, char* Resource)
 	return Resource;
 }
 
-void exportModule(HCONTACT hContact, char* module, FILE* file)
+void exportModule(MCONTACT hContact, char* module, FILE* file)
 {
 	char tmp[32];
 	ModuleSettingLL settinglist;
@@ -152,7 +152,7 @@ void exportModule(HCONTACT hContact, char* module, FILE* file)
 	FreeModuleSettingLL(&settinglist);
 }
 
-char *NickFromHContact(HCONTACT hContact)
+char *NickFromHContact(MCONTACT hContact)
 {
 	static char nick[512] = "";
 
@@ -193,7 +193,7 @@ char *NickFromHContact(HCONTACT hContact)
 	return nick;
 }
 
-void exportDB(HCONTACT hContact, char* module) // hContact == -1 export entire db. module == NULL export entire contact.
+void exportDB(MCONTACT hContact, char* module) // hContact == -1 export entire db. module == NULL export entire contact.
 {                                            // hContact == -1, module == "" - all contacts
 	FILE* file = NULL;
 	char fileName[MAX_PATH];
@@ -211,7 +211,7 @@ void exportDB(HCONTACT hContact, char* module) // hContact == -1 export entire d
 		SetCursor(LoadCursor(NULL,IDC_WAIT));
 
 		// exporting entire db
-		if (hContact == (HCONTACT)INVALID_HANDLE_VALUE)
+		if (hContact == INVALID_CONTACT_ID)
 		{
 			hContact = NULL;
 
@@ -326,20 +326,20 @@ void exportDB(HCONTACT hContact, char* module) // hContact == -1 export entire d
 	FreeModuleSettingLL(&modlist);
 }
 
-HCONTACT CheckNewContact(char *myProto, char *uid, char *myName)
+MCONTACT CheckNewContact(char *myProto, char *uid, char *myName)
 {
 	char szProto[256], szName[256];
 
-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
 		if (DBGetContactSettingStringStatic(hContact, "Protocol", "p", szProto, 256))
 			if (!mir_strcmp(szProto, myProto))
 				if (GetValue(hContact, szProto, uid, szName, SIZEOF(szName)) && !mir_strcmp(szName, myName))
 					return hContact;
 
-	return (HCONTACT)INVALID_HANDLE_VALUE;
+	return INVALID_CONTACT_ID;
 }
 
-void importSettings(HCONTACT hContact, char *importstring )
+void importSettings(MCONTACT hContact, char *importstring )
 {
 	char module[256] = "", setting[256] = "", *end;
 	int i=0, value, type;
@@ -364,7 +364,7 @@ void importSettings(HCONTACT hContact, char *importstring )
 		else if (!strncmp(&importstring[i],"CONTACT:", strlen("CONTACT:")))
 		{
 			int len, add = 1;
-			hContact = (HCONTACT)INVALID_HANDLE_VALUE;
+			hContact = INVALID_CONTACT_ID;
 
 			i = i + (int)strlen("CONTACT:");
 			len = (int)strlen(&importstring[i]);
@@ -403,9 +403,9 @@ void importSettings(HCONTACT hContact, char *importstring )
 				}
 			}
 
-			if (hContact == (HCONTACT)INVALID_HANDLE_VALUE)
+			if (hContact == INVALID_CONTACT_ID)
 			{
-				HCONTACT temp = (HCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
+				MCONTACT temp = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
 				if (temp)
 					hContact = temp;
 			}
@@ -566,7 +566,7 @@ INT_PTR CALLBACK ImportDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
 				
 				case IDOK:
 				{
-					HCONTACT hContact = (HCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+					MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 					int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_TEXT));
 					char *string;
 					if (length)
@@ -591,7 +591,7 @@ INT_PTR CALLBACK ImportDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
 	return 0;
 }
 
-void ImportSettingsMenuItem(HCONTACT hContact)
+void ImportSettingsMenuItem(MCONTACT hContact)
 {
 	if (hwnd2importWindow)
 		DestroyWindow(hwnd2importWindow);
@@ -625,7 +625,7 @@ BOOL Exists(LPCTSTR strName)
 	return GetFileAttributes(strName) != INVALID_FILE_ATTRIBUTES;
 }
 
-void ImportSettingsFromFileMenuItem(HCONTACT hContact, char* FilePath)
+void ImportSettingsFromFileMenuItem(MCONTACT hContact, char* FilePath)
 {
 	char szFileNames[MAX_PATH*10] = {0};
 	char szPath[MAX_PATH] = "";
-- 
cgit v1.2.3