<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://svn.reviewboard.kde.org/r/6322/">http://svn.reviewboard.kde.org/r/6322/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="http://svn.reviewboard.kde.org/r/6322/diff/1/?file=44189#file44189line171" style="color: black; font-weight: bold; text-decoration: underline;">trunk/KDE/kdelibs/kfile/kdirsortfilterproxymodel.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">bool KDirSortFilterProxyModel::subSortLessThan(const QModelIndex& left,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">171</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">return</span> <span class="n">d</span><span class="o">-></span><span class="n">compare</span><span class="p">(</span><span class="n">leftFileItem</span><span class="p">.</span><span class="n">text</span><span class="p">(),</span> <span class="n">rightFileItem</span><span class="p">.</span><span class="n">text</span><span class="p">(),</span> <span class="n">sortCaseSensitivity</span><span class="p">())</span> <span class="o"><</span> <span class="mi">0</span><span class="p">;</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">171</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">// KFileItem::text() may not be unique (in case UDS_DISPLAY_NAME is used). In that case we</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">For performance reasons I'd suggest to implement it this way:
const int result = d->compare(leftFileItem.text(), rightFileItem.text(), sortCaseSensitivity());
if (result == 0) {
return d->compare(leftFileItem.name(sortCaseSensitivity() == Qt::CaseInsensitive), rightFileItem.name(sortCaseSensitivity() == Qt::CaseInsensitive), sortCaseSensitivity()) < 0;
} else {
return result < 0;
}
By this we prevent doing another string comparison for equality for the default case.
Otherwise I'm fine with the change!
</pre>
</div>
<br />
<p>- Peter</p>
<br />
<p>On January 10th, 2011, 10:24 a.m., Sebastian Trueg wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://svn.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for kdelibs and Peter Penz.</div>
<div>By Sebastian Trueg.</div>
<p style="color: grey;"><i>Updated Jan. 10, 2011, 10:24 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">When sorting by name KDirSortFilterProxyModel uses UDS_DISPLAY_NAME. The latter, however, is not unique. This results in strange GUI behaviour like swapping items. This patch makes the model fall back to UDS_NAME to ensure a fixed sort order.
I also propose to backport it to 4.6.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>trunk/KDE/kdelibs/kfile/kdirsortfilterproxymodel.cpp <span style="color: grey">(1211983)</span></li>
</ul>
<p><a href="http://svn.reviewboard.kde.org/r/6322/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>