From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ListeningTo/src/listeningto.cpp | 8 ++++---- plugins/ListeningTo/src/players/mradio.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 7a3e844450..6817b374bd 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -67,7 +67,7 @@ INT_PTR GetParsedFormat(WPARAM wParam,LPARAM lParam); INT_PTR GetOverrideContactOption(WPARAM wParam,LPARAM lParam); INT_PTR GetUnknownText(WPARAM wParam,LPARAM lParam); INT_PTR SetNewSong(WPARAM wParam,LPARAM lParam); -void SetExtraIcon(HANDLE hContact, BOOL set); +void SetExtraIcon(HCONTACT hContact, BOOL set); void SetListeningInfos(LISTENINGTOINFO *lti = NULL); INT_PTR HotkeysEnable(WPARAM wParam,LPARAM lParam); INT_PTR HotkeysDisable(WPARAM wParam,LPARAM lParam); @@ -288,7 +288,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) // Extra icon support hExtraIcon = ExtraIcon_Register(MODULE_NAME, LPGEN("Listening to music"), "listening_to_icon"); - for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { char *proto = GetContactProto(hContact); if (proto != NULL) { DBVARIANT dbv; @@ -947,14 +947,14 @@ void HasNewListeningInfo() } -void SetExtraIcon(HANDLE hContact, BOOL set) +void SetExtraIcon(HCONTACT hContact, BOOL set) { ExtraIcon_SetIcon(hExtraIcon, hContact, set ? "listening_to_icon" : NULL); } int SettingChanged(WPARAM wParam,LPARAM lParam) { - HANDLE hContact = (HANDLE) wParam; + HCONTACT hContact = (HCONTACT) wParam; if (hContact == NULL) return 0; diff --git a/plugins/ListeningTo/src/players/mradio.cpp b/plugins/ListeningTo/src/players/mradio.cpp index d8e23508a3..c0132d1de5 100644 --- a/plugins/ListeningTo/src/players/mradio.cpp +++ b/plugins/ListeningTo/src/players/mradio.cpp @@ -34,7 +34,7 @@ void MRadio::EnableDisable() int MRadio::GetData() { - for (HANDLE hContact = db_find_first("mRadio"); hContact; hContact = db_find_next(hContact, "mRadio")) { + for (HCONTACT hContact = db_find_first("mRadio"); hContact; hContact = db_find_next(hContact, "mRadio")) { WORD status = db_get_w(hContact, "mRadio", "Status", ID_STATUS_OFFLINE); if (status != ID_STATUS_ONLINE) continue; -- cgit v1.2.3