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/WebView/src/main.cpp | 2 +- plugins/WebView/src/webview.cpp | 8 ++++---- plugins/WebView/src/webview_datawnd.cpp | 2 +- plugins/WebView/src/webview_services.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/WebView/src') diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index 3053895860..c69558c13f 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -70,7 +70,7 @@ void ChangeContactStatus(int con_stat) if (con_stat == 3) status_code = ID_STATUS_NA; - for (auto &hContact : contact_iter(MODULENAME)) + for (auto &hContact : Contacts(MODULENAME)) db_set_w(hContact, MODULENAME, "Status", status_code); } diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index f15977bb1d..bd83ccab8b 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -94,7 +94,7 @@ void FillFontListThread(void *param) /*****************************************************************************/ void TxtclrLoop() { - for (auto &hContact : contact_iter(MODULENAME)) { + for (auto &hContact : Contacts(MODULENAME)) { HWND hwndDlg = WindowList_Find(hWindowList, hContact); SetDlgItemText(hwndDlg, IDC_DATA, L""); InvalidateRect(hwndDlg, nullptr, 1); @@ -104,7 +104,7 @@ void TxtclrLoop() /*****************************************************************************/ void BGclrLoop() { - for (auto &hContact : contact_iter(MODULENAME)) { + for (auto &hContact : Contacts(MODULENAME)) { HWND hwndDlg = (WindowList_Find(hWindowList, hContact)); SetDlgItemText(hwndDlg, IDC_DATA, L""); SendDlgItemMessage(hwndDlg, IDC_DATA, EM_SETBKGNDCOLOR, 0, BackgoundClr); @@ -118,7 +118,7 @@ void StartUpdate(void*) StartUpDelay = 1; Sleep(((db_get_dw(NULL, MODULENAME, START_DELAY_KEY, 0)) * SECOND)); - for (auto &hContact : contact_iter(MODULENAME)) + for (auto &hContact : Contacts(MODULENAME)) GetData((void*)hContact); StartUpDelay = 0; @@ -128,7 +128,7 @@ void StartUpdate(void*) void ContactLoop(void*) { if (StartUpDelay == 0) { - for (auto &hContact : contact_iter(MODULENAME)) { + for (auto &hContact : Contacts(MODULENAME)) { GetData((void*)hContact); Sleep(10); // avoid 100% CPU } diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index b467e396f1..2bd17e4863 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -128,7 +128,7 @@ static MCONTACT FindContactByUrl(HWND hwndDlg) GetDlgItemText(hwndDlg, IDC_OPEN_URL, urltext, _countof(urltext)); GetWindowText(hwndDlg, titlebartxt, _countof(titlebartxt)); - for (auto &hContact : contact_iter(MODULENAME)) { + for (auto &hContact : Contacts(MODULENAME)) { ptrW db1( db_get_wsa(hContact, MODULENAME, URL_KEY)); ptrW db2( db_get_wsa(hContact, MODULENAME, PRESERVE_NAME_KEY)); diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp index 585b85fe77..6a3197e425 100644 --- a/plugins/WebView/src/webview_services.cpp +++ b/plugins/WebView/src/webview_services.cpp @@ -250,7 +250,7 @@ INT_PTR SetStatus(WPARAM wParam, LPARAM) // Make sure no contact has offline status for any reason on first time run if ( db_get_b(NULL, MODULENAME, "FirstTime", 100) == 100) { - for (auto &hContact : contact_iter(MODULENAME)) + for (auto &hContact : Contacts(MODULENAME)) db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE); db_set_b(NULL, MODULENAME, "FirstTime", 1); @@ -345,7 +345,7 @@ INT_PTR AddToList(WPARAM, LPARAM lParam) if (psr->cbSize != sizeof(PROTOSEARCHRESULT)) return NULL; // search for existing contact - for (auto &hContact : contact_iter(MODULENAME)) { + for (auto &hContact : Contacts(MODULENAME)) { // check ID to see if the contact already exist in the database if (db_get_ws(hContact, MODULENAME, "URL", &dbv)) continue; @@ -398,7 +398,7 @@ INT_PTR AddToList(WPARAM, LPARAM lParam) wchar_t *Nend = wcschr(Newnick, '.'); if (Nend) *Nend = '\0'; - for (auto &hContact2 : contact_iter(MODULENAME)) { + for (auto &hContact2 : Contacts(MODULENAME)) { if (!db_get_ws(hContact2, MODULENAME, PRESERVE_NAME_KEY, &dbv)) { if (!mir_wstrcmpi(Newnick, dbv.ptszVal)) { // remove the flag for not on list and hidden, thus make the @@ -456,6 +456,6 @@ INT_PTR GetInfo(WPARAM, LPARAM) /*****************************************************************************/ void AckFunc(void*) { - for (auto &hContact : contact_iter(MODULENAME)) + for (auto &hContact : Contacts(MODULENAME)) ProtoBroadcastAck(MODULENAME, hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1, 0); } -- cgit v1.2.3