From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/avatars.cpp | 2 +- plugins/Popup/src/avatars.h | 2 +- plugins/Popup/src/avatars_flash.h | 2 +- plugins/Popup/src/avatars_gif.cpp | 2 +- plugins/Popup/src/avatars_gif.h | 2 +- plugins/Popup/src/common.h | 4 ++-- plugins/Popup/src/opt_contacts.cpp | 4 ++-- plugins/Popup/src/popup_wnd2.cpp | 14 +++++++------- plugins/Popup/src/popup_wnd2.h | 6 +++--- plugins/Popup/src/srmm_menu.cpp | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/avatars.cpp b/plugins/Popup/src/avatars.cpp index e40c13eb04..2130268d52 100644 --- a/plugins/Popup/src/avatars.cpp +++ b/plugins/Popup/src/avatars.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "headers.h" -PopupAvatar *PopupAvatar::create(HCONTACT hContact) +PopupAvatar *PopupAvatar::create(MCONTACT hContact) { if (hContact) { diff --git a/plugins/Popup/src/avatars.h b/plugins/Popup/src/avatars.h index 369940611f..9621bd13e9 100644 --- a/plugins/Popup/src/avatars.h +++ b/plugins/Popup/src/avatars.h @@ -42,7 +42,7 @@ public: inline int getWidth() { return width; } inline int getHeight() { return height; } - static PopupAvatar *create(HCONTACT hContact); + static PopupAvatar *create(MCONTACT hContact); }; #endif // __avatars_h__ diff --git a/plugins/Popup/src/avatars_flash.h b/plugins/Popup/src/avatars_flash.h index a01919f242..351491f65a 100644 --- a/plugins/Popup/src/avatars_flash.h +++ b/plugins/Popup/src/avatars_flash.h @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. class FlashAvatar: public PopupAvatar { public: - FlashAvatar(HCONTACT hContact); + FlashAvatar(MCONTACT hContact); virtual ~FlashAvatar(); virtual int activeFrameDelay() = 0; virtual void draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS *options) = 0; diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp index 2297a3b5a9..c672f235b5 100644 --- a/plugins/Popup/src/avatars_gif.cpp +++ b/plugins/Popup/src/avatars_gif.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "headers.h" -GifAvatar::GifAvatar(HCONTACT hContact): PopupAvatar((HANDLE)hContact) +GifAvatar::GifAvatar(MCONTACT hContact): PopupAvatar((HANDLE)hContact) { av = (avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0); bIsAnimated = true; diff --git a/plugins/Popup/src/avatars_gif.h b/plugins/Popup/src/avatars_gif.h index 51d6a6a7a0..e05a89c504 100644 --- a/plugins/Popup/src/avatars_gif.h +++ b/plugins/Popup/src/avatars_gif.h @@ -37,7 +37,7 @@ protected: SIZE frameSize; public: - GifAvatar(HCONTACT hContact); + GifAvatar(MCONTACT hContact); virtual ~GifAvatar(); virtual int activeFrameDelay(); virtual void draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS *options); diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h index 11bf939fd4..402f9ec4b0 100644 --- a/plugins/Popup/src/common.h +++ b/plugins/Popup/src/common.h @@ -51,7 +51,7 @@ inline int Byte2Percentile(int vByte) { return (vByte*100)/255; } inline int Percentile2Byte(int vPerc) { return (vPerc*255)/100; } //===== Strings & MirandaDB ================== -inline char *db_get_s(HCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default) +inline char *db_get_s(MCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default) { DBVARIANT dbv; db_get(hContact, ModuleName, SettingName, &dbv); @@ -66,7 +66,7 @@ inline char *db_get_s(HCONTACT hContact, const char *ModuleName, const char *Set return result; } -inline INT_PTR DBGetContactSettingStringX(HCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default, const int retType) +inline INT_PTR DBGetContactSettingStringX(MCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default, const int retType) { INT_PTR ret = NULL; diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp index 5e7f3494e7..1e0fd7a01d 100644 --- a/plugins/Popup/src/opt_contacts.cpp +++ b/plugins/Popup/src/opt_contacts.cpp @@ -85,7 +85,7 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: HWND hwndList = GetDlgItem(hwnd, IDC_LIST); - for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); for (int i=0; i < 4 /*SIZEOF(sttIcons)*/; ++i) { if (SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(i,0))) { @@ -117,7 +117,7 @@ static void sttResetListOptions(HWND hwndList) static void sttSetAllContactIcons(HWND hwndList) { - for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); DWORD dwMode = db_get_b(hContact, MODULNAME, "ShowMode", 0); for (int i=0; i < 4 /*SIZEOF(sttIcons)*/; ++i) diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 0a04b15a54..6a9a5a9b8b 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -933,17 +933,17 @@ LRESULT CALLBACK NullWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l struct ReplyEditData { HWND hwndPopup; - HCONTACT hContact; + MCONTACT hContact; WNDPROC oldWndProc; }; -BOOL IsUtfSendAvailable(HCONTACT hContact) +BOOL IsUtfSendAvailable(MCONTACT hContact) { char* szProto = GetContactProto(hContact); if (szProto == NULL) return FALSE; //check for MetaContact and get szProto from subcontact if (strcmp(szProto, gszMetaProto)==0) { - HCONTACT hSubContact = (HCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0); + MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0); if (!hSubContact) return FALSE; szProto = GetContactProto(hSubContact); @@ -951,7 +951,7 @@ BOOL IsUtfSendAvailable(HCONTACT hContact) return(CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDUTF) ? TRUE : FALSE; } -void AddMessageToDB(HCONTACT hContact, char *msg, int flag/*bool utf*/) +void AddMessageToDB(MCONTACT hContact, char *msg, int flag/*bool utf*/) { DBEVENTINFO dbei = {0}; dbei.cbSize = sizeof(dbei); @@ -1078,7 +1078,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara break; case UM_AVATARCHANGED: - if ((HCONTACT)wParam == m_hContact) + if ((MCONTACT)wParam == m_hContact) { m_avatar->invalidate(); update(); @@ -1492,13 +1492,13 @@ void WindowThread(void *arg) // Menu Host LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static HCONTACT hContact = NULL; + static MCONTACT hContact = NULL; switch (message) { case UM_SHOWMENU: { - hContact = (HCONTACT)lParam; + hContact = (MCONTACT)lParam; POINT pt = {0}; HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT,(WPARAM)hContact,0); GetCursorPos(&pt); diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h index 268bf9d372..870c00306e 100644 --- a/plugins/Popup/src/popup_wnd2.h +++ b/plugins/Popup/src/popup_wnd2.h @@ -68,7 +68,7 @@ private: // other data Formula::Args m_args; - HCONTACT m_hContact, m_hContactPassed; + MCONTACT m_hContact, m_hContactPassed; WNDPROC m_PluginWindowProc; void *m_PluginData; @@ -162,8 +162,8 @@ public: char *getTime() { return m_time; } HICON getIcon() { return m_hIcon; } - HCONTACT getContact() { return m_hContact; } - HCONTACT getContactPassed() { return m_hContactPassed; } + MCONTACT getContact() { return m_hContact; } + MCONTACT getContactPassed() { return m_hContactPassed; } int getTimeout() { return m_iTimeout; } HWND getHwnd() { return m_hwnd; } void *getData() { return m_PluginData; } diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp index 655ab46604..5daf4ce463 100644 --- a/plugins/Popup/src/srmm_menu.cpp +++ b/plugins/Popup/src/srmm_menu.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static HANDLE hDialogsList = NULL; -static void SrmmMenu_UpdateIcon(HCONTACT hContact) +static void SrmmMenu_UpdateIcon(MCONTACT hContact) { if (!hContact) return; @@ -73,7 +73,7 @@ static int SrmmMenu_ProcessIconClick(WPARAM wParam, LPARAM lParam) if (lstrcmpA(sicd->szModule, MODULNAME)) return 0; - HCONTACT hContact = (HCONTACT)wParam; + MCONTACT hContact = (MCONTACT)wParam; if (!hContact) return 0; -- cgit v1.2.3