From d8b40941f9d1a221add0b9094eb09405a91a8aab Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 7 Sep 2010 22:30:29 +0000 Subject: Part 2/2 of Chakra patch commit git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172727 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kitchensync/src/multiconflictdialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kitchensync/src/multiconflictdialog.cpp') 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() ) { -- cgit v1.2.1