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.h10
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;
};