author | ulf69 <ulf69> | 2004-06-29 05:24:46 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:24:46 (UTC) |
commit | a027e7c5a476dbc101431ab8bf7987ba5d44d969 (patch) (unidiff) | |
tree | 5e87c8df91cf17f2442e519677456dc731b13445 | |
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 | |||
@@ -164,6 +164,5 @@ bool DistributionListManager::load() | |||
164 | KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); | 164 | KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); |
165 | 165 | ||
166 | #ifndef KAB_EMBEDDED | 166 | /*US |
167 | |||
168 | QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() ); | 167 | QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() ); |
169 | if ( entryMap.isEmpty() ) { | 168 | if ( entryMap.isEmpty() ) { |
@@ -177,6 +176,5 @@ bool DistributionListManager::load() | |||
177 | for( it = entryMap.begin(); it != entryMap.end(); ++it ) { | 176 | for( it = entryMap.begin(); it != entryMap.end(); ++it ) { |
178 | QString name = it.key(); | 177 | QString name = it.key(); |
179 | 178 | */ | |
180 | #else //KAB_EMBEDDED | ||
181 | cfg.setGroup( mAddressBook->identifier() ); | 179 | cfg.setGroup( mAddressBook->identifier() ); |
182 | //US we work in microkde with a list of distributionlists | 180 | //US we work in microkde with a list of distributionlists |
@@ -191,5 +189,4 @@ bool DistributionListManager::load() | |||
191 | QString name = *it; | 189 | QString name = *it; |
192 | 190 | ||
193 | #endif //KAB_EMBEDDED | ||
194 | 191 | ||
195 | QStringList value = cfg.readListEntry( name ); | 192 | QStringList value = cfg.readListEntry( name ); |
@@ -241,5 +238,4 @@ bool DistributionListManager::save() | |||
241 | } | 238 | } |
242 | 239 | ||
243 | #ifdef KAB_EMBEDDED | ||
244 | //US for microKDE we have not yet sophisticated methods to load maps. | 240 | //US for microKDE we have not yet sophisticated methods to load maps. |
245 | // Because of that we store also a list of all distributionlists. | 241 | // Because of that we store also a list of all distributionlists. |
@@ -250,6 +246,9 @@ bool DistributionListManager::save() | |||
250 | cfg.writeEntry( "Lists", namelist ); | 246 | cfg.writeEntry( "Lists", namelist ); |
251 | 247 | ||
252 | #endif //KAB_EMBEDDED | 248 | |
253 | 249 | ||
250 | |||
251 | |||
252 | |||
254 | cfg.sync(); | 253 | cfg.sync(); |
255 | 254 | ||
@@ -262,5 +261,5 @@ DistributionListWatcher::DistributionListWatcher() | |||
262 | : QObject( 0, "DistributionListWatcher" ) | 261 | : QObject( 0, "DistributionListWatcher" ) |
263 | { | 262 | { |
264 | #ifndef KAB_EMBEDDED | 263 | /*US |
265 | mDirWatch = new KDirWatch; | 264 | mDirWatch = new KDirWatch; |
266 | mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); | 265 | mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); |
@@ -268,13 +267,13 @@ DistributionListWatcher::DistributionListWatcher() | |||
268 | connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) ); | 267 | connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) ); |
269 | mDirWatch->startScan(); | 268 | mDirWatch->startScan(); |
270 | #endif //KAB_EMBEDDED | 269 | */ |
271 | } | 270 | } |
272 | 271 | ||
273 | DistributionListWatcher::~DistributionListWatcher() | 272 | DistributionListWatcher::~DistributionListWatcher() |
274 | { | 273 | { |
275 | #ifndef KAB_EMBEDDED | 274 | /*US |
276 | delete mDirWatch; | 275 | delete mDirWatch; |
277 | mDirWatch = 0; | 276 | mDirWatch = 0; |
278 | #endif //KAB_EMBEDDED | 277 | */ |
279 | } | 278 | } |
280 | 279 | ||
@@ -287,7 +286,4 @@ DistributionListWatcher *DistributionListWatcher::self() | |||
287 | } | 286 | } |
288 | 287 | ||
289 | 288 | //US #include "distributionlist.moc" | |
290 | #ifndef KAB_EMBEDDED | ||
291 | #include "distributionlist.moc" | ||
292 | #endif //KAB_EMBEDDED | ||
293 | 289 | ||