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/AuthState/src/main.cpp | 18 +++++++++--------- plugins/AuthState/src/options.cpp | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/AuthState') diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index 4771928552..92a2fbeaca 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -61,7 +61,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -INT_PTR getIconToUse(HANDLE hContact, LPARAM lParam) +INT_PTR getIconToUse(HCONTACT hContact, LPARAM lParam) { char *proto = GetContactProto(hContact); // if (lParam == 1) return icon_none; @@ -94,7 +94,7 @@ int onExtraImageApplying(WPARAM wParam, LPARAM lParam) if (wParam == NULL) return 0; - int usedIcon = getIconToUse((HANDLE) wParam, lParam); + int usedIcon = getIconToUse((HCONTACT)wParam, lParam); const char *icon; switch (usedIcon) { @@ -103,14 +103,14 @@ int onExtraImageApplying(WPARAM wParam, LPARAM lParam) case icon_auth: icon = "auth_icon"; break; default: icon = NULL; break; } - ExtraIcon_SetIcon(hExtraIcon, (HANDLE)wParam, icon); + ExtraIcon_SetIcon(hExtraIcon, (HCONTACT)wParam, icon); return 0; } int onContactSettingChanged(WPARAM wParam,LPARAM lParam) { DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam; - char *proto = GetContactProto((HANDLE)wParam); + char *proto = GetContactProto((HCONTACT)wParam); if (!proto) return 0; if (!lstrcmpA(cws->szModule,proto)) @@ -123,7 +123,7 @@ int onContactSettingChanged(WPARAM wParam,LPARAM lParam) int onDBContactAdded(WPARAM wParam, LPARAM lParam) { // A new contact added, mark it as recent - db_set_b((HANDLE)wParam, MODULENAME, "ShowIcons", 1); + db_set_b((HCONTACT)wParam, MODULENAME, "ShowIcons", 1); onExtraImageApplying(wParam, 0); return 0; @@ -131,8 +131,8 @@ int onDBContactAdded(WPARAM wParam, LPARAM lParam) INT_PTR onAuthMenuSelected(WPARAM wParam, LPARAM lParam) { - byte enabled = db_get_b((HANDLE)wParam,"AuthState","ShowIcons",1); - db_set_b((HANDLE)wParam, MODULENAME, "ShowIcons", !enabled); + byte enabled = db_get_b((HCONTACT)wParam,"AuthState","ShowIcons",1); + db_set_b((HCONTACT)wParam, MODULENAME, "ShowIcons", !enabled); onExtraImageApplying(wParam, 0); return 0; @@ -140,7 +140,7 @@ INT_PTR onAuthMenuSelected(WPARAM wParam, LPARAM lParam) int onPrebuildContactMenu(WPARAM wParam, LPARAM lParam) { - HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; char *proto = GetContactProto(hContact); if (!proto) return 0; @@ -173,7 +173,7 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam) hExtraIcon = ExtraIcon_Register("authstate", LPGEN("Auth State"), "authgrant_icon"); // Set initial value for all contacts - for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) + for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) onExtraImageApplying((WPARAM)hContact, 1); hOptInitialise = HookEvent(ME_OPT_INITIALISE, onOptInitialise); diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp index 5fe5635b92..48fb2add44 100644 --- a/plugins/AuthState/src/options.cpp +++ b/plugins/AuthState/src/options.cpp @@ -55,7 +55,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP bContactMenuItem = IsDlgButtonChecked(hwndDlg, IDC_ENABLEMENUITEM); bIconsForRecentContacts = IsDlgButtonChecked(hwndDlg, IDC_ICONSFORRECENT); - for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) + for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) onExtraImageApplying((WPARAM)hContact,0); //Store options values to DB -- cgit v1.2.3