diff options
Diffstat (limited to 'plugins/BasicHistory')
| -rw-r--r-- | plugins/BasicHistory/src/HistoryWindow.cpp | 14 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/Options.cpp | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 88f20deb9f..d9d1b86a59 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -1496,7 +1496,7 @@ void HistoryWindow::ReloadContacts() }
}
- for (auto &_hContact : contact_iter()) {
+ for (auto &_hContact : Contacts()) {
if (HistoryEventList::GetContactMessageNumber(_hContact) && (metaContactProto == nullptr || !db_mc_isSub(_hContact))) {
HANDLE hItem = (HANDLE)SendMessage(contactList, CLM_FINDCONTACT, (WPARAM)_hContact, 0);
if (hItem == nullptr)
@@ -1627,7 +1627,7 @@ void HistoryWindow::SavePos(bool all) {
MCONTACT contactToSave = m_hContact;
if (all) {
- for (auto &_hContact : contact_iter()) {
+ for (auto &_hContact : Contacts()) {
db_unset(_hContact, MODULE, "history_x");
db_unset(_hContact, MODULE, "history_y");
db_unset(_hContact, MODULE, "history_width");
@@ -1825,7 +1825,7 @@ void HistoryWindow::DoImport(IImport::ImportType type) std::wstring err;
std::vector<MCONTACT> contacts;
- for (auto &_hContact : contact_iter())
+ for (auto &_hContact : Contacts())
contacts.push_back(_hContact);
bool changeContact = false;
@@ -2049,7 +2049,7 @@ MCONTACT HistoryWindow::GetNextContact(MCONTACT hContact, int adder) HWND contactList = GetDlgItem(m_hWnd, IDC_LIST_CONTACTS);
if (adder > 0) {
if (hContact != NULL) {
- for (auto &cc : contact_iter())
+ for (auto &cc : Contacts())
if (SendMessage(contactList, CLM_FINDCONTACT, cc, 0) != NULL)
return cc;
@@ -2057,7 +2057,7 @@ MCONTACT HistoryWindow::GetNextContact(MCONTACT hContact, int adder) return NULL;
}
- for (auto &cc : contact_iter()) {
+ for (auto &cc : Contacts()) {
if (cc == hContact)
break;
@@ -2067,7 +2067,7 @@ MCONTACT HistoryWindow::GetNextContact(MCONTACT hContact, int adder) }
else {
MCONTACT lastContact = NULL;
- for (auto &cc : contact_iter()) {
+ for (auto &cc : Contacts()) {
if (cc == hContact)
break;
@@ -2077,7 +2077,7 @@ MCONTACT HistoryWindow::GetNextContact(MCONTACT hContact, int adder) if (hContact != NULL) {
if (lastContact == NULL && !HistoryEventList::GetContactMessageNumber(NULL)) {
- for (auto &cc : contact_iter())
+ for (auto &cc : Contacts())
if (SendMessage(contactList, CLM_FINDCONTACT, cc, 0) != NULL)
lastContact = cc;
}
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index b86a6cc91f..22f3cb55ae 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -550,7 +550,7 @@ void Options::SaveTasks(std::list<TaskOptions>* tasks) db_set_s(0, MODULE, buf, it->zipPassword.c_str());
mir_snprintf(buf, "IsInTask_%d", i);
- for (auto &hContact : contact_iter())
+ for (auto &hContact : Contacts())
db_unset(hContact, MODULE, buf);
for (size_t j = 0; j < it->contacts.size(); ++j)
@@ -605,7 +605,7 @@ void Options::SaveTasks(std::list<TaskOptions>* tasks) db_unset(NULL, MODULE, buf);
mir_snprintf(buf, "IsInTask_%d", i);
- for (auto &hContact : contact_iter())
+ for (auto &hContact : Contacts())
db_unset(hContact, MODULE, buf);
}
}
@@ -691,7 +691,7 @@ void Options::LoadTasks() }
mir_snprintf(buf, "IsInTask_%d", i);
- for (auto &hContact : contact_iter())
+ for (auto &hContact : Contacts())
if (db_get_b(hContact, MODULE, buf, 0) == 1)
to.contacts.push_back(hContact);
@@ -1562,7 +1562,7 @@ void SaveList(HWND hwnd, MCONTACT hSystem, TaskOptions* to) if (hSystem)
to->isSystem = SendMessage(hwnd, CLM_GETCHECKMARK, (WPARAM)hSystem, 0) != 0;
- for (auto &hContact : contact_iter()) {
+ for (auto &hContact : Contacts()) {
HANDLE hItem = (HANDLE)SendMessage(hwnd, CLM_FINDCONTACT, hContact, 0);
if (hItem && SendMessage(hwnd, CLM_GETCHECKMARK, (WPARAM)hItem, 0))
to->contacts.push_back(hContact);
|