diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-06 20:59:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-06 20:59:29 +0000 |
commit | 11f31c37e5fa4889d9989f10272f44845449cb7b (patch) | |
tree | 4383da04a76c497950d957fc6120b0fd0d9082c2 /src/gui/dialogs/FileMergeDialog.h | |
parent | 832eb69d571e8e518db45d0c0e6fbc0f00690209 (diff) | |
download | rosegarden-11f31c37e5fa4889d9989f10272f44845449cb7b.tar.gz rosegarden-11f31c37e5fa4889d9989f10272f44845449cb7b.zip |
Initial TQt conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/dialogs/FileMergeDialog.h')
-rw-r--r-- | src/gui/dialogs/FileMergeDialog.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h index f305cae..33a8638 100644 --- a/src/gui/dialogs/FileMergeDialog.h +++ b/src/gui/dialogs/FileMergeDialog.h @@ -27,11 +27,11 @@ #define _RG_FILEMERGEDIALOG_H_ #include <kdialogbase.h> -#include <qstring.h> +#include <tqstring.h> -class QWidget; -class QCheckBox; +class TQWidget; +class TQCheckBox; class KComboBox; @@ -45,13 +45,13 @@ class FileMergeDialog : public KDialogBase Q_OBJECT public: - FileMergeDialog(QWidget *parent, QString fileName, bool timingsDiffer); + FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer); int getMergeOptions(); private: KComboBox *m_choice; - QCheckBox *m_useTimings; + TQCheckBox *m_useTimings; }; |