<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/5272/">http://svn.reviewboard.kde.org/r/5272/</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="/r/5272/diff/2/?file=35314#file35314line140" style="color: black; font-weight: bold; text-decoration: underline;">trunk/KDE/kdelibs/kdoctools/kio_help.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</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; ">QString HelpProtocol::lookupFile(const QString &fname,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">140</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">resultDocumentationNotFound</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</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;">OK, I misunderstood the code, and you misunderstood me... let's rewind.
I should have said: I don't see a reason to lookup documentationnotfound before looking documentationnotfound/index.html.
Just get rid of the first langLookup. Even better, put the index.html into the qstring variable. Doesn't this work?
const QString documentationNotFound = "khelpcenter/documentationnotfound/index.html";
if (!langLookup(documentationNotFound).isEmpty()) {
KUrl red;
red.setProtocol("help");
red.setPath(documentationNotFound);
red.setQuery(query);
redirection(red);
redirect = true;
}
This should be equivalent to your initial patch, just without the unused first langLookup.
Sorry for my wrong first comment.</pre>
</div>
<br />
<p>- David</p>
<br />
<p>On September 6th, 2010, 8:30 p.m., Burkhard Lück 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 David Faure.</div>
<div>By Burkhard Lück.</div>
<p style="color: grey;"><i>Updated 2010-09-06 20:30:13</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;">In case a requested help documentation was not found for whatever reason (not installed, no documentation, wrong/missing X-DocPath etc.) KHelpcenter/Konqueror display the error message "There is no documentation available for %1." and additionally a modal dialog with the error message "The file or folder help://%1 does not exist" pops up.
With this patch kio_help tries to load a docbook called "documentationnotfound" which will be installed with the khelpcenter documentation from kdebase/runtime. In this docbook the user will find information how to solve this issue and links to kde documentation online (docs.kde.org/userbase/forum).</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;">With this patch and no docbook "documentationnotfound" installed no change to the current situation, with an installed docbook "documentationnotfound" this is displayed as expected.</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/kdoctools/kio_help.cpp <span style="color: grey">(1170669)</span></li>
</ul>
<p><a href="http://svn.reviewboard.kde.org/r/5272/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>