From 61b9b52fcc31ff4c0a533100c15f8d4fa7b2b93a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Mar 2018 21:10:14 +0300 Subject: class renaming, part II --- plugins/New_GPG/src/icons.cpp | 2 +- plugins/New_GPG/src/options.cpp | 4 ++-- plugins/New_GPG/src/utilities.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/New_GPG') diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp index 87faa64938..3f4925a08f 100755 --- a/plugins/New_GPG/src/icons.cpp +++ b/plugins/New_GPG/src/icons.cpp @@ -68,7 +68,7 @@ void setSrmmIcon(MCONTACT h) void RefreshContactListIcons() { - for (auto &hContact : contact_iter()) + for (auto &hContact : Contacts()) setClistIcon(hContact); Clist_EndRebuild(); diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 07e3840372..f9e1a71348 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -59,7 +59,7 @@ public: list_USERLIST.AddColumn(4, TranslateT("Protocol"), 60); list_USERLIST.SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_SINGLEROW); int i = 1; - for (auto &hContact : contact_iter()) { + for (auto &hContact : Contacts()) { if (isContactHaveKey(hContact)) { wchar_t *name = pcli->pfnGetContactDisplayName(hContact, 0); @@ -171,7 +171,7 @@ public: ismetacontact = true; } tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", ""); - for (auto &hcnttmp : contact_iter()) { + for (auto &hcnttmp : Contacts()) { if (hcnttmp != hContact) { char *tmp2 = UniGetContactSettingUtf(hcnttmp, szGPGModuleName, "KeyID", ""); if (!mir_strcmp(tmp, tmp2)) { diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 99eb4e35f7..a9acfe95af 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1249,7 +1249,7 @@ void ExportGpGKeysFunc(int type) if (!file.is_open()) return; //TODO: handle error if (!type || type == 2) { - for (auto &hContact : contact_iter()) { + for (auto &hContact : Contacts()) { char *k = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", ""); std::string key; if (!k[0]) { @@ -1531,7 +1531,7 @@ INT_PTR ImportGpGKeys(WPARAM, LPARAM) } if (acc.length()) { const char * uid = (const char*)CallProtoService(acc.c_str(), PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0); - for (auto &hContact : contact_iter(acc.c_str())) { + for (auto &hContact : Contacts(acc.c_str())) { DBVARIANT dbv = { 0 }; db_get(hContact, acc.c_str(), uid, &dbv); std::string id; -- cgit v1.2.3