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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h
index 33a8638..5675f59 100644
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@@ -43,9 +43,10 @@ namespace Rosegarden
class FileMergeDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
+ FileMergeDialog(TQWidget *tqparent, TQString fileName, bool timingsDiffer);
int getMergeOptions();