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.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/Popup/src/formula.h') diff --git a/plugins/Popup/src/formula.h b/plugins/Popup/src/formula.h index a73908dd77..0abbc50565 100644 --- a/plugins/Popup/src/formula.h +++ b/plugins/Popup/src/formula.h @@ -72,17 +72,17 @@ public: }; private: - TCHAR *m_str; - int eval_neq(TCHAR *&s, Args *args, bool *vars) const; - int eval_sum(TCHAR *&s, Args *args, bool *vars) const; - int eval_mul(TCHAR *&s, Args *args, bool *vars) const; - int eval_atom(TCHAR *&s, Args *args, bool *vars) const; + wchar_t *m_str; + int eval_neq(wchar_t *&s, Args *args, bool *vars) const; + int eval_sum(wchar_t *&s, Args *args, bool *vars) const; + int eval_mul(wchar_t *&s, Args *args, bool *vars) const; + int eval_atom(wchar_t *&s, Args *args, bool *vars) const; public: Formula() :m_str(mir_tstrdup(L"")) {} - Formula(TCHAR *s) :m_str(mir_tstrdup(s)) {} + Formula(wchar_t *s) :m_str(mir_tstrdup(s)) {} ~Formula() { mir_free(m_str); } - void set(TCHAR *s){ mir_free(m_str); m_str = mir_tstrdup(s); } + void set(wchar_t *s){ mir_free(m_str); m_str = mir_tstrdup(s); } int eval(Args *args, bool *vars = 0) const; }; -- cgit v1.2.3