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
@@ -164,6 +164,5 @@ bool DistributionListManager::load()
KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
-#ifndef KAB_EMBEDDED
-
+/*US
QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() );
if ( entryMap.isEmpty() ) {
@@ -177,6 +176,5 @@ bool DistributionListManager::load()
for( it = entryMap.begin(); it != entryMap.end(); ++it ) {
QString name = it.key();
-
-#else //KAB_EMBEDDED
+*/
cfg.setGroup( mAddressBook->identifier() );
//US we work in microkde with a list of distributionlists
@@ -191,5 +189,4 @@ bool DistributionListManager::load()
QString name = *it;
-#endif //KAB_EMBEDDED
QStringList value = cfg.readListEntry( name );
@@ -241,5 +238,4 @@ bool DistributionListManager::save()
}
-#ifdef KAB_EMBEDDED
//US for microKDE we have not yet sophisticated methods to load maps.
// Because of that we store also a list of all distributionlists.
@@ -250,5 +246,8 @@ bool DistributionListManager::save()
cfg.writeEntry( "Lists", namelist );
-#endif //KAB_EMBEDDED
+
+
+
+
cfg.sync();
@@ -262,5 +261,5 @@ DistributionListWatcher::DistributionListWatcher()
: QObject( 0, "DistributionListWatcher" )
{
-#ifndef KAB_EMBEDDED
+/*US
mDirWatch = new KDirWatch;
mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
@@ -268,13 +267,13 @@ DistributionListWatcher::DistributionListWatcher()
connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) );
mDirWatch->startScan();
-#endif //KAB_EMBEDDED
+*/
}
DistributionListWatcher::~DistributionListWatcher()
{
-#ifndef KAB_EMBEDDED
+/*US
delete mDirWatch;
mDirWatch = 0;
-#endif //KAB_EMBEDDED
+*/
}
@@ -287,7 +286,4 @@ DistributionListWatcher *DistributionListWatcher::self()
}
-
-#ifndef KAB_EMBEDDED
-#include "distributionlist.moc"
-#endif //KAB_EMBEDDED
+//US #include "distributionlist.moc"