Changeset View
Changeset View
Standalone View
Standalone View
src/core/kconfigdata.cpp
| Show First 20 Lines • Show All 128 Lines • ▼ Show 20 Line(s) | 85 | { | |||
|---|---|---|---|---|---|
| 129 | 129 | | |||
| 130 | // set these here, since we may be changing the type of key from the one we found | 130 | // set these here, since we may be changing the type of key from the one we found | ||
| 131 | k.bLocal = (options & EntryLocalized); | 131 | k.bLocal = (options & EntryLocalized); | ||
| 132 | k.bDefault = (options & EntryDefault); | 132 | k.bDefault = (options & EntryDefault); | ||
| 133 | k.bRaw = (options & EntryRawKey); | 133 | k.bRaw = (options & EntryRawKey); | ||
| 134 | 134 | | |||
| 135 | e.mValue = value; | 135 | e.mValue = value; | ||
| 136 | e.bDirty = e.bDirty || (options & EntryDirty); | 136 | e.bDirty = e.bDirty || (options & EntryDirty); | ||
| 137 | e.bNotify = e.bNotify || (options & EntryNotify); | ||||
| 138 | | ||||
| 137 | e.bGlobal = (options & EntryGlobal); //we can't use || here, because changes to entries in | 139 | e.bGlobal = (options & EntryGlobal); //we can't use || here, because changes to entries in | ||
| 138 | //kdeglobals would be written to kdeglobals instead | 140 | //kdeglobals would be written to kdeglobals instead | ||
| 139 | //of the local config file, regardless of the globals flag | 141 | //of the local config file, regardless of the globals flag | ||
| 140 | e.bImmutable = e.bImmutable || (options & EntryImmutable); | 142 | e.bImmutable = e.bImmutable || (options & EntryImmutable); | ||
| 141 | if (value.isNull()) { | 143 | if (value.isNull()) { | ||
| 142 | e.bDeleted = e.bDeleted || (options & EntryDeleted); | 144 | e.bDeleted = e.bDeleted || (options & EntryDeleted); | ||
| 143 | } else { | 145 | } else { | ||
| 144 | e.bDeleted = false; // setting a value to a previously deleted entry | 146 | e.bDeleted = false; // setting a value to a previously deleted entry | ||
| ▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Line(s) | 260 | if (it != constEnd()) { | |||
| 264 | case EntryGlobal: | 266 | case EntryGlobal: | ||
| 265 | return it->bGlobal; | 267 | return it->bGlobal; | ||
| 266 | case EntryImmutable: | 268 | case EntryImmutable: | ||
| 267 | return it->bImmutable; | 269 | return it->bImmutable; | ||
| 268 | case EntryDeleted: | 270 | case EntryDeleted: | ||
| 269 | return it->bDeleted; | 271 | return it->bDeleted; | ||
| 270 | case EntryExpansion: | 272 | case EntryExpansion: | ||
| 271 | return it->bExpand; | 273 | return it->bExpand; | ||
| 274 | case EntryNotify: | ||||
| 275 | return it->bNotify; | ||||
| 272 | default: | 276 | default: | ||
| 273 | break; // fall through | 277 | break; // fall through | ||
| 274 | } | 278 | } | ||
| 275 | } | 279 | } | ||
| 276 | 280 | | |||
| 277 | return false; | 281 | return false; | ||
| 278 | } | 282 | } | ||
| 279 | 283 | | |||
| Show All 11 Lines | 294 | case EntryImmutable: | |||
| 291 | it->bImmutable = bf; | 295 | it->bImmutable = bf; | ||
| 292 | break; | 296 | break; | ||
| 293 | case EntryDeleted: | 297 | case EntryDeleted: | ||
| 294 | it->bDeleted = bf; | 298 | it->bDeleted = bf; | ||
| 295 | break; | 299 | break; | ||
| 296 | case EntryExpansion: | 300 | case EntryExpansion: | ||
| 297 | it->bExpand = bf; | 301 | it->bExpand = bf; | ||
| 298 | break; | 302 | break; | ||
| 303 | case EntryNotify: | ||||
| 304 | it->bNotify = bf; | ||||
dfaure: missing break; | |||||
| 305 | break; | ||||
| 299 | default: | 306 | default: | ||
| 300 | break; // fall through | 307 | break; // fall through | ||
| 301 | } | 308 | } | ||
| 302 | } | 309 | } | ||
| 303 | } | 310 | } | ||
| 304 | 311 | | |||
| 305 | bool KEntryMap::revertEntry(const QByteArray &group, const QByteArray &key, KEntryMap::SearchFlags flags) | 312 | bool KEntryMap::revertEntry(const QByteArray &group, const QByteArray &key, KEntryMap::SearchFlags flags) | ||
| 306 | { | 313 | { | ||
| Show All 27 Lines | |||||
missing break;