diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch) | |
| tree | babc4a761925023e16fa94633959f35d1c251887 /cervisia/mergedlg.cpp | |
| parent | 0813b39aed2cf4c84157a22c4c9594336d93d412 (diff) | |
| download | tdesdk-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.cpp')
| -rw-r--r-- | cervisia/mergedlg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index d0f015ed..be371c62 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -34,8 +34,8 @@ MergeDialog::MergeDialog(CvsService_stub* service, - TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("CVS Merge"), + TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("CVS Merge"), Ok | Cancel, Ok, true), cvsService(service) { |