summaryrefslogtreecommitdiffstats
path: root/cervisia/mergedlg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia/mergedlg.cpp')
-rw-r--r--cervisia/mergedlg.cpp4
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)
{