diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-15 21:05:06 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-15 21:05:06 +0300 |
| commit | 59e6b15f513cc998ce13e9e49e2a6a3ace445ebb (patch) | |
| tree | af52b73a17039ed1fbe398ba9f488c26a7071257 /plugins/SmileyAdd | |
| parent | bdaa5cf8b48515af2ac39f3f3245dd1183cbad52 (diff) | |
LIST<> iterators:
- new method LIST::removeItem added to save a pointer to removed record;
- code cleaning related to the fact that LIST::remove() shall be the last operation inside an iterator, because otherwise the reference to it will point to a record next to deleted one;
- a few remaining cycles converted to iterators
Diffstat (limited to 'plugins/SmileyAdd')
| -rw-r--r-- | plugins/SmileyAdd/src/download.cpp | 5 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp index 7633dffab0..306b980276 100644 --- a/plugins/SmileyAdd/src/download.cpp +++ b/plugins/SmileyAdd/src/download.cpp @@ -136,7 +136,10 @@ void __cdecl SmileyDownloadThread(void*) WaitForSingleObject(g_hDlMutex, 3000);
CMStringW fname(dlQueue[0].fname);
- if (dlQueue[0].needext) { fname += GetImageExt(fname); needext = true; }
+ if (dlQueue[0].needext) {
+ fname += GetImageExt(fname);
+ needext = true;
+ }
_wrename(dlQueue[0].fname.c_str(), fname.c_str());
}
else WaitForSingleObject(g_hDlMutex, 3000);
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 16de9ebdf9..5b07d56bd4 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -762,9 +762,9 @@ void SmileyCategoryListType::DeleteAccountAsCategory(PROTOACCOUNT *acc) }
}
- for (int i = 0; i < m_SmileyCategories.getCount(); i++) {
- if (tname.CompareNoCase(m_SmileyCategories[i].GetName()) == 0) {
- m_SmileyCategories.remove(i);
+ for (auto &it : m_SmileyCategories) {
+ if (tname.CompareNoCase(it->GetName()) == 0) {
+ m_SmileyCategories.removeItem(&it);
break;
}
}
|