summaryrefslogtreecommitdiff
path: root/plugins/CommonLibs/CString.h
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/CommonLibs/CString.h')
-rw-r--r--plugins/CommonLibs/CString.h8
1 files changed, 4 insertions, 4 deletions
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