summaryrefslogtreecommitdiffstats
path: root/cervisia/mergedlg.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
commit22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch)
treebabc4a761925023e16fa94633959f35d1c251887 /cervisia/mergedlg.h
parent0813b39aed2cf4c84157a22c4c9594336d93d412 (diff)
downloadtdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.tar.gz
tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'cervisia/mergedlg.h')
-rw-r--r--cervisia/mergedlg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h
index 58327b74..25289224 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -38,7 +38,7 @@ class MergeDialog : public KDialogBase
public:
MergeDialog( CvsService_stub* service,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
bool byBranch() const;
TQString branch() const;