Differential D27833 Diff 76938 src/core/kcoreconfigskeleton.cpp

Changeset View

Standalone View

View Options

src/core/kcoreconfigskeleton.cpp

Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s)
175} 175​}
176 176​
177bool KConfigSkeletonItem::isSaveNeeded() const 177​bool KConfigSkeletonItem::isSaveNeeded() const
178{ 178​{
179 Q_D(const KConfigSkeletonItem); 179​ Q_D(const KConfigSkeletonItem);
180 return d->mIsSaveNeededImpl(); 180​ return d->mIsSaveNeededImpl();
181} 181​}
182 182​
183​QVariant KConfigSkeletonItem::loadedValue() const
184​{
185​ Q_D(const KConfigSkeletonItem);
186​ return d->mLoadedValueImpl();
187​}
188​
183void KConfigSkeletonItem::readImmutability(const KConfigGroup &group) 189​void KConfigSkeletonItem::readImmutability(const KConfigGroup &group)
184{ 190​{
185 Q_D(KConfigSkeletonItem); 191​ Q_D(KConfigSkeletonItem);
186 d->mIsImmutable = group.isEntryImmutable(mKey); 192​ d->mIsImmutable = group.isEntryImmutable(mKey);
187} 193​}
188 194​
189void KConfigSkeletonItem::setIsDefaultImpl(const std::function<bool ()> &impl) 195​void KConfigSkeletonItem::setIsDefaultImpl(const std::function<bool ()> &impl)
190{ 196​{
191 Q_D(KConfigSkeletonItem); 197​ Q_D(KConfigSkeletonItem);
192 d->mIsDefaultImpl = impl; 198​ d->mIsDefaultImpl = impl;
193} 199​}
194 200​
195void KConfigSkeletonItem::setIsSaveNeededImpl(const std::function<bool ()> &impl) 201​void KConfigSkeletonItem::setIsSaveNeededImpl(const std::function<bool ()> &impl)
196{ 202​{
197 Q_D(KConfigSkeletonItem); 203​ Q_D(KConfigSkeletonItem);
198 d->mIsSaveNeededImpl = impl; 204​ d->mIsSaveNeededImpl = impl;
199} 205​}
200 206​
207​void KConfigSkeletonItem::setLoadedValueImpl(const std::function<QVariant ()> &impl)
208​{
209​ Q_D(KConfigSkeletonItem);
210​ d->mLoadedValueImpl= impl;
ervinUnsubmitted
Not Done

Missing space before =

ervin: Missing space before =
211​}
212​
201KPropertySkeletonItem::KPropertySkeletonItem(QObject *object, const QByteArray &propertyName, const QVariant &defaultValue) 213​KPropertySkeletonItem::KPropertySkeletonItem(QObject *object, const QByteArray &propertyName, const QVariant &defaultValue)
202 : KConfigSkeletonItem(*new KPropertySkeletonItemPrivate(object, propertyName, defaultValue), {}, {}) 214​ : KConfigSkeletonItem(*new KPropertySkeletonItemPrivate(object, propertyName, defaultValue), {}, {})
203{ 215​{
204 setIsDefaultImpl([this] { 216​ setIsDefaultImpl([this] {
205 Q_D(const KPropertySkeletonItem); 217​ Q_D(const KPropertySkeletonItem);
206 return d->mReference == d->mDefaultValue; 218​ return d->mReference == d->mDefaultValue;
207 }); 219​ });
208 setIsSaveNeededImpl([this] { 220​ setIsSaveNeededImpl([this] {
209 Q_D(const KPropertySkeletonItem); 221​ Q_D(const KPropertySkeletonItem);
210 return d->mReference != d->mLoadedValue; 222​ return d->mReference != d->mLoadedValue;
211 }); 223​ });
224​ setLoadedValueImpl([this] {
225​ Q_D(const KPropertySkeletonItem);
226​ return QVariant::fromValue(d->mLoadedValue);
ervinUnsubmitted
Not Done

This is already a QVariant

ervin: This is already a QVariant
227​ });
212} 228​}
213 229​
214QVariant KPropertySkeletonItem::property() const 230​QVariant KPropertySkeletonItem::property() const
215{ 231​{
216 Q_D(const KPropertySkeletonItem); 232​ Q_D(const KPropertySkeletonItem);
217 return d->mReference; 233​ return d->mReference;
218} 234​}
219 235​
▲ Show 20 Lines • Show All 1329 Lines • ▼ Show 20 Line(s)1562KConfigCompilerSignallingItem::KConfigCompilerSignallingItem(KConfigSkeletonItem* item, QObject* object,
1549 mObject(object), mUserData(userData) 1565​ mObject(object), mUserData(userData)
1550{ 1566​{
1551 Q_ASSERT(mTargetFunction); 1567​ Q_ASSERT(mTargetFunction);
1552 Q_ASSERT(mItem); 1568​ Q_ASSERT(mItem);
1553 Q_ASSERT(mObject); 1569​ Q_ASSERT(mObject);
1554 1570​
1555 setIsDefaultImpl([this] { return mItem->isDefault(); }); 1571​ setIsDefaultImpl([this] { return mItem->isDefault(); });
1556 setIsSaveNeededImpl([this] { return mItem->isSaveNeeded(); }); 1572​ setIsSaveNeededImpl([this] { return mItem->isSaveNeeded(); });
1573​ setLoadedValueImpl([this] { return mItem->loadedValue(); });
1557} 1574​}
1558 1575​
1559KConfigCompilerSignallingItem::~KConfigCompilerSignallingItem() 1576​KConfigCompilerSignallingItem::~KConfigCompilerSignallingItem()
1560{ 1577​{
1561} 1578​}
1562 1579​
1563bool KConfigCompilerSignallingItem::isEqual(const QVariant& p) const 1580​bool KConfigCompilerSignallingItem::isEqual(const QVariant& p) const
1564{ 1581​{
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines