- 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

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
index d39293a87a..5c44ba7852 100644
--- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
@@ -93,7 +93,7 @@ static int CompareBookmarks( const void* p1, const void* p2 )
 	return (BYTE*)((BEventData*)p1)->hDBEvent - (BYTE*)((BEventData*)p2)->hDBEvent;

 }

 

-static void GetBookmarks(HANDLE hContact, BEventData** books, size_t* bookcnt )

+static void GetBookmarks(HCONTACT hContact, BEventData** books, size_t* bookcnt )

 {

 	*books = NULL;

 	*bookcnt = 0;

@@ -132,7 +132,7 @@ static void GetBookmarks(HANDLE hContact, BEventData** books, size_t* bookcnt )
 }

 

 //Sweep history from specified contact

-void SweepHistoryFromContact(HANDLE hContact, CriteriaStruct Criteria, BOOL keepUnread)

+void SweepHistoryFromContact(HCONTACT hContact, CriteriaStruct Criteria, BOOL keepUnread)

 {

 	int lPolicy;	

 	if (hContact == NULL)			// for system history

@@ -209,7 +209,7 @@ void ShutdownAction(void)
 

 	SweepHistoryFromContact(NULL, Criteria, FALSE);				// sweep system history, keepunread==0

 	

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		SweepHistoryFromContact(hContact, Criteria, TRUE);		// sweep contact history, keepunread==1

 }

 

diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index 3f3bfa84a1..438d09c5f7 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -53,7 +53,7 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam)
 	if ( !(sicd->flags & MBCF_RIGHTBUTTON) && !lstrcmpA(sicd->szModule, ModuleName) 

 		&& db_get_b(NULL, ModuleName, "ChangeInMW", 0))

 	{

-		int nh = sicd->dwId; HANDLE hContact = (HANDLE)wParam; 

+		int nh = sicd->dwId; HCONTACT hContact = (HCONTACT)wParam; 

 		

 		StatusIconData sid = { sizeof(sid) };

 		sid.szModule = ModuleName;

@@ -62,7 +62,7 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam)
 		Srmm_ModifyIcon(hContact, &sid);	

 		

 		nh = (nh + 1) % 4;

-		db_set_b((HANDLE)wParam, ModuleName, "SweepHistory", (BYTE)nh);

+		db_set_b((HCONTACT)wParam, ModuleName, "SweepHistory", (BYTE)nh);

 

 		sid.dwId = nh;

 		sid.flags = 0;

@@ -111,7 +111,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	Srmm_AddIcon(&sid);

 	

 	// for new contacts

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		ZeroMemory(&sid,sizeof(sid));

 

 		sweep = db_get_b(hContact, ModuleName, "SweepHistory", 0);

diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp
index 45541bbfa7..1d8cc4d4f0 100644
--- a/plugins/HistorySweeperLight/src/options.cpp
+++ b/plugins/HistorySweeperLight/src/options.cpp
@@ -107,7 +107,7 @@ static void ShowAllContactIcons(HWND hwndList)
 	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hSystemHistory,

 											MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepSHistory", 0)));

 

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem,

 											MAKELPARAM(0, db_get_b(hContact, ModuleName, "SweepHistory", 0)));

@@ -174,7 +174,7 @@ void SaveSettings(HWND hwndDlg)
 	db_set_b(NULL, ModuleName, "SweepSHistory",

 											(BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hSystemHistory, 0));

 

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 

 		st = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, 0);