diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
| commit | d4f48636cc2631625434326e146d04f503d0247a (patch) | |
| tree | a371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/src/multiconflictdialog.cpp | |
| parent | d8b40941f9d1a221add0b9094eb09405a91a8aab (diff) | |
| download | tdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip | |
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/multiconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/multiconflictdialog.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index 88d42d3b3..7d7805c42 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -39,10 +39,8 @@ class ChangeItem : public KWidgetListItem { TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); - // 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 ); + MemberInfo mi( change.member() ); + layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); TQString type; switch ( change.changeType() ) { |