diff options
Diffstat (limited to 'quanta/parsers/saparser.cpp')
| -rw-r--r-- | quanta/parsers/saparser.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 9a30273c..aa9bbd55 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -86,29 +86,29 @@ bool SAParser::slotParseOneLine() //search for different s_contexts if (s_searchContent) //search for quoted strings, comments, groups only in non-comment special areas { - quotedStringPos = s_textLine.tqfind(m_quotesRx, s_col); //quoted strings + quotedStringPos = s_textLine.find(m_quotesRx, s_col); //quoted strings s_searchedString = s_textLine.left(quotedStringPos); - commentPos = s_searchedString.tqfind(s_dtd->commentsStartRx, s_col); //comments + commentPos = s_searchedString.find(s_dtd->commentsStartRx, s_col); //comments s_searchedString = s_textLine.left(commentPos); if (s_fullParse) - groupKeywordPos = s_searchedString.tqfind(s_dtd->structRx, s_col); //groups, like { } + groupKeywordPos = s_searchedString.find(s_dtd->structRx, s_col); //groups, like { } } else s_searchedString = s_textLine; int specialAreaPos = -1; if (s_searchForSpecialAreas) //special area inside special area { s_searchedString = s_textLine.left(groupKeywordPos); - specialAreaPos = s_searchedString.tqfind(s_dtd->specialAreaStartRx, s_col); + specialAreaPos = s_searchedString.find(s_dtd->specialAreaStartRx, s_col); } if (s_searchForAreaEnd) //the end of the special area { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.tqfind(s_areaEndString, s_col); + areaEndPos = s_searchedString.find(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) //the end of the special area if a forcing string was specified { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.tqfind(s_forcedAreaRx, s_col); + areaEndPos = s_searchedString.find(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -316,11 +316,11 @@ bool SAParser::slotParseOneLine() } else //when we look only for the area end string if (s_searchForAreaEnd) { - areaEndPos = s_textLine.tqfind(s_areaEndString, s_col); + areaEndPos = s_textLine.find(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) { - areaEndPos = s_textLine.tqfind(s_forcedAreaRx, s_col); + areaEndPos = s_textLine.find(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -487,7 +487,7 @@ bool SAParser::slotParseOneLine() int l = s_textLine.length(); while (p < l) { - p = s_textLine.tqfind(s_currentContext.startString, p); + p = s_textLine.find(s_currentContext.startString, p); if (p != -1) { if (p >= 0) @@ -544,10 +544,10 @@ bool SAParser::slotParseOneLine() } case Comment: { - int pos = s_textLine.tqfind(s_dtd->comments[s_currentContext.startString], s_col); + int pos = s_textLine.find(s_dtd->comments[s_currentContext.startString], s_col); if (pos == -1 && s_dtd->comments[s_currentContext.startString] == "\n") { - int pos2 = s_textLine.tqfind(s_areaEndString, s_col); + int pos2 = s_textLine.find(s_areaEndString, s_col); if (pos2 != -1) { pos = pos2 - 1; @@ -659,7 +659,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, const DTDStruct *parentDTD = m_dtd; if (s_parentNode->tqparent) parentDTD = s_parentNode->tqparent->tag->dtd(); - s_dtd = DTDs::ref()->tqfind(parentDTD->specialAreaNames[areaStartString]); + s_dtd = DTDs::ref()->find(parentDTD->specialAreaNames[areaStartString]); s_areaEndString = parentDTD->specialAreas[areaStartString]; s_searchForAreaEnd = true; } |