Differential D28128 Diff 78503 src/core/kconfigdata.cpp

Changeset View

Standalone View

src/core/kconfigdata.cpp

Show First 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s)		72	{
95		95
96	if (it != end()) {	96		if (it != end()) {
97	if (it->bImmutable) {	97		if (it->bImmutable) {
98	return false; // we cannot change this entry. Inherits group immutability.	98		return false; // we cannot change this entry. Inherits group immutability.
99	}	99		}
100	k = it.key();	100		k = it.key();
101	e = *it;	101		e = *it;
102	//qDebug() << "found existing entry for key" << k;	102		//qDebug() << "found existing entry for key" << k;
		103		// If overridden entry is global and not default. And it's overridden by a non global
		104		if (e.bGlobal && !(options & EntryGlobal) && !k.bDefault)
		105		{
			ervinUnsubmitted Done Should be at the end of the previous line ervin: Should be at the end of the previous line
		106		e.bOverridesGlobal = true;
		107		}
103	} else {	108		} else {
104	// make sure the group marker is in the map	109		// make sure the group marker is in the map
105	KEntryMap const *that = this;	110		KEntryMap const *that = this;
106	ConstIterator cit = that->findEntry(group);	111		ConstIterator cit = that->findEntry(group);
107	if (cit == constEnd()) {	112		if (cit == constEnd()) {
108	insert(KEntryKey(group), KEntry());	113		insert(KEntryKey(group), KEntry());
109	} else if (cit->bImmutable) {	114		} else if (cit->bImmutable) {
110	return false; // this group is immutable, so we cannot change this entry.	115		return false; // this group is immutable, so we cannot change this entry.
111	}	116		}
112		117
113	k = KEntryKey(group, key);	118		k = KEntryKey(group, key);
114	newKey = true;	119		newKey = true;
115	}	120		}
116		121
117	// set these here, since we may be changing the type of key from the one we found	122		// set these here, since we may be changing the type of key from the one we found
118	k.bLocal = (options & EntryLocalized);	123		k.bLocal = (options & EntryLocalized);
119	k.bDefault = (options & EntryDefault);	124		k.bDefault = (options & EntryDefault);
120	k.bRaw = (options & EntryRawKey);	125		k.bRaw = (options & EntryRawKey);
121		126
122	e.mValue = value;	127		e.mValue = value;
123	e.bDirty = e.bDirty \|\| (options & EntryDirty);	128		e.bDirty = e.bDirty \|\| (options & EntryDirty);
124	e.bNotify = e.bNotify \|\| (options & EntryNotify);	129		e.bNotify = e.bNotify \|\| (options & EntryNotify);
125		130
126	e.bGlobal = (options & EntryGlobal); //we can't use \|\| here, because changes to entries in	131		e.bGlobal = (options & EntryGlobal); //we can't use \|\| here, because changes to entries in
			mevenUnsubmitted Done s/overidded/overridden meven: s/overidded/overridden
127	//kdeglobals would be written to kdeglobals instead	132		//kdeglobals would be written to kdeglobals instead
128	//of the local config file, regardless of the globals flag	133		//of the local config file, regardless of the globals flag
129	e.bImmutable = e.bImmutable \|\| (options & EntryImmutable);	134		e.bImmutable = e.bImmutable \|\| (options & EntryImmutable);
130	if (value.isNull()) {	135		if (value.isNull()) {
131	e.bDeleted = e.bDeleted \|\| (options & EntryDeleted);	136		e.bDeleted = e.bDeleted \|\| (options & EntryDeleted);
132	} else {	137		} else {
133	e.bDeleted = false; // setting a value to a previously deleted entry	138		e.bDeleted = false; // setting a value to a previously deleted entry
134	}	139		}
▲ Show 20 Lines • Show All 194 Lines • Show Last 20 Lines