summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-06-29 05:24:46 (UTC)
committer ulf69 <ulf69>2004-06-29 05:24:46 (UTC)
commita027e7c5a476dbc101431ab8bf7987ba5d44d969 (patch) (side-by-side diff)
tree5e87c8df91cf17f2442e519677456dc731b13445
parent5b8c654346bbbb32df6bf29065bff76c99de1653 (diff)
downloadkdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.zip
kdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.tar.gz
kdepimpi-a027e7c5a476dbc101431ab8bf7987ba5d44d969.tar.bz2
removed references to KAB_EMBEDDED macro
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
@@ -163,8 +163,7 @@ 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;
@@ -176,8 +175,7 @@ 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" );
@@ -190,7 +188,6 @@ bool DistributionListManager::load()
for( it = distlists.begin(); it != distlists.end(); ++it ) {
QString name = *it;
-#endif //KAB_EMBEDDED
QStringList value = cfg.readListEntry( name );
@@ -240,7 +237,6 @@ 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;
@@ -249,7 +245,10 @@ bool DistributionListManager::save()
}
cfg.writeEntry( "Lists", namelist );
-#endif //KAB_EMBEDDED
+
+
+
+
cfg.sync();
@@ -261,21 +260,21 @@ 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()
@@ -286,8 +285,5 @@ DistributionListWatcher *DistributionListWatcher::self()
return mSelf;
}
-
-#ifndef KAB_EMBEDDED
-#include "distributionlist.moc"
-#endif //KAB_EMBEDDED
+//US #include "distributionlist.moc"