| -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 @@ -34,11 +34,9 @@ #include "distributionlist.h" #include "distributionlisteditor.h" -#ifndef KAB_EMBEDDED -#include "distributionlisteditor.moc" -#endif //KAB_EMBEDDED +//US #include "distributionlisteditor.moc" using namespace KABC; EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString ¤t, @@ -184,13 +182,10 @@ 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); changeEmailButton->setEnabled(state); removeEntryButton->setEnabled(state); @@ -222,15 +217,14 @@ 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 if( !addresseeItem ) { kdDebug(5700) << "DLE::addEntry(): No addressee selected." << endl; @@ -252,13 +246,10 @@ void DistributionListEditor::removeEntry() { DistributionList *list = mManager->list( mNameCombo->currentText() ); 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; list->removeEntry( entryItem->addressee(), entryItem->email() ); delete entryItem; @@ -268,13 +259,10 @@ void DistributionListEditor::changeEmail() { DistributionList *list = mManager->list( mNameCombo->currentText() ); 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; QString email = EmailSelectDialog::getEmail( entryItem->addressee().emails(), entryItem->email(), this ); @@ -294,13 +282,10 @@ void DistributionListEditor::updateEntryView() DistributionList::Entry::List::ConstIterator it; for( it = entries.begin(); it != entries.end(); ++it ) { 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); changeEmailButton->setEnabled(state); removeEntryButton->setEnabled(state); @@ -324,12 +309,9 @@ 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()); } |