From 8d1e74202626993f8966ec09731f521f24024a7c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 10 Nov 2013 10:05:24 +0000 Subject: - custom bkstring class removed - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@6852 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/smileyroutines.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/SmileyAdd/src/smileyroutines.cpp') diff --git a/plugins/SmileyAdd/src/smileyroutines.cpp b/plugins/SmileyAdd/src/smileyroutines.cpp index 67c011d1ea..cdabaa712a 100644 --- a/plugins/SmileyAdd/src/smileyroutines.cpp +++ b/plugins/SmileyAdd/src/smileyroutines.cpp @@ -48,18 +48,18 @@ void LookupAllSmileys(SmileyPackType* smileyPack, SmileyPackCType* smileyCPack, SmileyLookup::SmileyLocVecType* smileys = new SmileyLookup::SmileyLocVecType [smlsz]; // Find all possible smileys - bkstring tmpstr(lpstrText); + CMString tmpstr(lpstrText); int i = 0; if (sml) for (int j=0; j < sml->getCount(); j++) { - (*sml)[j].find(tmpstr, smileys[i], false); + (*sml)[j].Find(tmpstr, smileys[i], false); i++; } if (smlc) for (int j=0; j < smlc->getCount(); j++) { - (*smlc)[j].find(tmpstr, smileys[i], false); + (*smlc)[j].Find(tmpstr, smileys[i], false); i++; } @@ -67,7 +67,7 @@ void LookupAllSmileys(SmileyPackType* smileyPack, SmileyPackCType* smileyCPack, memset(csmlit, 0, smlsz * sizeof(int)); long numCharsSoFar = 0; - bkstring::size_type smloff = 0; + int smloff = 0; while (true) { int firstSml = -1; @@ -137,7 +137,7 @@ void LookupAllSmileys(SmileyPackType* smileyPack, SmileyPackCType* smileyCPack, else delete dat; // Advance string pointer to search for the next smiley - smloff = (*smlf)[firstSmlRef].pos + (*smlf)[firstSmlRef].len; + smloff = int((*smlf)[firstSmlRef].pos + (*smlf)[firstSmlRef].len); csmlit[firstSml]++; } delete[] smileys; -- cgit v1.2.3