| -rw-r--r-- | kabc/distributionlist.cpp | 26 |
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 @@ -162,10 +162,9 @@ QStringList DistributionListManager::listNames() bool DistributionListManager::load() { KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); -#ifndef KAB_EMBEDDED - +/*US QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() ); if ( entryMap.isEmpty() ) { kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; return false; @@ -175,10 +174,9 @@ bool DistributionListManager::load() QMap<QString,QString>::ConstIterator it; 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 QStringList distlists = cfg.readListEntry( "Lists" ); if ( distlists.isEmpty() ) { @@ -189,9 +187,8 @@ bool DistributionListManager::load() QStringList::ConstIterator it; for( it = distlists.begin(); it != distlists.end(); ++it ) { QString name = *it; -#endif //KAB_EMBEDDED QStringList value = cfg.readListEntry( name ); kdDebug(5700) << "DLM::load(): " << name << ": " << value.join(",") << endl; @@ -239,18 +236,20 @@ bool DistributionListManager::save() } cfg.writeEntry( list->name(), value ); } -#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. QStringList namelist; for( list = mLists.first(); list; list = mLists.next() ) { namelist.append( list->name() ); } cfg.writeEntry( "Lists", namelist ); -#endif //KAB_EMBEDDED + + + + cfg.sync(); return true; @@ -260,23 +259,23 @@ DistributionListWatcher* DistributionListWatcher::mSelf = 0; DistributionListWatcher::DistributionListWatcher() : QObject( 0, "DistributionListWatcher" ) { -#ifndef KAB_EMBEDDED +/*US mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); 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 +*/ } DistributionListWatcher *DistributionListWatcher::self() { @@ -285,9 +284,6 @@ DistributionListWatcher *DistributionListWatcher::self() return mSelf; } - -#ifndef KAB_EMBEDDED -#include "distributionlist.moc" -#endif //KAB_EMBEDDED +//US #include "distributionlist.moc" |