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/conflictdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kitchensync/src/conflictdialog.cpp')

diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp
index c3e236cc..39943ffe 100644
--- a/kitchensync/src/conflictdialog.cpp
+++ b/kitchensync/src/conflictdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "conflictdialog.h"
 
-ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
-  : TQDialog( tqparent ), mMapping( mapping )
+ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+  : TQDialog( parent ), mMapping( mapping )
 {
 }
-- 
cgit v1.2.3