diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-09 20:03:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-09 20:03:46 +0000 |
| commit | bcb27264ba737778e5d3edad36088bacf74f0236 (patch) | |
| tree | fd1f57744dd380b7babe312a0ab5dc60b48854f2 /plugins/DbEditorPP/src/copymodule.cpp | |
| parent | 940231dc5a484b03a278900e1880aa083472b601 (diff) | |
- 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
Diffstat (limited to 'plugins/DbEditorPP/src/copymodule.cpp')
| -rw-r--r-- | plugins/DbEditorPP/src/copymodule.cpp | 66 |
1 files changed, 22 insertions, 44 deletions
diff --git a/plugins/DbEditorPP/src/copymodule.cpp b/plugins/DbEditorPP/src/copymodule.cpp index fe3ec781d6..9a9772edb4 100644 --- a/plugins/DbEditorPP/src/copymodule.cpp +++ b/plugins/DbEditorPP/src/copymodule.cpp @@ -45,10 +45,7 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara {
int index, loaded;
char szProto[256];
- HANDLE hContact = db_find_first();
-
- while (hContact)
- {
+ for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
if (GetValue(hContact,"Protocol","p",szProto,SIZEOF(szProto)))
loaded = IsProtocolLoaded(szProto);
else
@@ -56,10 +53,7 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara // filter
if ((loaded && Mode == MODE_UNLOADED) || (!loaded && Mode == MODE_LOADED))
- {
- hContact = db_find_next(hContact);
continue;
- }
// contacts name
DBVARIANT dbv ={0};
@@ -78,8 +72,7 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara else
mir_snwprintf(nick, SIZEOF(nick), L"%s (%s) %s", GetContactName(hContact, szProto, 1), protoW, L"(UNLOADED)");
}
- else
- wcscpy(nick, nick_unknownW);
+ else wcscpy(nick, nick_unknownW);
}
else {
if (Order)
@@ -90,8 +83,6 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara index = SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)nick);
SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_SETITEMDATA, index, (LPARAM)hContact);
-
- hContact = db_find_next(hContact);
}
index = (int)SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_INSERTSTRING, 0, (LPARAM)(char*)Translate("Settings"));
@@ -101,46 +92,33 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara SetWindowLongPtr(hwnd,GWLP_USERDATA,lParam);
TranslateDialogDefault(hwnd);
}
- else
- if (msg == WM_COMMAND)
+ else if (msg == WM_COMMAND)
{
- switch(LOWORD(wParam))
- {
- case CHK_COPY2ALL:
- EnableWindow(GetDlgItem(hwnd, IDC_CONTACTS),!IsDlgButtonChecked(hwnd,CHK_COPY2ALL));
+ switch(LOWORD(wParam)) {
+ case CHK_COPY2ALL:
+ EnableWindow(GetDlgItem(hwnd, IDC_CONTACTS),!IsDlgButtonChecked(hwnd,CHK_COPY2ALL));
break;
- case IDOK:
- {
- HANDLE hContact;
- if (!IsDlgButtonChecked(hwnd,CHK_COPY2ALL))
- {
- hContact = (HANDLE)SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETITEMDATA, SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETCURSEL, 0, 0), 0);
+ case IDOK:
+ if (!IsDlgButtonChecked(hwnd,CHK_COPY2ALL)) {
+ HANDLE hContact = (HANDLE)SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETITEMDATA, SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETCURSEL, 0, 0), 0);
+ copyModule(mac->module, mac->hContact, hContact);
+ }
+ else {
+ SetCursor(LoadCursor(NULL,IDC_WAIT));
+ for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
copyModule(mac->module, mac->hContact, hContact);
- }
- else
- {
- SetCursor(LoadCursor(NULL,IDC_WAIT));
- hContact = db_find_first();
-
- while (hContact)
- {
- copyModule(mac->module, mac->hContact, hContact);
- hContact = db_find_next(hContact);
- }
- SetCursor(LoadCursor(NULL,IDC_ARROW));
- }
- mir_free(mac);
- refreshTree(1);
- DestroyWindow(hwnd);
+ SetCursor(LoadCursor(NULL,IDC_ARROW));
}
+ mir_free(mac);
+ refreshTree(1);
+ DestroyWindow(hwnd);
break;
- case IDCANCEL:
- {
- mir_free(mac);
- DestroyWindow(hwnd);
- }
+
+ case IDCANCEL:
+ mir_free(mac);
+ DestroyWindow(hwnd);
break;
}
}
|