From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/formula.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Popup/src/formula.cpp') diff --git a/plugins/Popup/src/formula.cpp b/plugins/Popup/src/formula.cpp index c328f32503..601d0e6cca 100644 --- a/plugins/Popup/src/formula.cpp +++ b/plugins/Popup/src/formula.cpp @@ -28,7 +28,7 @@ static inline bool myisspace(char ch) return (ch >= 0) && (ch <= 32); } -int Formula::eval_neq(TCHAR *&s, Args *args, bool *vars) const +int Formula::eval_neq(wchar_t *&s, Args *args, bool *vars) const { int left = eval_sum(s, args, vars); while (*s) { @@ -50,7 +50,7 @@ int Formula::eval_neq(TCHAR *&s, Args *args, bool *vars) const return left; } -int Formula::eval_sum(TCHAR *&s, Args *args, bool *vars) const +int Formula::eval_sum(wchar_t *&s, Args *args, bool *vars) const { int left = eval_mul(s, args, vars); while (*s) { @@ -68,7 +68,7 @@ int Formula::eval_sum(TCHAR *&s, Args *args, bool *vars) const return left; } -int Formula::eval_mul(TCHAR *&s, Args *args, bool *vars) const +int Formula::eval_mul(wchar_t *&s, Args *args, bool *vars) const { int left = eval_atom(s, args, vars); while (*s) { @@ -91,7 +91,7 @@ int Formula::eval_mul(TCHAR *&s, Args *args, bool *vars) const return left; } -int Formula::eval_atom(TCHAR *&s, Args *args, bool *vars) const +int Formula::eval_atom(wchar_t *&s, Args *args, bool *vars) const { while (*s) { if (myisspace(*s)) { @@ -137,7 +137,7 @@ int Formula::eval_atom(TCHAR *&s, Args *args, bool *vars) const int Formula::eval(Args *args, bool *vars) const { if (vars) *vars = false; - TCHAR *s = m_str; + wchar_t *s = m_str; int res = eval_neq(s, args, vars); return res; } -- cgit v1.2.3