<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D28221">View Revision</a></tr></table><br /><div><div><p>Note that the docu for KConfigGroup::hasDefault has this logic too:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">if ( (value == computedDefault) && !group.hasDefault(key) )
group.revertToDefault(key);
else
group.writeEntry(key, value);</pre></div>
<p>With the reasoning that we want to avoid writing out the value if the value is equal to computedDefault, UNLESS there's a system file that says otherwise.<br />
Your change seems to break this.</p>
<p>I see the overall setup as this, ordered by priority:</p>
<p>[C++ computed default] < [system config files] < [user kdeglobals] < [user app-specific config file]</p>
<p>!hasDefault() checks [system config files] and therefore should stay. Otherwise, when the situation is C++=1 system=2 and value to be written is 1 you'll revert() i.e. not write anything and then re-read 2, oops.<br />
Sounds like you should add a unittest for this case, to detect this regression...</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28221#inline-160638">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kconfigskeletontest.cpp:212</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QVERIFY</span><span class="p">(</span><span class="n">glob</span><span class="p">.</span><span class="n">sync</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">glob</span><span class="p">.</span><span class="n">reparseConfiguration</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">auto</span> <span class="n">s2</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">new</span> <span class="n">KConfigSkeleton</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"kconfigskeletontestrc"</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Is this needed? Nothing uses glob after this point.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D28221#inline-160639">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kconfigdata.cpp:319</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #74777d">//qDebug() << "looking up default entry with key=" << defaultKey;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">const</span> <span class="n">ConstIterator</span> <span class="n">defaultEntry</span> <span style="color: #aa2211">=</span> <span class="n">constFind</span><span class="p">(</span><span class="n">defaultKey</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">defaultEntry</span> <span style="color: #aa2211">!=</span> <span class="n">constEnd</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Q_ASSERT</span><span class="p">(</span><span class="n">defaultEntry</span><span class="p">.</span><span class="n">key</span><span class="p">().</span><span class="n">bDefault</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #74777d">//qDebug() << "found, update entry";</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa2211">*</span><span class="n">entry</span> <span style="color: #aa2211">=</span> <span style="color: #aa2211">*</span><span class="n">defaultEntry</span><span class="p">;</span> <span style="color: #74777d">// copy default value, for subsequent lookups</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">entry</span><span style="color: #aa2211">-></span><span class="n">mValue</span> <span style="color: #aa2211">=</span> <span class="n">QByteArray</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This means defaultEntry is now unused, and therefore defaultKey too.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R237 KConfig</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D28221">https://phabricator.kde.org/D28221</a></div></div><br /><div><strong>To: </strong>bport, ervin, dfaure, davidedmundson<br /><strong>Cc: </strong>kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns<br /></div>