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 83cb8d4..e59c17c 100644
--- a/conduits/docconduit/doc-conflictdialog.h
+++ b/conduits/docconduit/doc-conflictdialog.h
@@ -57,7 +57,7 @@ class ResolutionDialog : public KDialogBase
TQ_OBJECT
public:
- ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
+ ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
~ResolutionDialog();
bool hasConflicts;