summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/singleconflictdialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync/src/singleconflictdialog.h')
-rw-r--r--kitchensync/src/singleconflictdialog.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
index 25ff4bd78..9c80f7fc6 100644
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@@ -33,9 +33,10 @@ class HTMLDiffAlgoDisplay;
class SingleConflictDialog : public ConflictDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
+ SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
~SingleConflictDialog();
private slots: