<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/127138/">https://git.reviewboard.kde.org/r/127138/</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="https://git.reviewboard.kde.org/r/127138/diff/1/?file=445029#file445029line692" style="color: black; font-weight: bold; text-decoration: underline;">konqueror/src/konqview.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">692</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">isValid</span><span class="p">()</span> <span class="o">&&</span> <span class="n">url</span><span class="p">.</span><span class="n">isLocalFile</span><span class="p">()</span> <span class="o">&&</span> <span class="n">url</span><span class="p">.</span><span class="n">fileName</span><span class="p">()</span> <span class="o">==</span> <span class="k">this</span><span class="o">-></span><span class="n">url</span><span class="p">().</span><span class="n">fileName</span><span class="p">())</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">692</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">QUrl</span> <span class="nf">ourUrl</span><span class="p">(</span><span class="k">this</span><span class="o">-></span><span class="n">url</span><span class="p">().</span><span class="n">adjusted</span><span class="p">(</span><span class="n">QUrl</span><span class="o">::</span><span class="n">StripTrailingSlash</span><span class="p">));</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Your code is correct in that it's equivalent to the old code. However I wonder if this couldn't be simplified.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">If we want to display the filename of this->url(), unless "caption" was set to something completely different by the part, we could just compare path() instead of fileName()...</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><span style="color: #008000; font-weight: bold">const</span> <span style="color: #008000; font-weight: bold">QUrl</span> <span style="color: #008000; font-weight: bold">captionUrl</span><span style="color: #666666">(</span><span style="color: #008000; font-weight: bold">QUrl</span><span style="color: #666666">:</span><span style="color: #AA22FF">:fromUserInput</span><span style="color: #666666">(</span><span style="color: #008000; font-weight: bold">caption</span><span style="color: #666666">));</span>
<span style="color: #008000; font-weight: bold">if</span> <span style="color: #666666">(</span><span style="color: #008000; font-weight: bold">captionUrl</span><span style="color: #0000FF; font-weight: bold">.isValid</span><span style="color: #666666">()</span> <span style="color: #666666">&&</span> <span style="color: #008000; font-weight: bold">captionUrl</span><span style="color: #0000FF; font-weight: bold">.isLocalFile</span><span style="color: #666666">()</span> <span style="color: #666666">&&</span> <span style="color: #008000; font-weight: bold">captionUrl</span><span style="color: #0000FF; font-weight: bold">.path</span><span style="color: #666666">()</span> <span style="color: #666666">==</span> <span style="color: #008000; font-weight: bold">url</span><span style=
"color: #666666">()</span><span style="color: #0000FF; font-weight: bold">.path</span><span style="color: #666666">())</span> {
adjustedCaption <span style="color: #666666">=</span> captionUrl<span style="color: #666666">.</span>adjusted(QUrl<span style="color: #666666">::</span>StripTrailingSlash)<span style="color: #666666">.</span>fileName();
<span style="color: #666666">//</span> if empty<span style="color: #666666">...</span>
}
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This looks a bit simpler, I think? If you agree, can you test it, and push it if it works?</p></pre>
</div>
</div>
<br />
<p>- David Faure</p>
<br />
<p>On February 22nd, 2016, 3:12 p.m. UTC, Jonathan Marten wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for KDE Base Apps and David Faure.</div>
<div>By Jonathan Marten.</div>
<p style="color: grey;"><i>Updated Feb. 22, 2016, 3:12 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kde-baseapps
</div>
<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;">This happens when a local file URL which ends in "/" is navigated to. For example, going to "/home/user" correctly shows "user" as the window title, while going to "/home/user/" shows "/" because the fileName() of that URL is empty. This happens in particular when using the "Up" action, as it goes from "/home/user/foo" to "/home/user/".
This change ensures that trailing slashes are removed from URLs before using fileName() on them.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </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;">Built kde-baseapps with these changes, observed correct display of base name in Konqueror window title while navigating.</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>konqueror/src/konqview.cpp <span style="color: grey">(3707c7a)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/127138/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>