author | zautrix <zautrix> | 2005-02-03 02:19:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-03 02:19:50 (UTC) |
commit | e0fce8c0f108e054cb6e4e4767affd04b398da45 (patch) (unidiff) | |
tree | 17414f89b5042809bab5b738dfcc37b4375b3b6d /microkde | |
parent | 7e3c508b7ee613c534c2bf0cacf38f96efaef613 (diff) | |
download | kdepimpi-e0fce8c0f108e054cb6e4e4767affd04b398da45.zip kdepimpi-e0fce8c0f108e054cb6e4e4767affd04b398da45.tar.gz kdepimpi-e0fce8c0f108e054cb6e4e4767affd04b398da45.tar.bz2 |
fixxx
-rw-r--r-- | microkde/kdecore/kprefs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/microkde/kdecore/kprefs.cpp b/microkde/kdecore/kprefs.cpp index 71050e7..0220a34 100644 --- a/microkde/kdecore/kprefs.cpp +++ b/microkde/kdecore/kprefs.cpp | |||
@@ -352,96 +352,97 @@ void KPrefsItemStringList::setDefault() | |||
352 | 352 | ||
353 | void KPrefsItemStringList::writeConfig(KConfig *config) | 353 | void KPrefsItemStringList::writeConfig(KConfig *config) |
354 | { | 354 | { |
355 | config->setGroup(mGroup); | 355 | config->setGroup(mGroup); |
356 | config->writeEntry(mName,*mReference); | 356 | config->writeEntry(mName,*mReference); |
357 | } | 357 | } |
358 | 358 | ||
359 | void KPrefsItemStringList::readConfig(KConfig *config) | 359 | void KPrefsItemStringList::readConfig(KConfig *config) |
360 | { | 360 | { |
361 | config->setGroup(mGroup); | 361 | config->setGroup(mGroup); |
362 | *mReference = config->readListEntry(mName); | 362 | *mReference = config->readListEntry(mName); |
363 | } | 363 | } |
364 | 364 | ||
365 | 365 | ||
366 | KPrefsItemIntList::KPrefsItemIntList(const QString &group,const QString &name, | 366 | KPrefsItemIntList::KPrefsItemIntList(const QString &group,const QString &name, |
367 | QValueList<int> *reference,const QValueList<int> &defaultValue) : | 367 | QValueList<int> *reference,const QValueList<int> &defaultValue) : |
368 | KPrefsItem(group,name) | 368 | KPrefsItem(group,name) |
369 | { | 369 | { |
370 | mReference = reference; | 370 | mReference = reference; |
371 | mDefault = defaultValue; | 371 | mDefault = defaultValue; |
372 | } | 372 | } |
373 | 373 | ||
374 | void KPrefsItemIntList::setDefault() | 374 | void KPrefsItemIntList::setDefault() |
375 | { | 375 | { |
376 | *mReference = mDefault; | 376 | *mReference = mDefault; |
377 | } | 377 | } |
378 | 378 | ||
379 | void KPrefsItemIntList::writeConfig(KConfig *config) | 379 | void KPrefsItemIntList::writeConfig(KConfig *config) |
380 | { | 380 | { |
381 | config->setGroup(mGroup); | 381 | config->setGroup(mGroup); |
382 | config->writeEntry(mName,*mReference); | 382 | config->writeEntry(mName,*mReference); |
383 | } | 383 | } |
384 | 384 | ||
385 | void KPrefsItemIntList::readConfig(KConfig *config) | 385 | void KPrefsItemIntList::readConfig(KConfig *config) |
386 | { | 386 | { |
387 | config->setGroup(mGroup); | 387 | config->setGroup(mGroup); |
388 | *mReference = config->readIntListEntry(mName); | 388 | *mReference = config->readIntListEntry(mName); |
389 | } | 389 | } |
390 | 390 | ||
391 | 391 | ||
392 | QString *KPrefs::mCurrentGroup = 0; | 392 | QString *KPrefs::mCurrentGroup = 0; |
393 | 393 | ||
394 | KPrefs::KPrefs(const QString &configname) | 394 | KPrefs::KPrefs(const QString &configname) |
395 | { | 395 | { |
396 | if (!configname.isEmpty()) { | 396 | if (!configname.isEmpty()) { |
397 | //qDebug("KPrefs::KPrefs %s",configname.latin1() ); | 397 | //qDebug("KPrefs::KPrefs %s",configname.latin1() ); |
398 | mConfig = new KConfig(locateLocal("config",configname)); | 398 | mConfig = new KConfig(locateLocal("config",configname)); |
399 | } else { | 399 | } else { |
400 | qDebug("KPrefs::Global config "); | ||
400 | mConfig = KGlobal::config(); | 401 | mConfig = KGlobal::config(); |
401 | } | 402 | } |
402 | 403 | ||
403 | mItems.setAutoDelete(true); | 404 | mItems.setAutoDelete(true); |
404 | 405 | ||
405 | // Set default group | 406 | // Set default group |
406 | if (mCurrentGroup == 0) mCurrentGroup = new QString("No Group"); | 407 | if (mCurrentGroup == 0) mCurrentGroup = new QString("No Group"); |
407 | } | 408 | } |
408 | 409 | ||
409 | KPrefs::~KPrefs() | 410 | KPrefs::~KPrefs() |
410 | { | 411 | { |
411 | if (mConfig != KGlobal::config()) { | 412 | if (mConfig != KGlobal::config()) { |
412 | delete mConfig; | 413 | delete mConfig; |
413 | } | 414 | } |
414 | } | 415 | } |
415 | 416 | ||
416 | void KPrefs::setCurrentGroup(const QString &group) | 417 | void KPrefs::setCurrentGroup(const QString &group) |
417 | { | 418 | { |
418 | if (mCurrentGroup) delete mCurrentGroup; | 419 | if (mCurrentGroup) delete mCurrentGroup; |
419 | mCurrentGroup = new QString(group); | 420 | mCurrentGroup = new QString(group); |
420 | } | 421 | } |
421 | 422 | ||
422 | KConfig *KPrefs::config() const | 423 | KConfig *KPrefs::config() const |
423 | { | 424 | { |
424 | return mConfig; | 425 | return mConfig; |
425 | } | 426 | } |
426 | 427 | ||
427 | void KPrefs::setDefaults() | 428 | void KPrefs::setDefaults() |
428 | { | 429 | { |
429 | KPrefsItem *item; | 430 | KPrefsItem *item; |
430 | for(item = mItems.first();item;item = mItems.next()) { | 431 | for(item = mItems.first();item;item = mItems.next()) { |
431 | item->setDefault(); | 432 | item->setDefault(); |
432 | } | 433 | } |
433 | 434 | ||
434 | usrSetDefaults(); | 435 | usrSetDefaults(); |
435 | } | 436 | } |
436 | 437 | ||
437 | void KPrefs::readConfig() | 438 | void KPrefs::readConfig() |
438 | { | 439 | { |
439 | KPrefsItem *item; | 440 | KPrefsItem *item; |
440 | for(item = mItems.first();item;item = mItems.next()) { | 441 | for(item = mItems.first();item;item = mItems.next()) { |
441 | item->readConfig(mConfig); | 442 | item->readConfig(mConfig); |
442 | } | 443 | } |
443 | 444 | ||
444 | usrReadConfig(); | 445 | usrReadConfig(); |
445 | //qDebug("KPrefs::readConfig: %s", mConfig->getFileName().latin1()); | 446 | //qDebug("KPrefs::readConfig: %s", mConfig->getFileName().latin1()); |
446 | } | 447 | } |
447 | 448 | ||