summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit/doc-conflictdialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'conduits/docconduit/doc-conflictdialog.h')
-rw-r--r--conduits/docconduit/doc-conflictdialog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h
index e59c17c..410a1cd 100644
--- a/conduits/docconduit/doc-conflictdialog.h
+++ b/conduits/docconduit/doc-conflictdialog.h
@@ -54,7 +54,7 @@ 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);