From 36a36a5c1015aa0d03f4515c401e907ddb9d6291 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 22:19:39 +0000
Subject: 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
---
 kitchensync/src/multiconflictdialog.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kitchensync/src/multiconflictdialog.h')

diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
index fd0cdef53..8709ee63a 100644
--- a/kitchensync/src/multiconflictdialog.h
+++ b/kitchensync/src/multiconflictdialog.h
@@ -31,7 +31,7 @@ class MultiConflictDialog : public ConflictDialog
   TQ_OBJECT
 
   public:
-    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
     ~MultiConflictDialog();
 
   private slots:
-- 
cgit v1.2.1