we don't need that FindItem's implementation in nicer+ anymore, it's already in the core

git-svn-id: http://svn.miranda-ng.org/main/trunk@16791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 32 insertions, 32 deletions

diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 1a2177a73a..7acf5e11b7 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -1711,9 +1711,9 @@ static int _us_DoRemoveFrame(WPARAM wParam, LPARAM)
 	g_pfwFrames[pos].OwnerWindow = NULL;

 	RemoveItemFromList(pos, &g_pfwFrames, &g_nFramesCount);

 

-	CLUI__cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

+	cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

 	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

-	CLUI__cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

+	cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

 

 	return 0;

 };

@@ -2332,7 +2332,7 @@ int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam)
 

 	tick = GetTickCount() - tick;

 

-	if (pcli->hwndContactList != 0) CLUI__cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

+	if (pcli->hwndContactList != 0) cliInvalidateRect(pcli->hwndContactList, NULL, TRUE);

 	if (pcli->hwndContactList != 0) UpdateWindow(pcli->hwndContactList);

 

 	if (lParam == 2) RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE);

@@ -2370,7 +2370,7 @@ int OnFrameTitleBarBackgroundChange(WPARAM, LPARAM)
 		}

 	}

 

-	CLUI__cliInvalidateRect(pcli->hwndContactList, 0, 0);

+	cliInvalidateRect(pcli->hwndContactList, 0, 0);

 

 	RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE);

 	return 0;

@@ -2607,7 +2607,8 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 		return 1;

 

 	case WM_ENABLE:

-		if (hwnd != 0) CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+		if (hwnd != 0)

+			cliInvalidateRect(hwnd, NULL, FALSE);

 		return 0;

 

 	case WM_ERASEBKGND:

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 0ddd291b3a..236275a2a0 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -153,7 +153,7 @@ static HRESULT SubclassClistInterface()
 	pcli->pfnGetRowHeight = cliGetRowHeight;

 	pcli->pfnGetRowTopY = cliGetRowTopY;

 	pcli->pfnGetRowTotalHeight = cliGetRowTotalHeight;

-	pcli->pfnInvalidateRect = CLUI__cliInvalidateRect;

+	pcli->pfnInvalidateRect = cliInvalidateRect;

 	pcli->pfnOnCreateClc = CLUI::cliOnCreateClc;

 	pcli->pfnPaintClc = CLCPaint::cliPaintClc;

 	pcli->pfnRebuildEntireList = cliRebuildEntireList;

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 34b0e84474..f1746e74a1 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -586,7 +586,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 		if (dat->selection < 0) dat->selection = 0;

 		if (dat->bCompactMode)

 			SendMessage(hwnd, WM_SIZE, 0, 0);

-		CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+		cliInvalidateRect(hwnd, NULL, FALSE);

 		pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);

 		UpdateWindow(hwnd);

 		SetCapture(hwnd);

@@ -618,7 +618,7 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR
 		{

 			time_t cur_time = (time(NULL) / 60);

 			if (cur_time != dat->last_tick_time) {

-				CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+				cliInvalidateRect(hwnd, NULL, FALSE);

 				dat->last_tick_time = cur_time;

 			}

 		}

@@ -773,7 +773,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 			if (dat->bCompactMode)

 				SendMessage(hwnd, WM_SIZE, 0, 0);

 			else {

-				CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+				cliInvalidateRect(hwnd, NULL, FALSE);

 				UpdateWindow(hwnd);

 			}

 			return TRUE;

@@ -787,7 +787,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 			else

 				pcli->pfnSetContactCheckboxes(contact, bNewState);

 			pcli->pfnRecalculateGroupCheckboxes(hwnd, dat);

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+			cliInvalidateRect(hwnd, NULL, FALSE);

 

 			NMCLISTCONTROL nm;

 			nm.hdr.code = CLN_CHECKCHANGED;

@@ -814,7 +814,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 			return FALSE;

 

 		dat->selection = (hitFlags & CLCHT_NOWHERE) ? -1 : hit;

-		CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+		cliInvalidateRect(hwnd, NULL, FALSE);

 

 		UpdateWindow(hwnd);

 		if (dat->selection != -1 && (contact->type == CLCIT_CONTACT || contact->type == CLCIT_GROUP) && !(hitFlags & (CLCHT_ONITEMEXTRA | CLCHT_ONITEMCHECK | CLCHT_NOWHERE))) {

@@ -940,7 +940,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 

 		POINT pt = UNPACK_POINT(lParam);

 		HCURSOR hNewCursor = LoadCursor(NULL, IDC_NO);

-		CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+		cliInvalidateRect(hwnd, NULL, FALSE);

 		if (dat->dragAutoScrolling) {

 			KillTimer(hwnd, TIMERID_DRAGAUTOSCROLL);

 			dat->dragAutoScrolling = 0;

@@ -1263,7 +1263,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 		}

 	}

 

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	dat->iDragItem = -1;

 	dat->iInsertionMark = -1;

 	return 0;

@@ -1425,9 +1425,9 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam
 	}

 	else if (needRepaint) {

 		if (contact && contact->pos_icon.bottom != 0 && contact->pos_icon.right != 0)

-			CLUI__cliInvalidateRect(hwnd, &(contact->pos_icon), FALSE);

+			cliInvalidateRect(hwnd, &contact->pos_icon, FALSE);

 		else

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+			cliInvalidateRect(hwnd, NULL, FALSE);

 		//try only needed rectangle

 	}

 

