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/WhenWasIt/src/dlg_handlers.cpp | 6 ++---- plugins/WhenWasIt/src/notifiers.cpp | 4 +--- plugins/WhenWasIt/src/services.cpp | 5 +---- plugins/WhenWasIt/src/utils.cpp | 9 ++------- 4 files changed, 6 insertions(+), 18 deletions(-) (limited to 'plugins/WhenWasIt/src') diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index 790d766863..c13d4cc428 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -691,11 +691,9 @@ int LoadBirthdays(HWND hWnd, int bShowAll) ListView_DeleteAllItems(hList); int count = 0; - HANDLE hContact = db_find_first(); - while (hContact) { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) count = UpdateBirthdayEntry(hList, hContact, count, bShowAll, commonData.cShowAgeMode, 1); - hContact = db_find_next(hContact); - } + SetBirthdaysCount(hWnd); return 0; } diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 15736f1951..4d02d6ff0e 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -221,13 +221,11 @@ int SoundNotifyBirthday(int dtb) //called with oldClistIcon != -1 from dlg_handlers whtn the extra icon slot changes. int RefreshAllContactListIcons(int oldClistIcon) { - HANDLE hContact = db_find_first(); - while (hContact != NULL) { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { if (oldClistIcon != -1) ExtraIcon_Clear(hWWIExtraIcons, hContact); RefreshContactListIcons(hContact); //will change bBirthdayFound if needed - hContact = db_find_next(hContact); } return 0; } diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index b7ee590882..dd61f51c49 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -334,8 +334,7 @@ int DoExport(TCHAR *fileName) _ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), TranslateT("Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n")); _ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), TranslateT("This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n")); - HANDLE hContact = db_find_first(); - while (hContact) { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { int year, month, day; GetContactDOB(hContact, year, month, day); if ( IsDOBValid(year, month, day)) { @@ -348,8 +347,6 @@ int DoExport(TCHAR *fileName) if (szHandle) free(szHandle); } - - hContact = db_find_next(hContact); } fclose(fout); diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 724b4331a4..323e63d979 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -219,20 +219,15 @@ TCHAR *GetContactID(HANDLE hContact, char *szProto) HANDLE GetContactFromID(TCHAR *szID, char *szProto) { - HANDLE hContact = db_find_first(); - - while (hContact) { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { char *m_szProto = GetContactProto(hContact); TCHAR *szHandle = GetContactID(hContact, szProto); - if (szHandle) - { + if (szHandle) { bool found = (!_tcsicmp(szHandle, szID) && !_stricmp(szProto, m_szProto)); free(szHandle); if (found) return hContact; } - - hContact = db_find_next(hContact); } return NULL; } -- cgit v1.2.3