1 files changed, 2 insertions, 1 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h
index f0c8b21..83cb8d4 100644
--- a/conduits/docconduit/doc-conflictdialog.h
+++ b/conduits/docconduit/doc-conflictdialog.h
@@ -54,9 +54,10 @@ typedef struct conflictEntry {
 class ResolutionDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
+	ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
 	~ResolutionDialog();
 
 	bool hasConflicts;