summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/conflictdialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync/src/conflictdialog.h')
-rw-r--r--kitchensync/src/conflictdialog.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
index 1a17e06c..81c91138 100644
--- a/kitchensync/src/conflictdialog.h
+++ b/kitchensync/src/conflictdialog.h
@@ -28,10 +28,10 @@
/**
Base class for SingleConflictDialog and MultiConflictDialog.
*/
-class ConflictDialog : public QDialog
+class ConflictDialog : public TQDialog
{
public:
- ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
+ ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
protected:
QSync::SyncMapping mMapping;