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/Msg_Export/src/utils.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'plugins/Msg_Export/src') diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index b525503d2a..97888172ce 100755 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -899,18 +899,11 @@ void UpdateFileToColWidth() { clFileTo1ColWidth.clear(); - HANDLE hContact = db_find_first(); - for(;;) - { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { tstring sNick = NickFromHandle( hContact ); string::size_type &rnValue = clFileTo1ColWidth[ GetFilePathFromUser( hContact) ]; if (rnValue < sNick.size()) rnValue = sNick.size(); - - if ( !hContact ) - break; - - hContact = db_find_next(hContact); } } @@ -1602,16 +1595,10 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/) tstring sFilePath = GetFilePathFromUser( hContact ); - { // Test if there is another user using this file - for(HANDLE hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact)) - { - if (hContact != hOtherContact && sFilePath == GetFilePathFromUser( hOtherContact)) - { - return 0; // we found another contact abort mission :-) - } - } - } - + // Test if there is another user using this file + for(HANDLE hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact)) + if (hContact != hOtherContact && sFilePath == GetFilePathFromUser( hOtherContact)) + return 0; // we found another contact abort mission :-) // Test to see if there is a file to delete HANDLE hPrevFile = CreateFile( sFilePath.c_str(), -- cgit v1.2.3