summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/distributionlist.cpp26
1 files changed, 11 insertions, 15 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index aa2725d..45b9dda 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -165,4 +165,3 @@ bool DistributionListManager::load()
-#ifndef KAB_EMBEDDED
-
+/*US
QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() );
@@ -178,4 +177,3 @@ bool DistributionListManager::load()
QString name = it.key();
-
-#else //KAB_EMBEDDED
+*/
cfg.setGroup( mAddressBook->identifier() );
@@ -192,3 +190,2 @@ bool DistributionListManager::load()
-#endif //KAB_EMBEDDED
@@ -242,3 +239,2 @@ bool DistributionListManager::save()
-#ifdef KAB_EMBEDDED
//US for microKDE we have not yet sophisticated methods to load maps.
@@ -251,3 +247,6 @@ bool DistributionListManager::save()
-#endif //KAB_EMBEDDED
+
+
+
+
@@ -263,3 +262,3 @@ DistributionListWatcher::DistributionListWatcher()
{
-#ifndef KAB_EMBEDDED
+/*US
mDirWatch = new KDirWatch;
@@ -269,3 +268,3 @@ DistributionListWatcher::DistributionListWatcher()
mDirWatch->startScan();
-#endif //KAB_EMBEDDED
+*/
}
@@ -274,6 +273,6 @@ DistributionListWatcher::~DistributionListWatcher()
{
-#ifndef KAB_EMBEDDED
+/*US
delete mDirWatch;
mDirWatch = 0;
-#endif //KAB_EMBEDDED
+*/
}
@@ -288,6 +287,3 @@ DistributionListWatcher *DistributionListWatcher::self()
-
-#ifndef KAB_EMBEDDED
-#include "distributionlist.moc"
-#endif //KAB_EMBEDDED
+//US #include "distributionlist.moc"