summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/svn_mergewidget.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit32b67ac0690de411b26b1d5e715b188c27442248 (patch)
tree43167816a3df6b3a877d71c9a7963ed270dcc8c9 /vcs/subversion/svn_mergewidget.h
parent330c33ab6f97b279737bf9527c9add7bb1475450 (diff)
downloadtdevelop-32b67ac0690de411b26b1d5e715b188c27442248.tar.gz
tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.zip
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
Diffstat (limited to 'vcs/subversion/svn_mergewidget.h')
-rw-r--r--vcs/subversion/svn_mergewidget.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h
index da2a46dc..7f4a25fe 100644
--- a/vcs/subversion/svn_mergewidget.h
+++ b/vcs/subversion/svn_mergewidget.h
@@ -34,7 +34,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL );
+ SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL );
virtual ~SvnMergeDialog();
KURL source1();