From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Sessions/Src/Main.cpp | 16 +++++-----------
plugins/Sessions/Src/Options.cpp | 14 +++++---------
2 files changed, 10 insertions(+), 20 deletions(-)
(limited to 'plugins/Sessions')
diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index f422608a58..3ead9ab314 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -219,19 +219,15 @@ INT_PTR CALLBACK SaveSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
case IDOK:
{
DWORD session_list_temp[255]={0};
- int lenght,i;
+ int lenght,i = 0;
TCHAR szUserSessionName[MAX_PATH];
lenght = GetWindowTextLength(GetDlgItem(hdlg, IDC_LIST));
SavePosition(hdlg, "SaveDlg");
- if (lenght>0)
- {
+ if (lenght>0) {
GetWindowText(GetDlgItem(hdlg, IDC_LIST), szUserSessionName, SIZEOF(szUserSessionName));
szUserSessionName[lenght+1]='\0';
- if (IsDlgButtonChecked(hdlg,IDC_SELCONTACTS)&&bSC)
- {
- HANDLE hContact = db_find_first();
- for (i=0; hContact; hContact = db_find_next(hContact))
- {
+ if (IsDlgButtonChecked(hdlg,IDC_SELCONTACTS)&&bSC) {
+ for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
BYTE res =(BYTE)SendMessage(hClistControl, CLM_GETCHECKMARK, SendMessage(hClistControl, CLM_FINDCONTACT, (WPARAM)hContact, 0), 0);
if (res) {
user_session_list[i] = hContact;
@@ -722,9 +718,7 @@ int DeleteAutoSession(int ses_count)
TCHAR *szSessionNameBuf=NULL;
- for (hContact = db_find_first(); hContact;
- hContact = db_find_next(hContact))
- {
+ for (hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
RemoveSessionMark(hContact,0,ses_count);
SetInSessionOrder(hContact,0,ses_count,0);
}
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp
index 926d641226..fe8a8a2e59 100644
--- a/plugins/Sessions/Src/Options.cpp
+++ b/plugins/Sessions/Src/Options.cpp
@@ -319,16 +319,12 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
if (!hOpClistControl)
EnableWindow(GetDlgItem(hdlg,IDC_DEL),TRUE);
else {
- int i;
- HANDLE hContact = db_find_first();
-
- for ( ; hContact; hContact = db_find_next(hContact))
+ for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
SendMessage(hOpClistControl, CLM_SETCHECKMARK, (WPARAM)hContact,0);
- for (i=0 ; session_list_t[i]>0; i++)
- {
- hContact=(HANDLE)SendMessage(hOpClistControl,CLM_FINDCONTACT, (WPARAM)session_list_t[i], 0);
- //hItem=session_list[i];
- SendMessage(hOpClistControl, CLM_SETCHECKMARK, (WPARAM)hContact,1);
+
+ for (int i=0 ; session_list_t[i] > 0; i++) {
+ HANDLE hContact = (HANDLE)SendMessage(hOpClistControl,CLM_FINDCONTACT, (WPARAM)session_list_t[i], 0);
+ SendMessage(hOpClistControl, CLM_SETCHECKMARK, (WPARAM)hContact, 1);
}
EnableWindow(GetDlgItem(hdlg,IDC_SAVE),FALSE);
}
--
cgit v1.2.3