From b65ebafbb15e8e69cfa5aba221b6fd9fab1f41c7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 29 Nov 2017 18:41:39 +0300 Subject: SmaileyAdd to use pcre16 instead of the obsoleted regexp parser --- plugins/SmileyAdd/src/smileys.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins/SmileyAdd/src/smileys.h') diff --git a/plugins/SmileyAdd/src/smileys.h b/plugins/SmileyAdd/src/smileys.h index e21687d674..b0f1371d8e 100644 --- a/plugins/SmileyAdd/src/smileys.h +++ b/plugins/SmileyAdd/src/smileys.h @@ -130,7 +130,7 @@ template struct SMOBJLIST : public OBJLIST class SmileyLookup { private: - _TPattern *m_pattern; + MRegexp16 m_pattern; int m_ind; CMStringW m_text; @@ -145,11 +145,11 @@ public: }; typedef SMOBJLIST SmileyLocVecType; - SmileyLookup() { m_ind = 0; m_valid = false; m_pattern = NULL; }; + SmileyLookup() : m_pattern(L"") { m_ind = 0; m_valid = false; m_pattern = NULL; }; SmileyLookup(const CMStringW &str, const bool regexs, const int ind, const CMStringW &smpt); ~SmileyLookup(); - void Find(const CMStringW &str, SmileyLocVecType &smlcur, bool firstOnly) const; + void Find(const CMStringW &str, SmileyLocVecType &smlcur, bool firstOnly); int GetIndex(void) const { return m_ind; } bool IsValid(void) const { return m_valid; } }; @@ -183,7 +183,6 @@ private: void AddTriggersToSmileyLookup(void); void ReplaceAllSpecials(const CMStringW &Input, CMStringW &Output); bool LoadSmileyFileMSL(CMStringW &tbuf, bool onlyInfo, CMStringW &modpath); - bool LoadSmileyFileXEP(CMStringW &tbuf, bool onlyInfo, CMStringW &modpath); public: SmileyPackType(); -- cgit v1.2.3