From: <sil...@li...> - 2005-08-24 18:14:18
|
Update of /cvsroot/silgraphite/silgraphite/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3005/include Modified Files: UtilString.h Log Message: Replaced bug fix of June 2005; replaced removal of unnecessary gr:: in UtilString.h Index: UtilString.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/include/UtilString.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- UtilString.h 5 Aug 2005 09:40:30 -0000 1.10 +++ UtilString.h 24 Aug 2005 18:14:10 -0000 1.11 @@ -333,7 +333,7 @@ { for ( ; --cch >= 0; prgch1++, prgch2++) { - if (*prgch1 != *prgch2 && gr::ToLower(*prgch1) != gr::ToLower(*prgch2)) + if (*prgch1 != *prgch2 && /*gr::*/ToLower(*prgch1) != /*gr::*/ToLower(*prgch2)) return false; } @@ -1435,10 +1435,10 @@ int ich; int cch = Length(); - ch = gr::ToLower(ch); + ch = /*gr::*/ToLower(ch); for (ich = ichMin; ich < cch; ich++) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch) + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch) return ich; } @@ -1481,12 +1481,12 @@ if (ichLast >= Length()) ichLast = Length() - 1; - ch = gr::ToLower(ch); + ch = /*gr::*/ToLower(ch); int ich; for (ich = ichLast; ich >= 0; --ich) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch) + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch) return ich; } @@ -1603,11 +1603,11 @@ // Last position in m_rgch where prgch can be. int ichLast = Length() - cch; int ich; - XChar ch = gr::ToLower(prgch[0]); + XChar ch = /*gr::*/ToLower(prgch[0]); for (ich = ichMin; ich <= ichLast; ich++) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch && + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch && EqualsRgchCI(m_pbuf->m_rgch + ich, prgch, cch)) { return ich; @@ -1721,11 +1721,11 @@ if (ichLast > Length() - cch) ichLast = Length() - cch; - XChar ch = gr::ToLower(prgch[0]); + XChar ch = /*gr::*/ToLower(prgch[0]); int ich; for (ich = ichLast; ich >= 0; --ich) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch && + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch && EqualsRgchCI(m_pbuf->m_rgch + ich, prgch, cch)) { return ich; |