- short function names allows to write database loops in one string;

- 'continue' operator can be used then;
- multiple bugs fixed in clists;
- code becomes much more compact;

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

4 files changed, 18 insertions, 46 deletions

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 6f49e7c97c..ebb3a8c3d8 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -171,8 +171,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat)
 		}

 	}

 

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (style & CLS_SHOWHIDDEN || !CLVM_GetContactHiddenStatus(hContact, NULL, dat)) {

 			ZeroMemory((void *)&dbv, sizeof(dbv));

 			if (cfg::getTString(hContact, "CList", "Group", &dbv))

@@ -196,7 +195,6 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat)
 				else AddContactToGroup(dat, group, hContact);

 			}

 		}

-		hContact = db_find_next(hContact);

 	}

 

 	if (style & CLS_HIDEEMPTYGROUPS) {

diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index b96be53a52..4c572e4a31 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -111,20 +111,17 @@ extern TCHAR g_ptszEventName[];
 

 void MF_UpdateThread(LPVOID)

 {

-	HANDLE hContact;

 	HANDLE hEvent = OpenEvent(EVENT_ALL_ACCESS, FALSE, g_ptszEventName);

 

 	WaitForSingleObject(hEvent, 20000);

 	ResetEvent(hEvent);

 

 	while(mf_updatethread_running) {

-		hContact = db_find_first();

-		while (hContact != NULL && mf_updatethread_running) {

+		for (HANDLE hContact = db_find_first(); hContact && mf_updatethread_running; hContact = db_find_next(hContact)) {

 			MF_CalcFrequency(hContact, 50, 1);

 			if (mf_updatethread_running)

 				WaitForSingleObject(hEvent, 5000);

 			ResetEvent(hEvent);

-			hContact = db_find_next(hContact);

 		}

 		if (mf_updatethread_running)

 			WaitForSingleObject(hEvent, 1000000);

@@ -137,7 +134,6 @@ static BOOL mc_hgh_removed = FALSE;
 

 void LoadContactTree(void)

 {

-	HANDLE hContact;

 	int i, status, hideOffline;

 	BOOL mc_disablehgh = ServiceExists(MS_MC_DISABLEHIDDENGROUP);

 	DBVARIANT dbv = {0};

@@ -151,8 +147,8 @@ void LoadContactTree(void)
 	}

 

 	hideOffline = cfg::getByte("CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

-	hContact = db_find_first();

-	while (hContact != NULL) {

+

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

 		status = GetContactStatus(hContact);

 		if ((!hideOffline || status != ID_STATUS_OFFLINE) && !CLVM_GetContactHiddenStatus(hContact, NULL, NULL))

 			pcli->pfnChangeContactIcon(hContact, IconFromStatusMode(GetContactProto(hContact), status, hContact, NULL), 1);

@@ -168,8 +164,6 @@ void LoadContactTree(void)
 		// build initial data for message frequency

 		if ( !bMsgFrequency)

 			MF_CalcFrequency(hContact, 100, 0);

-

-		hContact = db_find_next(hContact);

 	}

 	cfg::writeByte("CList", "fhistdata", 1);

 	mc_hgh_removed = TRUE;

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index a41f0f5ff6..7e4f351407 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1226,14 +1226,12 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 	char *p, *szProto, *uid, szItem[100];

 	char *szSections = reinterpret_cast<char *>(malloc(3002));

 	StatusItems_t *items = NULL, *this_item;

-	HANDLE hContact;

 	int i = 1;

 

 	char    file[MAX_PATH];

 	WideCharToMultiByte(CP_ACP, 0, tszFileName, MAX_PATH, file, MAX_PATH, 0, 0);

 	file[MAX_PATH - 1] = 0;

 

-

 	ReadItem(&default_item, "%Default", file);

 	ZeroMemory(szSections, 3000);

 	p = szSections;

@@ -1262,8 +1260,7 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 	}

 

 	if (items) {

-		hContact = db_find_first();

-		while(hContact) {

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

 			char UIN[40];

 			int j;

 

@@ -1318,7 +1315,6 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 					}

 				}

 			}

-			hContact = db_find_next(hContact);

 		}

 	}

 	free(szSections);

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index d574c00e11..e40564d3ee 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -144,17 +144,15 @@ static DWORD GetMaskForItem(HANDLE hItem)
 

 static void UpdateStickies()

 {

-	HANDLE hContact = db_find_first();

 	HANDLE hItem;

 	int i;

 

-	while(hContact) {

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

 		hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 		if (hItem)

 			SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, cfg::getByte(hContact, "CLVM", g_szModename, 0) ? 1 : 0);

 		DWORD localMask = HIWORD(cfg::getDword(hContact, "CLVM", g_szModename, 0));

 		UpdateClistItem(hItem, (localMask == 0 || localMask == stickyStatusMask) ? stickyStatusMask : localMask);

-		hContact = db_find_next(hContact);

 	}

 

 	for (i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

@@ -348,7 +346,7 @@ void SaveState()
 	HWND hwndList;

 	char *szModeName = NULL;

 	DWORD statusMask = 0;

-	HANDLE hContact, hItem;

+	HANDLE hItem;

 	DWORD operators = 0;

 

 	if (clvm_curItem == -1)

@@ -395,10 +393,10 @@ void SaveState()
 		}

 	}

 	hwndList = GetDlgItem(clvmHwnd, IDC_STATUSMODES);

