summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/FileMergeDialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/dialogs/FileMergeDialog.h')
-rw-r--r--src/gui/dialogs/FileMergeDialog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h
index 5675f59..94ef70b 100644
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@@ -46,7 +46,7 @@ class FileMergeDialog : public KDialogBase
TQ_OBJECT
public:
- FileMergeDialog(TQWidget *tqparent, TQString fileName, bool timingsDiffer);
+ FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
int getMergeOptions();