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
@@ -35,9 +35,7 @@
 
 #include "distributionlisteditor.h"
 
-#ifndef KAB_EMBEDDED
-#include "distributionlisteditor.moc"
-#endif //KAB_EMBEDDED
+//US #include "distributionlisteditor.moc"
 
 using namespace KABC;
 
@@ -185,11 +183,8 @@ 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);
@@ -223,13 +218,12 @@ 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 ) {
@@ -253,11 +247,8 @@ 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() );
@@ -269,11 +260,8 @@ 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(),
@@ -295,11 +283,8 @@ void DistributionListEditor::updateEntryView()
   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);
@@ -325,11 +310,8 @@ 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());
 }