summaryrefslogtreecommitdiff
path: root/plugins/Msg_Export
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-09 20:03:46 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-09 20:03:46 +0000
commitbcb27264ba737778e5d3edad36088bacf74f0236 (patch)
treefd1f57744dd380b7babe312a0ab5dc60b48854f2 /plugins/Msg_Export
parent940231dc5a484b03a278900e1880aa083472b601 (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/Msg_Export')
-rwxr-xr-xplugins/Msg_Export/src/utils.cpp23
1 files changed, 5 insertions, 18 deletions
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(),