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/Utils/mir_buffer.h | 4 ++-- plugins/Utils/mir_options.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/Utils') diff --git a/plugins/Utils/mir_buffer.h b/plugins/Utils/mir_buffer.h index 1461be9f61..40d450fa47 100644 --- a/plugins/Utils/mir_buffer.h +++ b/plugins/Utils/mir_buffer.h @@ -439,7 +439,7 @@ class Buffer }; -static void ReplaceVars(Buffer *buffer, HANDLE hContact, TCHAR **variables, int numVariables) +static void ReplaceVars(Buffer *buffer, HCONTACT hContact, TCHAR **variables, int numVariables) { if (buffer->len < 3) return; @@ -502,7 +502,7 @@ static void ReplaceVars(Buffer *buffer, HANDLE hContact, TCHAR **variable } -static void ReplaceTemplate(Buffer *out, HANDLE hContact, TCHAR *templ, TCHAR **vars, int numVars) +static void ReplaceTemplate(Buffer *out, HCONTACT hContact, TCHAR *templ, TCHAR **vars, int numVars) { if (ServiceExists(MS_VARS_FORMATSTRING)) diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp index 1e0b5189df..5ceadf4486 100644 --- a/plugins/Utils/mir_options.cpp +++ b/plugins/Utils/mir_options.cpp @@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. #include "mir_options.h" #include "mir_memory.h" -static TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char* setting, TCHAR* out, size_t len, TCHAR *def) +static TCHAR* MyDBGetContactSettingTString(HCONTACT hContact, char* module, char* setting, TCHAR* out, size_t len, TCHAR *def) { DBVARIANT dbv = {0}; -- cgit v1.2.3