summaryrefslogtreecommitdiffstats
path: root/quanta/parsers/saparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/parsers/saparser.cpp')
-rw-r--r--quanta/parsers/saparser.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index e562d47b..9a30273c 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -157,7 +157,7 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
- s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.tqparentNode);
+ s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.parentNode);
s_currentNode->tag->type = Tag::ScriptStructureBegin;
s_currentNode->tag->single = false;
@@ -166,7 +166,7 @@ bool SAParser::slotParseOneLine()
s_currentContext.lastNode = s_currentNode;
s_contextStack.push(s_currentContext);
- s_currentContext.tqparentNode = s_currentNode;
+ s_currentContext.parentNode = s_currentNode;
s_col = s_context.area.bCol + s_context.startString.length();
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_col;
@@ -208,14 +208,14 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
- s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.tqparentNode);
+ s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.parentNode);
if (s_currentNode)
{
s_currentNode->insideSpecial = true;
s_currentNode->specialInsideXml = m_specialInsideXml;
}
s_previousContext = s_contextStack.pop();
- s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+ s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.lastNode = s_previousContext.lastNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
@@ -232,14 +232,14 @@ bool SAParser::slotParseOneLine()
tag->setDtd(s_dtd);
tag->type = Tag::ScriptStructureEnd;
tag->single = true;
- Node *node = new Node(s_currentContext.tqparentNode);
+ Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
node->specialInsideXml = m_specialInsideXml;
- if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
+ if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
{
- s_currentContext.tqparentNode->child = node;
+ s_currentContext.parentNode->child = node;
}
else if (s_currentContext.lastNode)
{
@@ -275,7 +275,7 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
- s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.tqparentNode);
+ s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.parentNode);
if (s_currentNode)
{
s_currentNode->insideSpecial = true;
@@ -284,7 +284,7 @@ bool SAParser::slotParseOneLine()
}
//create a toplevel node for the included special area
AreaStruct area(s_line, specialAreaPos, s_line, specialAreaPos + foundText.length() - 1);
- Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.tqparentNode, s_currentNode);
+ Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.parentNode, s_currentNode);
#ifdef DEBUG_PARSER
kdDebug(24001) << "Parsing a nested area." << endl;
#endif
@@ -419,10 +419,10 @@ bool SAParser::slotParseOneLine()
{
s_context.area.bLine = s_line;
s_context.area.eLine = s_context.area.eCol = -1;
- s_context.tqparentNode = s_currentContext.tqparentNode;
+ s_context.parentNode = s_currentContext.parentNode;
s_currentContext.area.eLine = s_context.area.bLine;
s_currentContext.area.eCol = s_context.area.bCol - 1;
- // s_currentContext.tqparentNode = s_parentNode;
+ // s_currentContext.parentNode = s_parentNode;
s_contextStack.push(s_currentContext);
if (s_fullParse)
{
@@ -451,14 +451,14 @@ bool SAParser::slotParseOneLine()
}
tag->single = true;
//create a node with the above tag
- Node *node = new Node(s_currentContext.tqparentNode);
+ Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
node->specialInsideXml = m_specialInsideXml;
- if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
+ if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
{
- s_currentContext.tqparentNode->child = node;
+ s_currentContext.parentNode->child = node;
}
else if (s_currentNode)
{
@@ -522,12 +522,12 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
- s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.tqparentNode);
+ s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.parentNode);
s_currentNode->insideSpecial = true;
s_currentNode->specialInsideXml = m_specialInsideXml;
}
s_previousContext = s_contextStack.pop();
- s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+ s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = pos + 1;
@@ -570,7 +570,7 @@ bool SAParser::slotParseOneLine()
tag->type = Tag::Comment;
tag->single = true;
//create a node with the above tag
- Node *node = new Node(s_currentContext.tqparentNode);
+ Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
@@ -585,7 +585,7 @@ bool SAParser::slotParseOneLine()
s_currentNode = node;
}
s_previousContext = s_contextStack.pop();
- s_currentContext.tqparentNode = s_previousContext.tqparentNode;
+ s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_currentContext.area.eCol + 1;
@@ -635,11 +635,11 @@ bool SAParser::slotParseOneLine()
Node* SAParser::parseArea(const AreaStruct &specialArea,
const TQString &areaStartString,
const TQString &forcedAreaEndString,
- Node *tqparentNode,
+ Node *parentNode,
bool fullParse, bool synchronous)
{
m_synchronous = synchronous;
- s_parentNode = tqparentNode;
+ s_parentNode = parentNode;
s_fullParse = fullParse;
#ifdef DEBUG_PARSER
kdDebug(24001) << "parseArea full: " << s_fullParse << " synch: " << m_synchronous <<endl;
@@ -656,11 +656,11 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
s_dtd = 0L;
if (s_parentNode && !areaStartString.isEmpty())
{
- const DTDStruct *tqparentDTD = m_dtd;
+ const DTDStruct *parentDTD = m_dtd;
if (s_parentNode->tqparent)
- tqparentDTD = s_parentNode->tqparent->tag->dtd();
- s_dtd = DTDs::ref()->tqfind(tqparentDTD->specialAreaNames[areaStartString]);
- s_areaEndString = tqparentDTD->specialAreas[areaStartString];
+ parentDTD = s_parentNode->tqparent->tag->dtd();
+ s_dtd = DTDs::ref()->tqfind(parentDTD->specialAreaNames[areaStartString]);
+ s_areaEndString = parentDTD->specialAreas[areaStartString];
s_searchForAreaEnd = true;
}
if (!forcedAreaEndString.isEmpty())
@@ -702,7 +702,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_col;
s_currentContext.area.eLine = s_currentContext.area.eCol = -1;
- s_currentContext.tqparentNode = s_parentNode;
+ s_currentContext.parentNode = s_parentNode;
s_currentNode = s_parentNode;
m_lastParsedNode = 0L;
s_useReturnVars = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 16:09:36 +0000