diff options
Diffstat (limited to 'kitchensync/src/singleconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/singleconflictdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index f9228e174..c70402795 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -32,8 +32,8 @@ #include "singleconflictdialog.h" -SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) - : ConflictDialog( mapping, parent ), mDiffAlgo( 0 ) +SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) + : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 ) { initGUI(); |