diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:30:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:30:29 +0000 |
| commit | d8b40941f9d1a221add0b9094eb09405a91a8aab (patch) | |
| tree | 0b8e9b6347f6e75925bb3c386a47c5300b1a4775 /kitchensync/src/multiconflictdialog.cpp | |
| parent | 009631d0fc83f471d6c515e2a5001337a5a2ea21 (diff) | |
| download | tdepim-d8b40941f9d1a221add0b9094eb09405a91a8aab.tar.gz tdepim-d8b40941f9d1a221add0b9094eb09405a91a8aab.zip | |
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
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() ) { |