From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:04:30 +0000
Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat
 constants to avoid name conflicts

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

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

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 642f73bb4d..0c621f7169 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -11,7 +11,7 @@ int hLangpack;
 BYTE nameOrder[NAMEORDERCOUNT];
 HGENMENU hUserMenu;
 WatchListArrayStruct WatchListArray;
-HANDLE hRestore;
+HCONTACT hRestore;
 HANDLE sMenuCommand, sImport, sServicemodeLaunch;
 HANDLE hModulesLoadedHook = NULL, hSettingsChangedHook=NULL, hOptInitHook=NULL, hPreShutdownHook=NULL;
 
@@ -51,12 +51,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	return TRUE;
 }
 
-void settingChanged(HWND hwnd2Settings, HANDLE hContact, char* module, char* setting);
+void settingChanged(HWND hwnd2Settings, HCONTACT hContact, char* module, char* setting);
 
 int DBSettingChanged(WPARAM wParam,LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;
-	HANDLE hContact = (HANDLE)wParam;
+	HCONTACT hContact = (HCONTACT)wParam;
 	char *setting;
 	SettingListInfo* info;
 
@@ -106,7 +106,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam)
 INT_PTR DBEditorppMenuCommand(WPARAM wParam, LPARAM lParam)
 {
 	if (!hwnd2mainWindow) { // so only opens 1 at a time
-	    hRestore = (HANDLE)wParam;
+		hRestore = (HCONTACT)wParam;
 		SetCursor(LoadCursor(NULL,IDC_WAIT));
 		CreateDialog(hInst, MAKEINTRESOURCE(IDD_MAIN), 0, MainDlgProc);
 	}
@@ -114,7 +114,7 @@ INT_PTR DBEditorppMenuCommand(WPARAM wParam, LPARAM lParam)
 		ShowWindow(hwnd2mainWindow, SW_RESTORE);
 		SetForegroundWindow(hwnd2mainWindow);
 		if (!hRestore && wParam) {
-			hRestore = (HANDLE)wParam;
+			hRestore = (HCONTACT)wParam;
 			refreshTree(4);
 		}
 	}
@@ -225,7 +225,7 @@ INT_PTR ServiceMode(WPARAM wParam, LPARAM lParam)
 
 INT_PTR ImportFromFile(WPARAM wParam, LPARAM lParam)
 {
-	ImportSettingsFromFileMenuItem((HANDLE)wParam, (char*)lParam);
+	ImportSettingsFromFileMenuItem((HCONTACT)wParam, (char*)lParam);
 	return 0;
 }
 
@@ -267,7 +267,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 // db_get_s (prob shouldnt use this unless u know how big the string is gonna be..)
 //=======================================================
 
-int DBGetContactSettingStringStatic(HANDLE hContact, char* szModule, char* szSetting, char* value, int maxLength)
+int DBGetContactSettingStringStatic(HCONTACT hContact, char* szModule, char* szSetting, char* value, int maxLength)
 {
 	DBVARIANT dbv;
 	if (!db_get(hContact, szModule, szSetting, &dbv)) {
@@ -283,7 +283,7 @@ int DBGetContactSettingStringStatic(HANDLE hContact, char* szModule, char* szSet
 	return 0;
 }
 
-int WriteBlobFromString(HANDLE hContact,const char *szModule,const char *szSetting, const char *szValue, int len)
+int WriteBlobFromString(HCONTACT hContact,const char *szModule,const char *szSetting, const char *szValue, int len)
 {
 	int j=0, i = 0;
 	BYTE *data = NULL;
@@ -316,12 +316,12 @@ int WriteBlobFromString(HANDLE hContact,const char *szModule,const char *szSetti
 	return 0;
 }
 
-int GetSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)
+int GetSetting(HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)
 {
 	return db_get_s(hContact, szModule, szSetting, dbv, 0);
 }
 
-int GetValue(HANDLE hContact, const char* szModule, const char* szSetting, char* Value, int length)
+int GetValue(HCONTACT hContact, const char* szModule, const char* szSetting, char* Value, int length)
 {
 	DBVARIANT dbv = {0};
 
@@ -361,7 +361,7 @@ int GetValue(HANDLE hContact, const char* szModule, const char* szSetting, char*
 	return 0;
 }
 
-int GetValueW(HANDLE hContact, const char* szModule, const char* szSetting, WCHAR* Value, int length)
+int GetValueW(HCONTACT hContact, const char* szModule, const char* szSetting, WCHAR* Value, int length)
 {
 	DBVARIANT dbv = { 0 };
 	WCHAR *wc;
@@ -435,7 +435,7 @@ wchar_t* a2u(char* src, wchar_t *buffer, int len)
 	return result;
 }
 
-int GetDatabaseString(HANDLE hContact, const char *szModule, const char* szSetting, WCHAR *Value, int length, BOOL unicode)
+int GetDatabaseString(HCONTACT hContact, const char *szModule, const char* szSetting, WCHAR *Value, int length, BOOL unicode)
 {
 	if (unicode)
 		return GetValueW(hContact, szModule, szSetting, Value, length);
@@ -443,7 +443,7 @@ int GetDatabaseString(HANDLE hContact, const char *szModule, const char* szSetti
 		return GetValue(hContact, szModule, szSetting, (char*)Value, length);
 }
 
-WCHAR* GetContactName(HANDLE hContact, const char *szProto, int unicode)
+WCHAR* GetContactName(HCONTACT hContact, const char *szProto, int unicode)
 {
 	int i, r = 0;
 	static WCHAR res[512];
-- 
cgit v1.2.3