From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CommonLibs/CString.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/CommonLibs/CString.h') diff --git a/plugins/CommonLibs/CString.h b/plugins/CommonLibs/CString.h index fb956f6e4e..c9a4a9538e 100644 --- a/plugins/CommonLibs/CString.h +++ b/plugins/CommonLibs/CString.h @@ -231,10 +231,10 @@ __inline CHARARRAY WCHAR2UTF8(WCString Str) #endif // CHARARRAY_CONVERT -#undef DBGetContactSettingString -CString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); -TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); -int DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); +#undef db_get_s +CString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); +TCString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); +int db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); TCString DBGetContactSettingAsString(HANDLE 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 -- cgit v1.2.3