diff options
Diffstat (limited to 'src/gui/dialogs/FileMergeDialog.cpp')
| -rw-r--r-- | src/gui/dialogs/FileMergeDialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp index d7d48cf..7d378e6 100644 --- a/src/gui/dialogs/FileMergeDialog.cpp +++ b/src/gui/dialogs/FileMergeDialog.cpp @@ -40,10 +40,10 @@ namespace Rosegarden { -FileMergeDialog::FileMergeDialog(TQWidget *parent, +FileMergeDialog::FileMergeDialog(TQWidget *tqparent, TQString /*fileName*/, bool timingsDiffer) : - KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help) + KDialogBase(tqparent, 0, true, i18n("Merge File"), Ok | Cancel | Help) { setHelp("file-merge"); |