@@ -1442,7 +1442,7 @@ static LRESULT clcOnIntmAvatarChanged(ClcData *dat, HWND hwnd, UINT, WPARAM hCon
 	else if (hContact == 0)

 		UpdateAllAvatars(dat);

 

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	return 0;

 }

 

@@ -1518,7 +1518,7 @@ static LRESULT clcOnIntmNotOnListChanged(ClcData *dat, HWND hwnd, UINT msg, WPAR
 	else

 		contact->flags |= CONTACTF_NOTONLIST;

 

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 }

 

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 5e372e365d..2b889619b8 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -56,7 +56,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 		RowHeights_GetMaxRowHeight(dat, hwnd);

 

 		if (LOWORD(lParam))

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+			cliInvalidateRect(hwnd, NULL, FALSE);

 		return 0;

 

 	case CLM_SETHIDEEMPTYGROUPS:

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index c172e89ed1..2843dd748d 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -180,7 +180,7 @@ void cliScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth)
 		}

 	}

 	dat->yScroll = desty;

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	SetScrollPos(hwnd, SB_VERT, dat->yScroll, TRUE);

 }

 

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 9fc3867367..52752fdf3b 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -146,7 +146,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 		}

 	}

 

-	CLUI__cliInvalidateRect(g_CluiData.hwndEventFrame, NULL, FALSE);

+	cliInvalidateRect(g_CluiData.hwndEventFrame, NULL, FALSE);

 	return p;

 }

 

@@ -189,7 +189,7 @@ int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)
 

 	if (hContact == g_CluiData.hUpdateContact || (INT_PTR)hDbEvent == 1)

 		g_CluiData.hUpdateContact = 0;

-	CLUI__cliInvalidateRect(g_CluiData.hwndEventFrame, NULL, FALSE);

+	cliInvalidateRect(g_CluiData.hwndEventFrame, NULL, FALSE);

 	return res;

 }

 

@@ -291,7 +291,7 @@ static int EventArea_Draw(HWND hwnd, HDC hDC)
 	if (GetParent(hwnd) == pcli->hwndContactList)

 		return EventArea_DrawWorker(hwnd, hDC);

 

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	return 0;

 }

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 74ff3c3c80..ab054410b0 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -174,7 +174,7 @@ int CLUI::OnEvent_FontReload(WPARAM wParam, LPARAM lParam)
 

 	g_CluiData.dwKeyColor = db_get_dw(NULL, "ModernSettings", "KeyColor", (DWORD)SETTING_KEYCOLOR_DEFAULT);

 

-	CLUI__cliInvalidateRect(pcli->hwndContactList, 0, 0);

+	cliInvalidateRect(pcli->hwndContactList, 0, 0);

 	return 0;

 }

 

@@ -1486,7 +1486,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 	return 0;

 }

 

-BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)

+BOOL cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)

 {

 	if (CLUI_IsInMainWindow(hWnd) && g_CluiData.fLayered) {

 		if (IsWindowVisible(hWnd))

diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h
index d6f5af45df..ff65753ae4 100644
--- a/plugins/Clist_modern/src/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/modern_commonprototypes.h
@@ -252,7 +252,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 CListEvent* cli_AddEvent(CLISTEVENT *cle);

 LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 int     cliShowHide(WPARAM wParam, LPARAM lParam);

-BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT *lpRect, BOOL bErase);

+BOOL    cliInvalidateRect(HWND hWnd, CONST RECT *lpRect, BOOL bErase);

 int     cliCompareContacts(const ClcContact *contact1, const ClcContact *contact2);

 int     cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

 int     cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);

@@ -261,9 +261,8 @@ void    cliInvalidateDisplayNameCacheEntry(MCONTACT hContact);
 void    cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);

 void    CLUI_cli_LoadCluiGlobalOpts(void);

 INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);

-BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT *lpRect, BOOL bErase);

-int		cliTrayIconInit(HWND hwnd);

-int		cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);

+int     cliTrayIconInit(HWND hwnd);

+int     cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);

 

 ClcContact*    cliCreateClcContact(void);

 ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact);

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 95a4658dc2..6c272b4202 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -140,7 +140,7 @@ int ModernDrawStatusBar(HWND hwnd, HDC hDC)
 	if (GetParent(hwnd) == pcli->hwndContactList)

 		return ModernDrawStatusBarWorker(hwnd, hDC);

 

-	CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+	cliInvalidateRect(hwnd, NULL, FALSE);

 	return 0;

 }

 

@@ -822,7 +822,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 						ApplyViewMode(filterName);

 					}

 					pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

-					CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+					cliInvalidateRect(hwnd, NULL, FALSE);

 					SetCapture(NULL);

 					return 0;

 				}

@@ -854,7 +854,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 		GetClientRect(hwnd, &rc);

 		if (PtInRect(&rc, pt) && msg == WM_LBUTTONDOWN && g_CluiData.bFilterEffective == CLVM_FILTER_PROTOS) {

 			ApplyViewMode("");

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+			cliInvalidateRect(hwnd, NULL, FALSE);

 			SetCapture(NULL);

 			return 0;

 		}

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index a48543b1b1..29c2b1ac77 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1365,7 +1365,7 @@ void ApplyViewMode(const char *Name, bool onlySelector)
 	SetWindowText(hwndSelector, ptrT(mir_utf8decodeW((Name[0] == 13) ? Name + 1 : Name)));

 

 	pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

-	CLUI__cliInvalidateRect(pcli->hwndStatus, NULL, FALSE);

+	cliInvalidateRect(pcli->hwndStatus, NULL, FALSE);

 }

 

 static int SkinSetViewMode(WPARAM wParam /*char * name*/, LPARAM lParam /*int index*/)