diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
| commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
| tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/gui/dialogs/FileMergeDialog.h | |
| parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
| download | rosegarden-458efa7b.tar.gz rosegarden-458efa7b.zip | |
Initial TQt4 port of Rosegarden
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/dialogs/FileMergeDialog.h')
| -rw-r--r-- | src/gui/dialogs/FileMergeDialog.h | 3 |
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(); |