From 12225716d38830a23477b97a6979b6414faeec7b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Mar 2018 21:05:31 +0300 Subject: entities' names to be started with capital letters --- protocols/IcqOscarJ/src/icq_infoupdate.cpp | 2 +- protocols/IcqOscarJ/src/icq_proto.cpp | 2 +- protocols/IcqOscarJ/src/icq_server.cpp | 2 +- protocols/IcqOscarJ/src/icq_servlist.cpp | 6 +++--- protocols/IcqOscarJ/src/icq_uploadui.cpp | 8 ++++---- protocols/IcqOscarJ/src/utilities.cpp | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'protocols/IcqOscarJ/src') diff --git a/protocols/IcqOscarJ/src/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp index b4f443aa2c..4bfafdb33c 100644 --- a/protocols/IcqOscarJ/src/icq_infoupdate.cpp +++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp @@ -126,7 +126,7 @@ void CIcqProto::icq_RescanInfoUpdate() bInfoUpdateEnabled = 0; // freeze thread // Queue all outdated users - for (auto &hContact : acc_contact_iter()) + for (auto &hContact : AccContacts()) if (IsMetaInfoChanged(hContact)) // Queue user if (!icq_QueueUser(hContact)) { // The queue is full, pause queuing contacts bInfoPendingUsers = 1; diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 21b99bdd01..583fa6e919 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -259,7 +259,7 @@ int CIcqProto::OnModulesLoaded(WPARAM, LPARAM) ModuleLoad(0, 0); InitXStatusItems(FALSE); - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { DWORD bXStatus = getContactXStatus(hContact); if (bXStatus > 0) setContactExtraIcon(hContact, bXStatus); diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp index b71737b5c6..2839d7c435 100644 --- a/protocols/IcqOscarJ/src/icq_server.cpp +++ b/protocols/IcqOscarJ/src/icq_server.cpp @@ -178,7 +178,7 @@ void __cdecl CIcqProto::ServerThread(serverthread_start_info *infoParam) StopAvatarThread(); // Offline all contacts - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { if (getContactStatus(hContact) == ID_STATUS_OFFLINE) continue; diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index b61fee4701..f1d17036ef 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -858,7 +858,7 @@ void CIcqProto::LoadServerIDs() nGroups = nServerIDListCount - nStart; - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { if (wSrvID = getWord(hContact, DBSETTING_SERVLIST_ID, 0)) { ReserveServerID(wSrvID, SSIT_ITEM, 0); nContacts++; @@ -1197,7 +1197,7 @@ void* CIcqProto::collectBuddyGroup(WORD wGroupID, int *count) MCONTACT hContact; WORD wItemID; - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { if (wGroupID == getWord(hContact, DBSETTING_SERVLIST_GROUP, 0)) { // add only buddys from specified group wItemID = getWord(hContact, DBSETTING_SERVLIST_ID, 0); @@ -1223,7 +1223,7 @@ void* CIcqProto::collectGroups(int *count) int i; WORD wGroupID; - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { if (wGroupID = getWord(hContact, DBSETTING_SERVLIST_GROUP, 0)) { // add only valid IDs for (i = 0; i < cnt; i++) // check for already added ids if (buf[i] == wGroupID) diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp index 5991d7cfcc..1a6cd6c4c6 100644 --- a/protocols/IcqOscarJ/src/icq_uploadui.cpp +++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp @@ -52,7 +52,7 @@ static void UpdateAllContactsCheckmark(HWND hwndList, CIcqProto* ppro, HANDLE ph { int check = 1; - for (auto &hContact : ppro->acc_contact_iter()) { + for (auto &hContact : ppro->AccContacts()) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0); if (hItem) { if (!SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) { // if any of our contacts is unchecked, uncheck all contacts as well @@ -72,7 +72,7 @@ static int UpdateCheckmarks(HWND hwndList, CIcqProto* ppro, HANDLE phItemAll) int bAll = 1; bListInit = 1; // lock CLC events - for (auto &hContact : ppro->acc_contact_iter()) { + for (auto &hContact : ppro->AccContacts()) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0); if (hItem) { if (ppro->getWord(hContact, DBSETTING_SERVLIST_ID, 0)) @@ -93,7 +93,7 @@ static int UpdateCheckmarks(HWND hwndList, CIcqProto* ppro, HANDLE phItemAll) static void DeleteOtherContactsFromControl(HWND hCtrl, CIcqProto* ppro) { - for (auto &hContact : contact_iter()) { + for (auto &hContact : Contacts()) { HANDLE hItem = (HANDLE)SendMessage(hCtrl, CLM_FINDCONTACT, hContact, 0); if (hItem) if (!ppro->IsICQContact(hContact)) @@ -831,7 +831,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa if (nm->flags&CLNF_ISINFO) { int check = SendMessage(hClist, CLM_GETCHECKMARK, (WPARAM)hItemAll, 0); - for (auto &hContact : ppro->acc_contact_iter()) { + for (auto &hContact : ppro->AccContacts()) { HANDLE hItem = (HANDLE)SendMessage(hClist, CLM_FINDCONTACT, hContact, 0); if (hItem) SendMessage(hClist, CLM_SETCHECKMARK, (WPARAM)hItem, check); diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index ceaa122129..399ecf503b 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -355,7 +355,7 @@ void CIcqProto::InitContactsCache() // build cache mir_cslock l(contactsCacheMutex); - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { DWORD dwUin; uid_str szUid; if (!getContactUid(hContact, &dwUin, &szUid)) @@ -417,7 +417,7 @@ MCONTACT CIcqProto::HContactFromUIN(DWORD dwUin, int *Added) if (hContact) return hContact; - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { DWORD dwContactUin = getContactUin(hContact); if (dwContactUin == dwUin) { AddToContactsCache(hContact, dwUin, nullptr); @@ -480,7 +480,7 @@ MCONTACT CIcqProto::HContactFromUID(DWORD dwUin, const char *szUid, int *Added) if (hContact) return hContact; - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { DWORD dwContactUin; uid_str szContactUid; if (!getContactUid(hContact, &dwContactUin, &szContactUid)) { @@ -800,7 +800,7 @@ void CIcqProto::ResetSettingsOnListReload() setWord("SrvRecordCount", 0); delSetting(DBSETTING_SERVLIST_UNHANDLED); - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { // All these values will be restored during the serv-list receive setWord(hContact, DBSETTING_SERVLIST_ID, 0); setWord(hContact, DBSETTING_SERVLIST_GROUP, 0); @@ -820,7 +820,7 @@ void CIcqProto::ResetSettingsOnConnect() setByte("SrvVisibility", 0); setDword("IdleTS", 0); - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { setDword(hContact, "LogonTS", 0); setDword(hContact, "IdleTS", 0); setDword(hContact, "TickTS", 0); @@ -837,7 +837,7 @@ void CIcqProto::ResetSettingsOnLoad() setDword("IdleTS", 0); setDword("LogonTS", 0); - for (auto &hContact : acc_contact_iter()) { + for (auto &hContact : AccContacts()) { setDword(hContact, "LogonTS", 0); setDword(hContact, "IdleTS", 0); setDword(hContact, "TickTS", 0); -- cgit v1.2.3