Changeset View
Changeset View
Standalone View
Standalone View
src/core/kcoreconfigskeleton.cpp
| Show First 20 Lines • Show All 569 Lines • ▼ Show 20 Line(s) | |||||
| 570 | } | 570 | } | ||
| 571 | 571 | | |||
| 572 | void KCoreConfigSkeleton::ItemLongLong::setMaxValue(qint64 v) | 572 | void KCoreConfigSkeleton::ItemLongLong::setMaxValue(qint64 v) | ||
| 573 | { | 573 | { | ||
| 574 | mHasMax = true; | 574 | mHasMax = true; | ||
| 575 | mMax = v; | 575 | mMax = v; | ||
| 576 | } | 576 | } | ||
| 577 | 577 | | |||
| 578 | QString KCoreConfigSkeleton::ItemEnum::Choice::value() const | ||||
| 579 | { | ||||
| 580 | return val.isEmpty() ? name : val; | ||||
ervin: Will need an update | |||||
You mean I should prepare this and put it in KF6 waiting for merge queue ? meven: You mean I should prepare this and put it in KF6 waiting for merge queue ? | |||||
No I meant the comment needs to be adjusted due to the changes (fields changing place and such) sorry if I was unclear. ervin: No I meant the comment needs to be adjusted due to the changes (fields changing place and such)… | |||||
meven: I updated the comment since your first comment, I think it is ok now. | |||||
| 581 | } | ||||
You mean KConfigSkeletonItemPrivate aren't you? (instead of KCoreConfigSkeletonPrivate) ervin: You mean KConfigSkeletonItemPrivate aren't you? (instead of KCoreConfigSkeletonPrivate) | |||||
| 582 | | ||||
| 578 | KCoreConfigSkeleton::ItemEnum::ItemEnum(const QString &_group, const QString &_key, | 583 | KCoreConfigSkeleton::ItemEnum::ItemEnum(const QString &_group, const QString &_key, | ||
| 579 | qint32 &reference, | 584 | qint32 &reference, | ||
| 580 | const QList<Choice> &choices, | 585 | const QList<Choice> &choices, | ||
| 581 | qint32 defaultValue) | 586 | qint32 defaultValue) | ||
ervin: This comment should go away | |||||
| 582 | : ItemInt(_group, _key, reference, defaultValue), mChoices(choices) | 587 | : ItemInt(_group, _key, reference, defaultValue), mChoices(choices) | ||
| 583 | { | 588 | { | ||
| 584 | } | 589 | } | ||
| 585 | 590 | | |||
| 586 | void KCoreConfigSkeleton::ItemEnum::readConfig(KConfig *config) | 591 | void KCoreConfigSkeleton::ItemEnum::readConfig(KConfig *config) | ||
| 587 | { | 592 | { | ||
| 588 | KConfigGroup cg(config, mGroup); | 593 | KConfigGroup cg(config, mGroup); | ||
| 589 | if (!cg.hasKey(mKey)) { | 594 | if (!cg.hasKey(mKey)) { | ||
| 590 | mReference = mDefault; | 595 | mReference = mDefault; | ||
| 591 | } else { | 596 | } else { | ||
| 592 | int i = 0; | 597 | int i = 0; | ||
| 593 | mReference = -1; | 598 | mReference = -1; | ||
| 594 | QString tmp = cg.readEntry(mKey, QString()).toLower(); | 599 | QString tmp = cg.readEntry(mKey, QString()).toLower(); | ||
| 595 | for (QList<Choice>::ConstIterator it = mChoices.constBegin(); | 600 | for (QList<Choice>::ConstIterator it = mChoices.constBegin(); | ||
| 596 | it != mChoices.constEnd(); ++it, ++i) { | 601 | it != mChoices.constEnd(); ++it, ++i) { | ||
| 597 | if ((*it).name.toLower() == tmp) { | 602 | if ((*it).value().toLower() == tmp) { | ||
| 598 | mReference = i; | 603 | mReference = i; | ||
| 599 | break; | 604 | break; | ||
| 600 | } | 605 | } | ||
| 601 | } | 606 | } | ||
| 602 | if (mReference == -1) { | 607 | if (mReference == -1) { | ||
| 603 | mReference = cg.readEntry(mKey, mDefault); | 608 | mReference = cg.readEntry(mKey, mDefault); | ||
| 604 | } | 609 | } | ||
| 605 | } | 610 | } | ||
| 606 | mLoadedValue = mReference; | 611 | mLoadedValue = mReference; | ||
| 607 | 612 | | |||
| 608 | readImmutability(cg); | 613 | readImmutability(cg); | ||
| 609 | } | 614 | } | ||
| 610 | 615 | | |||
| 611 | void KCoreConfigSkeleton::ItemEnum::writeConfig(KConfig *config) | 616 | void KCoreConfigSkeleton::ItemEnum::writeConfig(KConfig *config) | ||
| 612 | { | 617 | { | ||
| 613 | if (mReference != mLoadedValue) { // WABA: Is this test needed? | 618 | if (mReference != mLoadedValue) { // WABA: Is this test needed? | ||
| 614 | KConfigGroup cg(config, mGroup); | 619 | KConfigGroup cg(config, mGroup); | ||
| 615 | if ((mDefault == mReference) && !cg.hasDefault(mKey)) { | 620 | if ((mDefault == mReference) && !cg.hasDefault(mKey)) { | ||
| 616 | cg.revertToDefault(mKey, writeFlags()); | 621 | cg.revertToDefault(mKey, writeFlags()); | ||
| 617 | } else if ((mReference >= 0) && (mReference < mChoices.count())) { | 622 | } else if ((mReference >= 0) && (mReference < mChoices.count())) { | ||
| 618 | cg.writeEntry(mKey, mChoices[mReference].name, writeFlags()); | 623 | cg.writeEntry(mKey, mChoices[mReference].value(), writeFlags()); | ||
| 619 | } else { | 624 | } else { | ||
| 620 | cg.writeEntry(mKey, mReference, writeFlags()); | 625 | cg.writeEntry(mKey, mReference, writeFlags()); | ||
| 621 | } | 626 | } | ||
| 622 | mLoadedValue = mReference; | 627 | mLoadedValue = mReference; | ||
| 623 | } | 628 | } | ||
| 624 | } | 629 | } | ||
| 625 | 630 | | |||
| 626 | QList<KCoreConfigSkeleton::ItemEnum::Choice> KCoreConfigSkeleton::ItemEnum::choices() const | 631 | QList<KCoreConfigSkeleton::ItemEnum::Choice> KCoreConfigSkeleton::ItemEnum::choices() const | ||
| ▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines | |||||
Will need an update