From 32b67ac0690de411b26b1d5e715b188c27442248 Mon Sep 17 00:00:00 2001 From: tpearson 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/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- vcs/subversion/svn_mergewidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcs/subversion/svn_mergewidget.cpp') diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 8d3e5158..50731690 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -28,8 +28,8 @@ using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent ) - : SvnMergeOptionDialogBase( tqparent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) + : SvnMergeOptionDialogBase( parent ) { dest->setURL( wcTarget.prettyURL() ); -- cgit v1.2.1