From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 9 Apr 2013 20:03:46 +0000 Subject: - 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 --- plugins/HistorySweeperLight/src/historysweeperlight.cpp | 8 +------- plugins/HistorySweeperLight/src/main.cpp | 9 ++------- plugins/HistorySweeperLight/src/options.cpp | 17 ++++++----------- 3 files changed, 9 insertions(+), 25 deletions(-) (limited to 'plugins/HistorySweeperLight/src') diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp index 70be70347b..2adbec5872 100644 --- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp +++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp @@ -209,19 +209,13 @@ void SweepHistoryFromContact(HANDLE hContact, CriteriaStruct Criteria, BOOL keep void ShutdownAction(void) { CriteriaStruct Criteria; - HANDLE hContact = db_find_first(); - Criteria.keep = KeepCriteria(db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)); Criteria.time = BuildCriteria(db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)); SweepHistoryFromContact(NULL, Criteria, FALSE); // sweep system history, keepunread==0 - while ( hContact != NULL ) - { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) SweepHistoryFromContact(hContact, Criteria, TRUE); // sweep contact history, keepunread==1 - - hContact = db_find_next(hContact); // go to next contact - } } int OnWindowEvent(WPARAM wParam, LPARAM lParam) diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp index 3508a6b8dc..0e96e3ad6f 100644 --- a/plugins/HistorySweeperLight/src/main.cpp +++ b/plugins/HistorySweeperLight/src/main.cpp @@ -77,7 +77,6 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { StatusIconData sid = {0}; int i, sweep = db_get_b(NULL, ModuleName, "SweepHistory", 0); - HANDLE hContact = db_find_first(); sid.cbSize = sizeof(sid); sid.szModule = ModuleName; @@ -119,8 +118,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid); // for new contacts - while ( hContact != NULL ) - { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { ZeroMemory(&sid,sizeof(sid)); sweep = db_get_b(hContact, ModuleName, "SweepHistory", 0); @@ -128,14 +126,11 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) sid.cbSize = sizeof(sid); sid.szModule = ModuleName; - for(i = 0; i < 4; i++) - { + for(i = 0; i < 4; i++) { sid.dwId = i; sid.flags = (sweep == i) ? 0 : MBF_HIDDEN; CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid); } - - hContact = db_find_next(hContact); } hHooks[2] = HookEvent(ME_MSG_WINDOWEVENT, OnWindowEvent); diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index d77d4946f9..06686fe2d6 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -102,17 +102,13 @@ void ResetListOptions(HWND hwndList) static void ShowAllContactIcons(HWND hwndList) { - HANDLE hContact, hItem; - SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hAllContacts, MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepHistory", 0))); SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hSystemHistory, MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepSHistory", 0))); - for (hContact=db_find_first(); hContact; - hContact=db_find_next(hContact)) - { - hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); + for (HANDLE 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))); } @@ -161,7 +157,8 @@ void LoadSettings(HWND hwndDlg) void SaveSettings(HWND hwndDlg) { - int st, i; StatusIconData sid = {0}; HANDLE hContact, hItem; HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST); + int st, i; StatusIconData sid = {0}; + HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST); db_set_b(NULL, ModuleName, "StartupShutdownOlder", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_GETCURSEL, 0, 0)); db_set_b(NULL, ModuleName, "StartupShutdownKeep", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_GETCURSEL, 0, 0)); @@ -177,10 +174,8 @@ void SaveSettings(HWND hwndDlg) db_set_b(NULL, ModuleName, "SweepSHistory", (BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hSystemHistory, 0)); - for (hContact=db_find_first(); hContact; - hContact=db_find_next(hContact)) - { - hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); + for (HANDLE 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); if ( st != 0 ) db_set_b(hContact, ModuleName, "SweepHistory", (BYTE)st); -- cgit v1.2.3