rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 4 insertions, 4 deletions

diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 35679392..e7c03761 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -33,8 +33,8 @@
 class ChangeItem : public KWidgetListItem
 {
   public:
-    ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change )
-      : KWidgetListItem( tqparent ),
+    ChangeItem( KWidgetList *parent, const QSync::SyncChange &change )
+      : KWidgetListItem( parent ),
         mChange( change )
     {
       TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
@@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem
     QSync::SyncChange mChange;
 };
 
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
-  : ConflictDialog( mapping, tqparent )
+MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+  : ConflictDialog( mapping, parent )
 {
   initGUI();