summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/distributionlisteditor.cpp34
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
@@ -37,5 +37,3 @@
-#ifndef KAB_EMBEDDED
-#include "distributionlisteditor.moc"
-#endif //KAB_EMBEDDED
+//US #include "distributionlisteditor.moc"
@@ -187,7 +185,4 @@ 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);
@@ -225,9 +220,8 @@ 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
@@ -255,7 +249,4 @@ void DistributionListEditor::removeEntry()
-#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;
@@ -271,7 +262,4 @@ void DistributionListEditor::changeEmail()
-#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;
@@ -297,7 +285,4 @@ void DistributionListEditor::updateEntryView()
}
-#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);
@@ -327,7 +312,4 @@ 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);