From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Spamotron/src/options.cpp | 6 +++--- plugins/Spamotron/src/stdafx.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Spamotron/src') diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index 6cdaf66110..59622de861 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -6,9 +6,9 @@ wchar_t* _getCOptS(wchar_t *buf, unsigned int buflen, MCONTACT hContact, const c { DBVARIANT dbv = {0}; wcsnset(buf, 0, buflen); - if (db_get_ts(hContact, PLUGIN_NAME, option, &dbv) != 0) + if (db_get_ws(hContact, PLUGIN_NAME, option, &dbv) != 0) wcsncpy(buf, def, min(buflen, mir_wstrlen(def)+1)); - else if (dbv.type == DBVT_TCHAR) { + else if (dbv.type == DBVT_WCHAR) { wcsncpy(buf, dbv.ptszVal, min(buflen, mir_wstrlen(dbv.ptszVal)+1)); } db_free(&dbv); @@ -21,7 +21,7 @@ wchar_t* _getMOptS(wchar_t *buf, unsigned int buflen, const char* module, const wcsnset(buf, 0, buflen); if (db_get_s(NULL, module, option, &dbv) != 0) wcsncpy(buf, def, min(buflen, mir_wstrlen(def)+1)); - else if (dbv.type == DBVT_TCHAR) { + else if (dbv.type == DBVT_WCHAR) { wcsncpy(buf, dbv.ptszVal, min(buflen, mir_wstrlen(dbv.ptszVal)+1)); } else { tmp = mir_a2u(dbv.pszVal); diff --git a/plugins/Spamotron/src/stdafx.h b/plugins/Spamotron/src/stdafx.h index 1be69abae9..0ec06bf479 100644 --- a/plugins/Spamotron/src/stdafx.h +++ b/plugins/Spamotron/src/stdafx.h @@ -42,7 +42,7 @@ wchar_t* _getCOptS(wchar_t *buf, unsigned int buflen, MCONTACT hContact, const char* option, const wchar_t *def); #define _getOptS(a,b,c,d) _getCOptS(a, b, NULL, c, d) -#define _setCOptTS(a,b,c) db_set_ts(a, PLUGIN_NAME, b, c) +#define _setCOptTS(a,b,c) db_set_ws(a, PLUGIN_NAME, b, c) #define _setCOptS(a,b,c) db_set_s(a, PLUGIN_NAME, b, c) #define _setOptTS(a,b) _setCOptTS(NULL, a, b) -- cgit v1.2.3