Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp
index b5f4890fc..53f051f1e 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.parentNode().nodeName();
+        id = left.tqparentNode().nodeName();
 
       conflictField( id, leftChild.text(), rightChild.text() );
 
-      left.parentNode().removeChild( left );
+      left.tqparentNode().removeChild( left );
       left = leftElement.firstChild();
 
-      right.parentNode().removeChild( right );
+      right.tqparentNode().removeChild( right );
       right = rightElement.firstChild();
 
     }
@@ -121,8 +121,8 @@ top:;
         compareNode( leftChild, rightChild );
 
         if ( !left.hasChildNodes() && !right.hasChildNodes() ) {
-          left.parentNode().removeChild( left );
-          right.parentNode().removeChild( right );
+          left.tqparentNode().removeChild( left );
+          right.tqparentNode().removeChild( right );
           goto top;
         }
 
@@ -133,13 +133,13 @@ top:;
         TQString id = leftChild.tagName();
 
         if ( id == "Content" )
-          id = left.parentNode().nodeName(); 
+          id = left.tqparentNode().nodeName(); 
  
 	if ( id != "Type" )
           //matchingField( id, leftChild.text(), rightChild.text() );
 
-        left.parentNode().removeChild( left );
-        right.parentNode().removeChild( right );
+        left.tqparentNode().removeChild( left );
+        right.tqparentNode().removeChild( right );
         goto top;
       }
     }