From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/SmileyAdd/src/regexp/WCMatcher.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 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 939e347afd..12c1c0d4bd 100644
--- a/plugins/SmileyAdd/src/regexp/WCMatcher.cpp
+++ b/plugins/SmileyAdd/src/regexp/WCMatcher.cpp
@@ -10,7 +10,7 @@ const int WCMatcher::MATCH_ENTIRE_STRING = 0x01;
   @version  1.07.00
   */
 
-WCMatcher::WCMatcher(WCPattern *pattern, const CMString &text)
+WCMatcher::WCMatcher(WCPattern *pattern, const CMStringW &text)
 {
 	pat = pattern;
 	str = &text;
@@ -48,11 +48,11 @@ void WCMatcher::clearGroups()
 	for (i = 1; i <= ncgc; ++i) groups[0 - i] = starts[0 - i] = ends[0 - i] = -1;
 }
 
-CMString WCMatcher::replaceWithGroups(const CMString &pStr)
+CMStringW WCMatcher::replaceWithGroups(const CMStringW &pStr)
 {
-	CMString ret;
+	CMStringW ret;
 
-	CMString t = pStr;
+	CMStringW t = pStr;
 	while (t.GetLength() > 0) {
 		if (t[0] == '\\') {
 			t.Delete(0);
@@ -86,7 +86,7 @@ unsigned long WCMatcher::getFlags() const
 	return flags;
 }
 
-const CMString& WCMatcher::getText() const
+const CMStringW& WCMatcher::getText() const
 {
 	return *str;
 }
@@ -132,9 +132,9 @@ bool WCMatcher::findNextMatch()
 	return ends[0] >= 0;
 }
 
-std::vector<CMString> WCMatcher::findAll()
+std::vector<CMStringW> WCMatcher::findAll()
 {
-	std::vector<CMString> ret;
+	std::vector<CMStringW> ret;
 	reset();
 	while (findNextMatch())
 		ret.push_back(getGroup());
@@ -163,16 +163,16 @@ int WCMatcher::getEndingIndex(const int groupNum) const
 	return ends[groupNum];
 }
 
-CMString WCMatcher::getGroup(const int groupNum) const
+CMStringW WCMatcher::getGroup(const int groupNum) const
 {
 	if (groupNum < 0 || groupNum >= gc) return L"";
 	if (starts[groupNum] < 0 || ends[groupNum] < 0) return L"";
 	return str->Mid(starts[groupNum], ends[groupNum] - starts[groupNum]);
 }
 
-std::vector<CMString> WCMatcher::getGroups(const bool includeGroupZero) const
+std::vector<CMStringW> WCMatcher::getGroups(const bool includeGroupZero) const
 {
-	std::vector<CMString> ret;
+	std::vector<CMStringW> ret;
 
 	for (int i = (includeGroupZero ? 0 : 1); i < gc; ++i)
 		ret.push_back(getGroup(i));
-- 
cgit v1.2.3