From d3b77308122587707580ec1f308dbdda38c806ac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 18 Aug 2015 11:46:12 +0000 Subject: - naming conflict; - warning fixes; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14984 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/regexp/WCMatcher.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'plugins/SmileyAdd/src/regexp/WCMatcher.cpp') diff --git a/plugins/SmileyAdd/src/regexp/WCMatcher.cpp b/plugins/SmileyAdd/src/regexp/WCMatcher.cpp index 3cd0808373..8fd137449d 100644 --- a/plugins/SmileyAdd/src/regexp/WCMatcher.cpp +++ b/plugins/SmileyAdd/src/regexp/WCMatcher.cpp @@ -30,6 +30,7 @@ WCMatcher::WCMatcher(WCPattern * pattern, const CMString & text) groupIndeces = groupIndeces + ncgc; for (int i = 0; i < gc; ++i) starts[i] = ends[i] = 0; } + WCMatcher::~WCMatcher() { delete[](starts - ncgc); @@ -38,6 +39,7 @@ WCMatcher::~WCMatcher() delete[](groupIndeces - ncgc); delete[](groupPos - ncgc); } + void WCMatcher::clearGroups() { int i; @@ -45,11 +47,12 @@ void WCMatcher::clearGroups() for (i = 0; i < gc; ++i) groups[i] = starts[i] = ends[i] = -1; for (i = 1; i <= ncgc; ++i) groups[0 - i] = starts[0 - i] = ends[0 - i] = -1; } -CMString WCMatcher::replaceWithGroups(const CMString & str) + +CMString WCMatcher::replaceWithGroups(const CMString &pStr) { CMString ret; - CMString t = str; + CMString t = pStr; while (t.GetLength() > 0) { if (t[0] == '\\') { t.Delete(0); @@ -77,10 +80,12 @@ CMString WCMatcher::replaceWithGroups(const CMString & str) return ret; } + unsigned long WCMatcher::getFlags() const { return flags; } + const CMString& WCMatcher::getText() const { return *str; -- cgit v1.2.3