summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/xmldiffalgo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync/src/xmldiffalgo.cpp')
-rw-r--r--kitchensync/src/xmldiffalgo.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp
index 53f051f1e..b5f4890fc 100644
--- a/kitchensync/src/xmldiffalgo.cpp
+++ b/kitchensync/src/xmldiffalgo.cpp
@@ -87,14 +87,14 @@ void XmlDiffAlgo::appendConflictNodes(TQDomElement &leftElement, TQDomElement &r
TQString id = leftChild.tagName();
if (id == "Content")
- id = left.tqparentNode().nodeName();
+ id = left.parentNode().nodeName();
conflictField( id, leftChild.text(), rightChild.text() );
- left.tqparentNode().removeChild( left );
+ left.parentNode().removeChild( left );
left = leftElement.firstChild();
- right.tqparentNode().removeChild( right );
+ right.parentNode().removeChild( right );
right = rightElement.firstChild();
}
@@ -121,8 +121,8 @@ top:;
compareNode( leftChild, rightChild );
if ( !left.hasChildNodes() && !right.hasChildNodes() ) {
- left.tqparentNode().removeChild( left );
- right.tqparentNode().removeChild( right );
+ left.parentNode().removeChild( left );
+ right.parentNode().removeChild( right );
goto top;
}
@@ -133,13 +133,13 @@ top:;
TQString id = leftChild.tagName();
if ( id == "Content" )
- id = left.tqparentNode().nodeName();
+ id = left.parentNode().nodeName();
if ( id != "Type" )
//matchingField( id, leftChild.text(), rightChild.text() );
- left.tqparentNode().removeChild( left );
- right.tqparentNode().removeChild( right );
+ left.parentNode().removeChild( left );
+ right.parentNode().removeChild( right );
goto top;
}
}