diff options
Diffstat (limited to 'poxml/parser.cpp')
| -rw-r--r-- | poxml/parser.cpp | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/poxml/parser.cpp b/poxml/parser.cpp index 2f0f7e16..80810eeb 100644 --- a/poxml/parser.cpp +++ b/poxml/parser.cpp @@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl "revdescription", "glossentry", "partinfo", "segmentedlist", "segtitle", "seg", "seglistitem", "screenco", 0}; -static const char *literaltags[] = {"literallayout", "synopsis", "screen", +static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen", "programlisting", 0}; bool StructureParser::fatalError ( const TQXmlParseException &e ) @@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName) bool StructureParser::skippedEntity ( const TQString & name ) { if (inside) - message += TQString("&%1;").arg(name); + message += TQString("&%1;").tqarg(name); return true; } @@ -113,7 +113,7 @@ bool StructureParser::startElement( const TQString& , const TQString& , if (isCuttingTag(tname)) { if (!inside) { - message = TQString::null; + message = TQString(); list.pc.increasePara(); startline = locator->lineNumber(); startcol = locator->columnNumber(); @@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& , { TQString tmp = "<" + tname; for (int i = 0; i < attr.length(); i++) { - tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i)); + tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i)); } - tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); - tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); + tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); + tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); if (isSingleTag(qName)) tmp += "/>"; @@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag) uint index = 0; while (true) { - int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index); - int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index); + int nextclose = message.tqfind(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), index); + int nextstart = message.tqfind(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(tag)), index); // qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside); if (nextclose == -1) { #ifdef POXML_DEBUG @@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message) bool lastws = false; while (index < message.length()) { - switch (message.at(index).latin1()) { + switch (message.tqat(index).latin1()) { case '\n': case '\t': case '\r': @@ -254,7 +254,7 @@ void StructureParser::descape(TQString &message) index++; } - message.replace(TQRegExp("\010"), ""); + message.tqreplace(TQRegExp("\010"), ""); } bool StructureParser::formatMessage(MsgBlock &msg) const @@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const { int slen = strlen(singletags[index]); - if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) && + if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(singletags[index]) && !msg.msgid.at( slen + 1 ).isLetterOrNumber() ) { #ifdef POXML_DEBUG @@ -327,8 +327,8 @@ bool StructureParser::formatMessage(MsgBlock &msg) const TQString orig = msg.msgid; TQString endtag = msg.msgid.mid(endindex + 2, msg.msgid.length() - (endindex + 2) - 1); - TQString endtag_attr = endtag.mid(endtag.find(' '), endtag.length()); - endtag.replace(infos_reg, ""); + TQString endtag_attr = endtag.mid(endtag.tqfind(' '), endtag.length()); + endtag.tqreplace(infos_reg, ""); if (endtag == starttag) { if (!closureTag(msg.msgid, starttag)) break; @@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) #endif // the exception for poxml_* attributes is made in the closing tag - int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), + int closing_index = message.tqfind(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), strindex); - int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.tqfind(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)), strindex); #ifdef POXML_DEBUG @@ -510,8 +510,8 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) while (endindex >= 0 && (message.at(endindex) != '<' || message.at(endindex + 1) != '/')) endindex--; TQString tag = message.mid(endindex + 2, message.length() - endindex - 3); - if (tag.find(' ') > 0 ) { - tag = tag.left(tag.find(' ')); + if (tag.tqfind(' ') > 0 ) { + tag = tag.left(tag.tqfind(' ')); } #ifdef POXML_DEBUG qDebug("behind tag %s", tag.latin1()); @@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside); #endif - int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), + int closing_index = message.tqfindRev(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), strindex - 1); - int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.tqfindRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)), strindex - 1); #ifdef POXML_DEBUG @@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr if (inside) { if (!isSingleTag(qName)) { - message += TQString("</%1").arg(tname); - message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); - message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); + message += TQString("</%1").tqarg(tname); + message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); + message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); message += ">"; } } @@ -640,7 +640,7 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr (*it).lines.first().offset = 0; } } - (*it).msgid.replace(infos_reg, TQString::null); + (*it).msgid.tqreplace(infos_reg, TQString()); if (!(*it).msgid.isEmpty()) list.append(*it); @@ -663,11 +663,11 @@ bool StructureParser::comment ( const TQString &c ) TQString StructureParser::escapeLiterals( const TQString &_contents) { TQString contents = _contents; - contents.replace(TQRegExp("\n"), "&POXML_LINEFEED;"); - contents.replace(TQRegExp("<"), "&POXML_LT;"); - contents.replace(TQRegExp(">"), "&POXML_GT;"); - contents.replace(TQRegExp("\t"), " "); - contents.replace(TQRegExp(" "), "&POXML_SPACE;"); + contents.tqreplace(TQRegExp("\n"), "&POXML_LINEFEED;"); + contents.tqreplace(TQRegExp("<"), "&POXML_LT;"); + contents.tqreplace(TQRegExp(">"), "&POXML_GT;"); + contents.tqreplace(TQRegExp("\t"), " "); + contents.tqreplace(TQRegExp(" "), "&POXML_SPACE;"); return contents; } @@ -675,11 +675,11 @@ TQString StructureParser::escapeLiterals( const TQString &_contents) { TQString StructureParser::descapeLiterals( const TQString &_contents) { TQString contents = _contents; - contents.replace(TQRegExp("&POXML_LINEFEED;"), "\n"); - contents.replace(TQRegExp("&POXML_LT;"), "<"); - contents.replace(TQRegExp("&POXML_GT;"), ">"); - contents.replace(TQRegExp("&POXML_SPACE;"), " "); - contents.replace(TQRegExp("!POXML_AMP!"), "&"); + contents.tqreplace(TQRegExp("&POXML_LINEFEED;"), "\n"); + contents.tqreplace(TQRegExp("&POXML_LT;"), "<"); + contents.tqreplace(TQRegExp("&POXML_GT;"), ">"); + contents.tqreplace(TQRegExp("&POXML_SPACE;"), " "); + contents.tqreplace(TQRegExp("!POXML_AMP!"), "&"); return contents; } @@ -710,23 +710,23 @@ void StructureParser::stripWhiteSpace( TQString &contents) void StructureParser::cleanupTags( TQString &contents ) { - contents.replace(TQRegExp("&"), "!POXML_AMP!"); + contents.tqreplace(TQRegExp("&"), "!POXML_AMP!"); for (int index = 0; literaltags[index]; index++) { - TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index])); - TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index])); + TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index])); + TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index])); int strindex = 0; while (true) { - strindex = contents.find(start, strindex); + strindex = contents.tqfind(start, strindex); if (strindex < 0) break; while (contents.at(strindex) != '>') strindex++; strindex++; // one more - int endindex = contents.find(end, strindex); + int endindex = contents.tqfind(end, strindex); TQString part = contents.mid(strindex, endindex - strindex); TQString newpart = escapeLiterals(part); - contents.replace(strindex, part.length(), newpart); + contents.tqreplace(strindex, part.length(), newpart); // this assumes that literal tags to not overlap strindex = strindex + newpart.length(); } @@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString tag = unclosed.cap(1); - contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(tag)); + contents.tqreplace(index, unclosed.matchedLength(), TQString("</%1>").tqarg(tag)); } TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>"); @@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents ) TQString tag = start.cap(1); TQString cut = start.capturedTexts().last(); // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1()); - contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut)); + contents.tqreplace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut)); } TQRegExp singletag("<(\\w*)\\s([^><]*)/>"); @@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents ) break; TQString tag = singletag.cap(1); if (!StructureParser::isSingleTag(tag)) { - contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(tag)); + contents.tqreplace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag)); } } @@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString msgid = trans_comment.cap(1); - contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid)); + contents.tqreplace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").tqarg(msgid)); } #ifdef POXML_DEBUG @@ -788,14 +788,14 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag) { // qDebug("cont %s %s", contents.latin1(), tag.latin1()); - TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag)); + TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").tqarg(tag).tqarg(tag)); int strindex = 0; while (true) { - strindex = contents.find(empty, strindex); + strindex = contents.tqfind(empty, strindex); if (strindex < 0) break; qDebug("found empty tag %s", tag.latin1()); - contents.replace(strindex, empty.matchedLength(), " "); + contents.tqreplace(strindex, empty.matchedLength(), " "); strindex++; return true; } @@ -831,8 +831,8 @@ bool StructureParser::characters(const TQString &ch) TQString escape(TQString message) { - message.replace(TQRegExp("\\\\"), "\\\\"); - message.replace(TQRegExp("\""), "\\\""); + message.tqreplace(TQRegExp("\\\\"), "\\\\"); + message.tqreplace(TQRegExp("\""), "\\\""); return message; } @@ -871,46 +871,46 @@ TQString escapePO(TQString msgid) { int index = 0; while (true) { - index = msgid.find("\\n", index); + index = msgid.tqfind("\\n", index); if (index == -1) break; if (index >= 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\') { - msgid.replace(index - 1, 3, "&POXML_LITERALLINEFEED;"); + msgid.tqreplace(index - 1, 3, "&POXML_LITERALLINEFEED;"); index += 3; } else - msgid.replace(index, 2, "\n"); + msgid.tqreplace(index, 2, "\n"); } index = 0; while (true) { - index = msgid.find("\\\"", index); + index = msgid.tqfind("\\\"", index); if (index == -1) break; if (index > 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\') - msgid.replace(index - 1, 3, "&POXML_LITERALQUOTE;"); + msgid.tqreplace(index - 1, 3, "&POXML_LITERALTQUOTE;"); else - msgid.replace(index, 2, "\""); + msgid.tqreplace(index, 2, "\""); } index = 0; while (true) { - index = msgid.find("\\t", index); + index = msgid.tqfind("\\t", index); if (index == -1) break; if (msgid.at(index - 1) == '\\') - msgid.replace(index - 1, 3, "\\t"); + msgid.tqreplace(index - 1, 3, "\\t"); else - msgid.replace(index, 2, "\t"); + msgid.tqreplace(index, 2, "\t"); } index = 0; while (true) { - index = msgid.find("\\\\", index); + index = msgid.tqfind("\\\\", index); if (index == -1) break; - msgid.replace(index, 2, "\\"); + msgid.tqreplace(index, 2, "\\"); index += 1; } - msgid.replace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n"); - msgid.replace(TQRegExp("&POXML_LITERALQUOTE;"), "\\"); + msgid.tqreplace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n"); + msgid.tqreplace(TQRegExp("&POXML_LITERALTQUOTE;"), "\\"); return msgid; } @@ -930,7 +930,7 @@ MsgList parseXML(const char *filename) StructureParser::cleanupTags(contents); while (true) { - int index = contents.find("<!ENTITY"); + int index = contents.tqfind("<!ENTITY"); if (index < 0) break; int inside = 0; @@ -938,7 +938,7 @@ MsgList parseXML(const char *filename) TQString replacement = ""; while (contents.at(endindex) != '>' || inside) { - switch (contents.at(endindex).latin1()) { + switch (contents.tqat(endindex).latin1()) { case '<': inside++; break; case '>': @@ -952,7 +952,7 @@ MsgList parseXML(const char *filename) endindex++; } endindex++; - contents.replace(index, endindex - index, replacement); + contents.tqreplace(index, endindex - index, replacement); } TQTextStream ts(contents.utf8(), IO_ReadOnly); @@ -975,10 +975,10 @@ MsgList parseXML(const char *filename) for (MsgList::Iterator it = english.begin(); it != english.end(); it++) { - TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid); + TQMap<TQString,TQString>::Iterator found = msgids.tqfind((*it).msgid); if ((*it).msgid.length() < 4) { - (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid + - TQString("</%1>").arg((*it).tag); + (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid + + TQString("</%1>").tqarg((*it).tag); changed = true; break; } @@ -993,7 +993,7 @@ MsgList parseXML(const char *filename) it2 != english.end(); it2++) { if ((*it2).msgid == msgid) - (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag); + (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag); } break; } |