summaryrefslogtreecommitdiff
path: root/protocols/Sametime
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 /protocols/Sametime
parent12225716d38830a23477b97a6979b6414faeec7b (diff)
class renaming, part II
Diffstat (limited to 'protocols/Sametime')
-rw-r--r--protocols/Sametime/src/sametime.cpp2
-rw-r--r--protocols/Sametime/src/session_announce_win.cpp2
-rw-r--r--protocols/Sametime/src/userlist.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 01770d382c..6f0d783b14 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -223,7 +223,7 @@ void CSametimeProto::SetAllOffline()
{
debugLogW(L"SetAllOffline() start");
- for (auto &hContact : acc_contact_iter()) {
+ for (auto &hContact : AccContacts()) {
if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0)) {
db_delete_contact(hContact);
continue;
diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp
index 50f564f1d3..6016e9df27 100644
--- a/protocols/Sametime/src/session_announce_win.cpp
+++ b/protocols/Sametime/src/session_announce_win.cpp
@@ -40,7 +40,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
lvI.iItem = 0;
lvI.iSubItem = 0;
- for (auto &hContact : proto->acc_contact_iter()) {
+ for (auto &hContact : proto->AccContacts()) {
if (db_get_b(hContact, proto->m_szModuleName, "ChatRoom", 0) == 0
&& db_get_w(hContact, proto->m_szModuleName, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {
lvI.lParam = (LPARAM)hContact;
diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp
index 777d174aa0..f155fa6cb0 100644
--- a/protocols/Sametime/src/userlist.cpp
+++ b/protocols/Sametime/src/userlist.cpp
@@ -4,7 +4,7 @@
MCONTACT CSametimeProto::FindContactByUserId(const char* id)
{
DBVARIANT dbv;
- for (auto &hContact : acc_contact_iter()) {
+ for (auto &hContact : AccContacts()) {
if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
if (dbv.pszVal && mir_strcmp(id, dbv.pszVal) == 0) {
db_free(&dbv);
@@ -204,7 +204,7 @@ void CSametimeProto::ExportContactsToList(mwSametimeList* user_list)
mwIdBlock uid;
GList* gl = nullptr;
- for (auto &hContact : acc_contact_iter()) {
+ for (auto &hContact : AccContacts()) {
if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
if (dbv.pszVal) {
if (GetAwareIdFromContact(hContact, &id_block)) {
@@ -594,7 +594,7 @@ void CSametimeProto::UserListCreate()
mwAwareIdBlock id_block;
GList *gl = nullptr;
- for (auto &hContact : acc_contact_iter()) {
+ for (auto &hContact : AccContacts()) {
if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0) == 0 /*&& proto && !mir_strcmp( PROTO, proto)*/) {
if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
if (dbv.pszVal) {