summaryrefslogtreecommitdiffstats
path: root/poxml
diff options
context:
space:
mode:
Diffstat (limited to 'poxml')
-rw-r--r--poxml/antlr/antlr/AST.hpp2
-rw-r--r--poxml/antlr/antlr/ASTFactory.hpp2
-rw-r--r--poxml/antlr/antlr/BaseAST.hpp4
-rw-r--r--poxml/antlr/src/ASTFactory.cpp6
-rw-r--r--poxml/antlr/src/BaseAST.cpp10
-rw-r--r--poxml/parser.cpp52
-rw-r--r--poxml/split.cpp2
7 files changed, 39 insertions, 39 deletions
diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp
index 7eb883c2..a36ffd15 100644
--- a/poxml/antlr/antlr/AST.hpp
+++ b/poxml/antlr/antlr/AST.hpp
@@ -59,7 +59,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0;
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0;
- /** Get the first child of this node; null if no tqchildren */
+ /** Get the first child of this node; null if no children */
virtual RefAST getFirstChild() const=0;
/** Get the next sibling in line after this one */
virtual RefAST getNextSibling() const=0;
diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp
index f83bec10..584cee6d 100644
--- a/poxml/antlr/antlr/ASTFactory.hpp
+++ b/poxml/antlr/antlr/ASTFactory.hpp
@@ -90,7 +90,7 @@ public:
RefAST dupTree(RefAST t);
/** Make a tree from a list of nodes. The first element in the
* array is the root. If the root is null, then the tree is
- * a simple list not a tree. Handles null tqchildren nodes correctly.
+ * a simple list not a tree. Handles null children nodes correctly.
* For example, build(a, b, null, c) yields tree (a b c). build(null,a,b)
* yields tree (nil a b).
*/
diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp
index bf1e1629..7b93c1ef 100644
--- a/poxml/antlr/antlr/BaseAST.hpp
+++ b/poxml/antlr/antlr/BaseAST.hpp
@@ -70,7 +70,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t);
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t);
- /** Get the first child of this node; null if no tqchildren */
+ /** Get the first child of this node; null if no children */
virtual RefAST getFirstChild() const;
/** Get the next sibling in line after this one */
virtual RefAST getNextSibling() const;
@@ -80,7 +80,7 @@ public:
/** Get the token type for this node */
virtual int getType() const;
- /** Remove all tqchildren */
+ /** Remove all children */
virtual void removeChildren();
/** Set the first child of a node. */
diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp
index 66902522..e44386f7 100644
--- a/poxml/antlr/src/ASTFactory.cpp
+++ b/poxml/antlr/src/ASTFactory.cpp
@@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t)
RefAST ASTFactory::dupTree(RefAST t)
{
RefAST result = dup(t); // make copy of root
- // copy all tqchildren of root.
+ // copy all children of root.
if (t) {
result->setFirstChild( dupList(t->getFirstChild()) );
}
@@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t)
}
/** Make a tree from a list of nodes. The first element in the
* array is the root. If the root is null, then the tree is
- * a simple list not a tree. Handles null tqchildren nodes correctly.
+ * a simple list not a tree. Handles null children nodes correctly.
* For example, build(a, b, null, c) yields tree (a b c). build(null,a,b)
* yields tree (nil a b).
*/
@@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST> nodes)
if (root) {
root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set
}
- // link in tqchildren;
+ // link in children;
for (unsigned int i=1; i<nodes.size(); i++) {
if ( !nodes[i] ) continue; // ignore null nodes
if ( !root ) {
diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp
index d4b7368b..4080e0e8 100644
--- a/poxml/antlr/src/BaseAST.cpp
+++ b/poxml/antlr/src/BaseAST.cpp
@@ -64,7 +64,7 @@ void BaseAST::doWorkForFindAll(
(!partialMatch && sibling->equalsTree(target)) ) {
v.push_back(sibling);
}
- // regardless of match or not, check any tqchildren for matches
+ // regardless of match or not, check any children for matches
if ( sibling->getFirstChild() ) {
RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
}
@@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const
// as a quick optimization, check roots first.
if (!sibling->equals(t))
return false;
- // if roots match, do full list match test on tqchildren.
+ // if roots match, do full list match test on children.
if (sibling->getFirstChild()) {
if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
return false;
@@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
// as a quick optimization, check roots first.
if (!sibling->equals(sub))
return false;
- // if roots match, do partial list match test on tqchildren.
+ // if roots match, do partial list match test on children.
if (sibling->getFirstChild())
if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false;
@@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const
// check roots first
if (!equals(t))
return false;
- // if roots match, do full list match test on tqchildren.
+ // if roots match, do full list match test on children.
if (getFirstChild()) {
if (!getFirstChild()->equalsList(t->getFirstChild()))
return false;
@@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
// check roots first
if (!equals(sub))
return false;
- // if roots match, do full list partial match test on tqchildren.
+ // if roots match, do full list partial match test on children.
if (getFirstChild())
if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false;
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index 24b7b4cf..e15778b6 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName)
bool StructureParser::skippedEntity ( const TQString & name )
{
if (inside)
- message += TQString("&%1;").tqarg(name);
+ message += TQString("&%1;").arg(name);
return true;
}
@@ -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\"").tqarg(attr.qName(i)).tqarg(attr.value(i));
+ tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i));
}
- tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
- tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
+ tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
+ tmp += TQString(" poxml_col=\"%1\"").arg(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>]").tqarg(tag)), index);
- int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").tqarg(tag)), index);
+ int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index);
+ int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(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.tqat(index).latin1()) {
+ switch (message.at(index).latin1()) {
case '\n':
case '\t':
case '\r':
@@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
{
int slen = strlen(singletags[index]);
- if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").tqarg(singletags[index]) &&
+ if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) &&
!msg.msgid.at( slen + 1 ).isLetterOrNumber() )
{
#ifdef POXML_DEBUG
@@ -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>]").tqarg(tag)),
+ int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
strindex);
- int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
+ int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
strindex);
#ifdef POXML_DEBUG
@@ -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>]").tqarg(tag)),
+ int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
strindex - 1);
- int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
+ int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(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").tqarg(tname);
- message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
- message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
+ message += TQString("</%1").arg(tname);
+ message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
+ message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
message += ">";
}
}
@@ -713,8 +713,8 @@ void StructureParser::cleanupTags( TQString &contents )
contents.replace(TQRegExp("&"), "!POXML_AMP!");
for (int index = 0; literaltags[index]; index++) {
- TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index]));
- TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index]));
+ TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index]));
+ TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index]));
int strindex = 0;
while (true) {
strindex = contents.find(start, strindex);
@@ -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>").tqarg(tag));
+ contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(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>").tqarg(tag).tqarg(cut));
+ contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(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>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag));
+ contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(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>").tqarg(msgid));
+ contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid));
}
#ifdef POXML_DEBUG
@@ -788,7 +788,7 @@ 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*>").tqarg(tag).tqarg(tag));
+ TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag));
int strindex = 0;
while (true) {
strindex = contents.find(empty, strindex);
@@ -938,7 +938,7 @@ MsgList parseXML(const char *filename)
TQString replacement = "";
while (contents.at(endindex) != '>' || inside)
{
- switch (contents.tqat(endindex).latin1()) {
+ switch (contents.at(endindex).latin1()) {
case '<':
inside++; break;
case '>':
@@ -977,8 +977,8 @@ MsgList parseXML(const char *filename)
{
TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid);
if ((*it).msgid.length() < 4) {
- (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid +
- TQString("</%1>").tqarg((*it).tag);
+ (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid +
+ TQString("</%1>").arg((*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>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag);
+ (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag);
}
break;
}
diff --git a/poxml/split.cpp b/poxml/split.cpp
index 54217aa2..29104d3e 100644
--- a/poxml/split.cpp
+++ b/poxml/split.cpp
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
while (tit != translated.end())
{
MsgBlock mb;
- mb.msgid = TQString::fromLatin1("appended paragraph %1").tqarg(counter++);
+ mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++);
mb.msgstr = (*tit).msgid;
mb.lines += (*tit).lines;
english.append(mb);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 01:53:29 +0000