summaryrefslogtreecommitdiff
path: root/plugins/MirOTR
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-03-16 21:10:14 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-03-16 21:10:14 +0300
commit61b9b52fcc31ff4c0a533100c15f8d4fa7b2b93a (patch)
treebf06978de54d091be2b71ce5140ea69028dc8f3e /plugins/MirOTR
parent12225716d38830a23477b97a6979b6414faeec7b (diff)
class renaming, part II
Diffstat (limited to 'plugins/MirOTR')
-rw-r--r--plugins/MirOTR/src/dllmain.cpp2
-rw-r--r--plugins/MirOTR/src/options.cpp2
-rw-r--r--plugins/MirOTR/src/utils.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp
index e39ec14d2f..f3bc0c756c 100644
--- a/plugins/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/src/dllmain.cpp
@@ -82,7 +82,7 @@ extern "C" __declspec(dllexport) int Load(void)
// remove us as a filter to all contacts - fix filter type problem
if(db_get_b(0, MODULENAME, "FilterOrderFix", 0) != 2) {
- for (auto &hContact : contact_iter())
+ for (auto &hContact : Contacts())
Proto_RemoveFromContact(hContact, MODULENAME);
db_set_b(0, MODULENAME, "FilterOrderFix", 2);
}
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index 8f57399a2d..c458cce276 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -548,7 +548,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsContacts(HWND hwndDlg, UINT msg, WPARAM
// items.
lvI.mask = LVIF_TEXT | LVIF_PARAM;// | LVIF_NORECOMPUTE;// | LVIF_IMAGE;
- for (auto &hContact : contact_iter()) {
+ for (auto &hContact : Contacts()) {
const char *proto = GetContactProto(hContact);
if (proto && db_get_b(hContact, proto, "ChatRoom", 0) == 0 && Proto_IsProtoOnContact(hContact, MODULENAME) // ignore chatrooms
&& mir_strcmp(proto, META_PROTO) != 0) // and MetaContacts
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index 5c0c9d922e..acad664c75 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -9,7 +9,7 @@ void lib_cs_lock()
MCONTACT find_contact(const char* userid, const char* protocol)
{
- for (auto &hContact : contact_iter()) {
+ for (auto &hContact : Contacts()) {
const char *proto = GetContactProto(hContact);
if(proto && mir_strcmp(proto, protocol) == 0) {
char *name = contact_get_id(hContact);