summaryrefslogtreecommitdiffstats
path: root/kitchensync
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync')
-rw-r--r--kitchensync/src/part.cpp4
-rw-r--r--kitchensync/src/part.h2
-rw-r--r--kitchensync/src/xmldiffalgo.cpp16
3 files changed, 11 insertions, 11 deletions
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 217b32bcc..70163b421 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -36,14 +36,14 @@
typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
-KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
+KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQStringList& )
: KParts::ReadOnlyPart( tqparent, name )
{
setInstance( KitchenSyncFactory::instance() );
- TQVBox *canvas = new TQVBox( tqparentWidget, widgetName );
+ TQVBox *canvas = new TQVBox( parentWidget, widgetName );
setWidget( canvas );
new MainWidget( this, canvas );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 82a641875..14d612610 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -33,7 +33,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
TQ_OBJECT
public:
- KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
+ KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList& );
virtual ~KitchenSyncPart();
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;
}
}