diff options
Diffstat (limited to 'kitchensync/src/multiconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/multiconflictdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index e7c037610..35679392d 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -33,8 +33,8 @@ class ChangeItem : public KWidgetListItem { public: - ChangeItem( KWidgetList *parent, const QSync::SyncChange &change ) - : KWidgetListItem( parent ), + ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change ) + : KWidgetListItem( tqparent ), mChange( change ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); @@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem QSync::SyncChange mChange; }; -MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) - : ConflictDialog( mapping, parent ) +MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) + : ConflictDialog( mapping, tqparent ) { initGUI(); |