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/ClientChangeNotify/src/CommonLibs/CString.cpp | 6 +++--- plugins/ClientChangeNotify/src/CommonLibs/CString.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/ClientChangeNotify/src/CommonLibs') diff --git a/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp b/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp index 52e4f69295..38d96882d5 100644 --- a/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp +++ b/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp @@ -272,19 +272,19 @@ template class TString; template class TString; template class TString; -CString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue) +CString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue) { ptrA p( db_get_sa(hContact, szModule, szSetting)); return CString(p == NULL ? szDefaultValue : p); } -TCString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) +TCString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) { ptrT p( db_get_tsa(hContact, szModule, szSetting)); return TCString(p == NULL ? szDefaultValue : p); } -TCString DBGetContactSettingAsString(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) +TCString DBGetContactSettingAsString(MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) { // also converts numeric values to a string DBVARIANT dbv = {0}; int iRes = db_get_ws(hContact, szModule, szSetting, &dbv); diff --git a/plugins/ClientChangeNotify/src/CommonLibs/CString.h b/plugins/ClientChangeNotify/src/CommonLibs/CString.h index c1f555c72a..0d81a4f7c3 100644 --- a/plugins/ClientChangeNotify/src/CommonLibs/CString.h +++ b/plugins/ClientChangeNotify/src/CommonLibs/CString.h @@ -163,10 +163,10 @@ __inline CHARARRAY WCHAR2UTF8(WCString Str) #undef db_get_s -CString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); -TCString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); -int db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); -TCString DBGetContactSettingAsString(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); // also converts numeric values to a string +CString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); +TCString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); +int db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); +TCString DBGetContactSettingAsString(MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); // also converts numeric values to a string // various string helpers. their return values are valid only while the class is visible class UTF8Encode -- cgit v1.2.3