diff options
Diffstat (limited to 'conduits/docconduit/doc-conflictdialog.cc')
| -rw-r--r-- | conduits/docconduit/doc-conflictdialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc index 5ea646b..8d1e211 100644 --- a/conduits/docconduit/doc-conflictdialog.cc +++ b/conduits/docconduit/doc-conflictdialog.cc @@ -39,8 +39,8 @@ #include <tqscrollview.h> -ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) - : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { +ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) + : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; |