author | ulf69 <ulf69> | 2004-06-29 05:24:46 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:24:46 (UTC) |
commit | a027e7c5a476dbc101431ab8bf7987ba5d44d969 (patch) (side-by-side diff) | |
tree | 5e87c8df91cf17f2442e519677456dc731b13445 /kabc | |
parent | 5b8c654346bbbb32df6bf29065bff76c99de1653 (diff) | |
download | kdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.zip kdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.tar.gz kdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.tar.bz2 |
removed references to KAB_EMBEDDED macro
-rw-r--r-- | kabc/distributionlist.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index aa2725d..45b9dda 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -154,52 +154,49 @@ QStringList DistributionListManager::listNames() DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { names.append( list->name() ); } return names; } 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; } cfg.setGroup( mAddressBook->identifier() ); 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() ) { kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; return false; } 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; DistributionList *list = new DistributionList( this, name ); QStringList::ConstIterator it2 = value.begin(); while( it2 != value.end() ) { QString id = *it2++; QString email = *it2; @@ -231,63 +228,62 @@ bool DistributionListManager::save() for( list = mLists.first(); list; list = mLists.next() ) { kdDebug(5700) << " Saving '" << list->name() << "'" << endl; QStringList value; DistributionList::Entry::List entries = list->entries(); DistributionList::Entry::List::ConstIterator it; for( it = entries.begin(); it != entries.end(); ++it ) { value.append( (*it).addressee.uid() ); value.append( (*it).email ); } 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; } 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() { if ( !mSelf ) mSelf = new DistributionListWatcher(); return mSelf; } - -#ifndef KAB_EMBEDDED -#include "distributionlist.moc" -#endif //KAB_EMBEDDED +//US #include "distributionlist.moc" |