Changeset View
Changeset View
Standalone View
Standalone View
src/KProperty.cpp
Show First 20 Lines • Show All 556 Lines • ▼ Show 20 Line(s) | |||||
557 | void | 557 | void | ||
558 | KProperty::setOption(const char* name, const QVariant& val) | 558 | KProperty::setOption(const char* name, const QVariant& val) | ||
559 | { | 559 | { | ||
560 | d->options[name] = val; | 560 | d->options[name] = val; | ||
561 | } | 561 | } | ||
562 | 562 | | |||
563 | QVariant KProperty::option(const char* name, const QVariant& defaultValue) const | 563 | QVariant KProperty::option(const char* name, const QVariant& defaultValue) const | ||
564 | { | 564 | { | ||
565 | return d->option(name, defaultValue); | 565 | if (d->options.contains(name)) { | ||
staniek: Did you update the code?
KProperty::option looks different since Nov 3. | |||||
piggz: no i didnt..... | |||||
566 | return d->options[name]; | ||||
567 | } | ||||
568 | | ||||
569 | return parent()->option(name, defaultValue); | ||||
566 | } | 570 | } | ||
567 | 571 | | |||
568 | bool | 572 | bool | ||
569 | KProperty::hasOptions() const | 573 | KProperty::hasOptions() const | ||
570 | { | 574 | { | ||
571 | return !d->options.isEmpty(); | 575 | return !d->options.isEmpty(); | ||
572 | } | 576 | } | ||
573 | 577 | | |||
▲ Show 20 Lines • Show All 278 Lines • Show Last 20 Lines |
Did you update the code?
KProperty::option looks different since Nov 3.