diff options
Diffstat (limited to 'kitchensync/src/multiconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/multiconflictdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index 7d7805c42..88d42d3b3 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -39,8 +39,10 @@ class ChangeItem : public KWidgetListItem { TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); - MemberInfo mi( change.member() ); - layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); + // TODO change doesn't contain member as struct member .. use SyncMapping to determine the correct member. + //MemberInfo mi( change.member() ); + //layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); + layout->addWidget( new TQLabel( "PORTING TODO", this ), 0, 0 ); TQString type; switch ( change.changeType() ) { |