From 83310365c69bd40365ee0ae0e16c99c28e24cd0b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 14:24:12 +0000 Subject: - all static protocol services replaced with functions; - m_protomod.h removed as useless git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/BasicHistory.cpp | 2 +- plugins/BasicHistory/src/EventList.cpp | 4 ++-- plugins/BasicHistory/src/stdafx.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index b77e6cdc18..a52f719a5b 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -185,7 +185,7 @@ void InitIcolib() { } -HICON LoadIconEx(int iconId, int big) +HICON LoadIconEx(int iconId, bool big) { for (int i=0; i < SIZEOF(iconList); i++) if ( iconList[i].defIconID == iconId) diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 6dcb35a69d..c1c707561e 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -434,10 +434,10 @@ std::wstring EventList::GetMyName() inline std::wstring GetProtocolName(MCONTACT hContact) { - char* ac = (char *)CallService(MS_PROTO_GETCONTACTBASEACCOUNT, hContact, 0); + char* ac = Proto_GetBaseAccountName(hContact); std::wstring proto1; if (ac != NULL) { - PROTOACCOUNT* acnt = ProtoGetAccount(ac); + PROTOACCOUNT* acnt = Proto_GetAccount(ac); if (acnt != NULL && acnt->szModuleName != NULL) { wchar_t* proto = mir_a2u(acnt->szProtoName); proto1 = proto; diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h index ffeb27e3ed..12d674ff0e 100644 --- a/plugins/BasicHistory/src/stdafx.h +++ b/plugins/BasicHistory/src/stdafx.h @@ -89,4 +89,4 @@ #define HISTORY_HK_IMPDAT 116 #define HISTORY_HK_ALLCONTACTS 117 -HICON LoadIconEx(int iconId, int big = 0); +HICON LoadIconEx(int iconId, bool big = false); -- cgit v1.2.3