| -rw-r--r-- | kabc/distributionlisteditor.cpp | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp index 569dc96..8b485d8 100644 --- a/kabc/distributionlisteditor.cpp +++ b/kabc/distributionlisteditor.cpp @@ -36,7 +36,5 @@ #include "distributionlisteditor.h" -#ifndef KAB_EMBEDDED -#include "distributionlisteditor.moc" -#endif //KAB_EMBEDDED +//US #include "distributionlisteditor.moc" using namespace KABC; @@ -186,9 +184,6 @@ DistributionListEditor::~DistributionListEditor() void DistributionListEditor::slotSelectionEntryViewChanged() { -#ifndef KAB_EMBEDDED - EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); -#else //KAB_EMBEDDED +//US EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); EditEntryItem *entryItem = (EditEntryItem *)( mEntryView->selectedItem() ); -#endif //KAB_EMBEDDED bool state = (entryItem != 0L); @@ -224,11 +219,10 @@ void DistributionListEditor::removeList() void DistributionListEditor::addEntry() { -#ifndef KAB_EMBEDDED +/*US AddresseeItem *addresseeItem = dynamic_cast<AddresseeItem *>( mAddresseeView->selectedItem() ); -#else //KAB_EMBEDDED +*/ AddresseeItem *addresseeItem = (AddresseeItem *)( mAddresseeView->selectedItem() ); -#endif //KAB_EMBEDDED @@ -254,9 +248,6 @@ void DistributionListEditor::removeEntry() if ( !list ) return; -#ifndef KAB_EMBEDDED - EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); -#else //KAB_EMBEDDED +//US EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); EditEntryItem *entryItem = (EditEntryItem *)( mEntryView->selectedItem() ); -#endif //KAB_EMBEDDED if ( !entryItem ) return; @@ -270,9 +261,6 @@ void DistributionListEditor::changeEmail() if ( !list ) return; -#ifndef KAB_EMBEDDED - EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); -#else //KAB_EMBEDDED +//US EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); EditEntryItem *entryItem = (EditEntryItem *)( mEntryView->selectedItem() ); -#endif //KAB_EMBEDDED if ( !entryItem ) return; @@ -296,9 +284,6 @@ void DistributionListEditor::updateEntryView() new EditEntryItem( mEntryView, (*it).addressee, (*it).email ); } -#ifndef KAB_EMBEDDED - EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); -#else //KAB_EMBEDDED +//US EditEntryItem *entryItem = dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() ); EditEntryItem *entryItem = (EditEntryItem *)( mEntryView->selectedItem() ); -#endif //KAB_EMBEDDED bool state = (entryItem != 0L); @@ -326,9 +311,6 @@ void DistributionListEditor::updateNameCombo() void DistributionListEditor::slotSelectionAddresseeViewChanged() { -#ifndef KAB_EMBEDDED - AddresseeItem *addresseeItem = dynamic_cast<AddresseeItem *>( mAddresseeView->selectedItem() ); -#else //KAB_EMBEDDED +//US AddresseeItem *addresseeItem = dynamic_cast<AddresseeItem *>( mAddresseeView->selectedItem() ); AddresseeItem *addresseeItem = (AddresseeItem *)( mAddresseeView->selectedItem() ); -#endif //KAB_EMBEDDED bool state = (addresseeItem != 0L); addEntryButton->setEnabled( state && !mNameCombo->currentText().isEmpty()); |