- 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, 11 insertions, 23 deletions

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index 4d16183422..ef236d16b4 100755
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -95,11 +95,9 @@ void setSrmmIcon(HANDLE h)
 void RefreshContactListIcons() 

 {

 	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);

-	HANDLE hContact = db_find_first();

-	while (hContact) 

-	{

+

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

 		setClistIcon(hContact);

-		hContact = db_find_next(hContact);

-	}

+

 	CallService(MS_CLUI_LISTENDREBUILD,0,0);

 }

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 2c9f05b3e8..46a0aaa475 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -243,8 +243,6 @@ extern "C" int __declspec(dllexport) Load()
 extern list<wstring> transfers;

 extern "C" int __declspec(dllexport) Unload(void)

 {

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

-//		db_unset(hContact, szGPGModuleName, "KeyID_Prescense");

 	if(!transfers.empty())

 	{

 		for(list<wstring>::iterator p = transfers.begin(); p != transfers.end(); p++)

diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 26c7fd010e..eb65fc8184 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -145,10 +145,8 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
 		int i = 1, iRow = 0;
 		bool isContactHaveKey(HANDLE);
-		for(HANDLE hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))
-		{
-			if(isContactHaveKey(hContact))
-			{
+		for(HANDLE hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact)) {
+			if(isContactHaveKey(hContact)) {
 				TCHAR *name = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
 				item.mask = LVIF_TEXT;
 				item.iItem = i;
@@ -241,13 +239,10 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  ismetacontact = true;
 			  }
 			  tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", "");
-			  for(HANDLE hcnttmp = db_find_first(); hcnttmp != NULL; hcnttmp = db_find_next(hcnttmp))
-			  {
-				  if(hcnttmp != hContact)
-				  {
+			  for(HANDLE hcnttmp = db_find_first(); hcnttmp != NULL; hcnttmp = db_find_next(hcnttmp)) {
+				  if(hcnttmp != hContact) {
 					  char *tmp2 = UniGetContactSettingUtf(hcnttmp, szGPGModuleName, "KeyID", "");
-					  if(!strcmp(tmp, tmp2))
-					  {
+					  if(!strcmp(tmp, tmp2)) {
 						  mir_free(tmp2);
 						  keep = true;
 						  break;
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 51f9bb8312..aa43bb7a50 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -1392,10 +1392,8 @@ void ExportGpGKeysFunc(int type)
 	int exported_keys = 0;

 	if(!file.is_open())

 		return; //TODO: handle error

-	if(!type || type == 2)

-	{

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

-		{

+	if(!type || type == 2) {

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

 			char *k = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", "");

 			if(!k[0])

 			{

@@ -1693,8 +1691,7 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)
 			if(acc.length())

 			{

 				const char * uid = (const char*)CallProtoService(acc.c_str(), PS_GETCAPS,  (WPARAM)PFLAG_UNIQUEIDSETTING, 0);

-				for(HANDLE hContact = db_find_first(acc.c_str()); hContact; hContact = db_find_next(hContact, acc.c_str()))

-				{

+				for(HANDLE hContact = db_find_first(acc.c_str()); hContact; hContact = db_find_next(hContact, acc.c_str())) {

 					DBVARIANT dbv = {0};

 					DBCONTACTGETSETTING dbcgs = {0};

 					dbcgs.pValue = &dbv;