<table><tr><td style="">ervin requested changes to this revision.<br />ervin 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/D8243" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Note that the summary part of the commit is now wrong (it still refers to KCategorizedView).</p>

<p>Also, KFilePlacesModelTest needs to be adjusted to take into account the new behavior.</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/D8243#inline-34705" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesitem.cpp:179</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 style="color: #aa4000">if</span> <span class="p">(</span><span class="n">protocol</span> <span style="color: #aa2211">==</span> <span class="n">QLatin1String</span><span class="p">(</span><span style="color: #766510">"bluetooth"</span><span class="p">)</span> <span style="color: #aa2211">||</span> <span class="n">protocol</span> <span style="color: #aa2211">==</span> <span class="n">QLatin1String</span><span class="p">(</span><span style="color: #766510">"obexftp"</span><span class="p">)</span> <span style="color: #aa2211">||</span> <span class="n">protocol</span> <span style="color: #aa2211">==</span> <span class="n">QLatin1String</span><span class="p">(</span><span style="color: #766510">"kdeconnect"</span><span class="p">))</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">            <span style="color: #aa4000">return</span> <span class="n">DevicesType</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Long line, would be nice to split it.</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/D8243#inline-34706" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesitem_p.h:106</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 class="n">QStringList</span> <span class="n">m_emblems</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">QString</span> <span class="n">m_group</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span class="p">};</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Rename to m_groupName ?</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/D8243#inline-34707" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesmodel.cpp:474</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 style="color: #74777d">// return a sorted list based on groups</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">qStableSort</span><span class="p">(</span><span class="n">items</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">items</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span> <span class="p">[](</span><span class="n">KFilePlacesItem</span> <span style="color: #aa2211">*</span><span class="n">itemA</span><span class="p">,</span> <span class="n">KFilePlacesItem</span> <span style="color: #aa2211">*</span><span class="n">itemB</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">       <span style="color: #aa4000">return</span> <span class="p">(</span><span class="n">itemA</span><span style="color: #aa2211">-></span><span class="n">groupType</span><span class="p">()</span> <span style="color: #aa2211"><</span> <span class="n">itemB</span><span style="color: #aa2211">-></span><span class="n">groupType</span><span class="p">());</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Might be worth breaking the line after "items.end(),"</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/D8243#inline-34708" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesview.cpp:62</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: #aa4000">public</span><span style="color: #aa2211">:</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="n">KFilePlacesViewDelegate</span><span class="p">(</span><span class="n">KFilePlacesView</span> <span style="color: #aa2211">*</span><span class="n">parent</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">KFilePlacesViewDelegate</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span style="color: #aa4000"><span class="bright">int</span></span><span class="bright"> </span><span class="n"><span class="bright">sectionRole</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n">KFilePlacesView</span> <span style="color: #aa2211">*</span><span class="n">parent</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; ">    <span style="color: #aa4000">virtual</span> <span style="color: #aa2211">~</span><span class="n">KFilePlacesViewDelegate</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I don't see the point of that ctor change. KFilePlacesView(Delegate) is already very much coupled to KFilePlacesModel anyway, so could be hardcoded to KFilePlacesModel::GroupRole.</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/D8243#inline-34709" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesview.cpp:104</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 style="color: #aa4000">int</span> <span class="n">m_sectionRole</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Likewise, can go away in my opinion.</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/D8243#inline-34712" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesview.cpp:342-356</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 style="color: #aa4000">if</span> <span class="p">(</span><span class="n">index</span><span class="p">.</span><span class="n">row</span><span class="p">()</span> <span style="color: #aa2211">==</span> <span style="color: #601200">0</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #aa4000">return</span> <span style="color: #304a96">true</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">const</span> <span class="n">QAbstractItemModel</span> <span style="color: #aa2211">*</span><span class="n">model</span> <span style="color: #aa2211">=</span> <span class="n">index</span><span class="p">.</span><span class="n">model</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">QVariant</span> <span class="n">section</span> <span style="color: #aa2211">=</span> <span class="n">index</span><span class="p">.</span><span class="n">data</span><span class="p">(</span><span class="n">m_sectionRole</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">QModelIndex</span> <span class="n">prevIndex</span> <span style="color: #aa2211">=</span> <span class="n">model</span><span style="color: #aa2211">-></span><span class="n">index</span><span class="p">(</span><span class="n">index</span><span class="p">.</span><span class="n">row</span><span class="p">()</span> <span style="color: #aa2211">-</span> <span style="color: #601200">1</span><span class="p">,</span> <span class="n">index</span><span class="p">.</span><span class="n">column</span><span class="p">(),</span> <span class="n">index</span><span class="p">.</span><span class="n">parent</span><span class="p">());</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I'd consider refactoring this by splitting it in several helper functions:</p>

<ul class="remarkup-list">
<li class="remarkup-list-item">one which returns the groupName from an index (and so an empty string if the passed index is invalid);</li>
<li class="remarkup-list-item">one which returns the previous visible index starting from an index (pretty much encapsulating the loop you got);</li>
</ul>

<p style="padding: 0; margin: 8px;">The whole block would then turn into something like:<br />
const auto groupName = groupNameFromIndex(index);<br />
const auto previousGroupName = groupNameFromIndex(previousVisibleIndex(index));<br />
return groupName != previousGroupName;</p>

<p style="padding: 0; margin: 8px;">More elegant and readable in my opinion, also make sure the whole method is at the same abstraction level.</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/D8243#inline-34713" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kfileplacesview.cpp:1172</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 style="color: #aa4000">for</span><span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">i</span><span style="color: #aa2211">=</span><span style="color: #601200">0</span><span class="p">;</span> <span class="n">i</span> <span style="color: #aa2211"><</span> <span class="n">q</span><span style="color: #aa2211">-></span><span class="n">model</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">rowCount</span><span class="p">();</span> <span class="n">i</span><span style="color: #aa2211">++</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">q</span><span style="color: #aa2211">-></span><span class="n">isRowHidden</span><span class="p">(</span><span class="n">i</span><span class="p">))</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Spaces before and after =</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D8243" rel="noreferrer">https://phabricator.kde.org/D8243</a></div></div><br /><div><strong>To: </strong>renatoo, Frameworks, dfaure, ervin<br /><strong>Cc: </strong>ervin, anthonyfieroni, cfeck, Frameworks<br /></div>