-	for (i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+	for (i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

 		if (ListView_GetCheckState(hwndList, i - ID_STATUS_OFFLINE))

 			statusMask |= (1 << (i - ID_STATUS_OFFLINE));

-	}

+

 	iLen = SendMessageA(GetDlgItem(clvmHwnd, IDC_VIEWMODES), LB_GETTEXTLEN, clvm_curItem, 0);

 	if (iLen) {

 		unsigned int stickies = 0;

@@ -408,16 +406,10 @@ void SaveState()
 		szModeName = ( char* )malloc(iLen + 1);

 		if (szModeName) {

 			DWORD options, lmdat;

-			//char *vastring = NULL;

-			//int len = GetWindowTextLengthA(GetDlgItem(clvmHwnd, IDC_VARIABLES)) + 1;

-

-			//vastring = (char *)malloc(len);

-			//if (vastring)

-			//    GetDlgItemTextA(clvmHwnd, IDC_VARIABLES, vastring, len);

 			SendDlgItemMessageA(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szModeName);

 			dwGlobalMask = GetMaskForItem(hInfoItem);

-			hContact = db_find_first();

-			while(hContact) {

+		

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

 				hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 				if (hItem) {

 					if (SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {

@@ -425,13 +417,11 @@ void SaveState()
 						cfg::writeDword(hContact, "CLVM", szModeName, MAKELONG(1, (unsigned short)dwLocalMask));

 						stickies++;

 					}

-					else {

-						if (cfg::getDword(hContact, "CLVM", szModeName, 0))

-							cfg::writeDword(hContact, "CLVM", szModeName, 0);

-					}

+					else if (cfg::getDword(hContact, "CLVM", szModeName, 0))

+						cfg::writeDword(hContact, "CLVM", szModeName, 0);

 				}

-				hContact = db_find_next(hContact);

 			}

+

 			operators |= ((SendDlgItemMessage(clvmHwnd, IDC_PROTOGROUPOP, CB_GETCURSEL, 0, 0) == 1 ? CLVM_PROTOGROUP_OP : 0) |

 				(SendDlgItemMessage(clvmHwnd, IDC_GROUPSTATUSOP, CB_GETCURSEL, 0, 0) == 1 ? CLVM_GROUPSTATUS_OP : 0) |

 				(IsDlgButtonChecked(clvmHwnd, IDC_AUTOCLEAR) ? CLVM_AUTOCLEAR : 0) |

@@ -700,12 +690,10 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 								pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

 								SetWindowTextA(hwndSelector, Translate("No view mode"));

 							}

-							hContact = db_find_first();

-							while(hContact) {

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

 								if (cfg::getDword(hContact, "CLVM", szBuf, -1) != -1)

 									cfg::writeDword(hContact, "CLVM", szBuf, 0);

-								hContact = db_find_next(hContact);

-							}

+

 							SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_DELETESTRING, SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_GETCURSEL, 0, 0), 0);

 							if (SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, 0, 0) != LB_ERR) {

 								clvm_curItem = 0;

@@ -748,14 +736,10 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			}

 		case IDC_CLEARALL:

 			{

-				HANDLE hItem;

-				HANDLE hContact = db_find_first();

-

-				while(hContact) {

-					hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

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

+					HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 					if (hItem)

 						SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 0);

-					hContact = db_find_next(hContact);

 				}

 			}

 		case IDOK: