<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/120554/">https://git.reviewboard.kde.org/r/120554/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On Oktober 16th, 2014, 10:47 nachm. UTC, <b>Kevin Kofler</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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/120554/diff/4/?file=318659#file318659line295" style="color: black; font-weight: bold; text-decoration: underline;">komparepart/kompare_part.cpp</a>
<span style="font-weight: normal;">
(Diff revision 4)
</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 KomparePart::fetchURL( const KUrl& url, bool addToSource )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">292</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="tb"> </span><span class="tb"> </span><span class="tb"> </span><span class="n">slotShowError</span><span class="p">(</span> <span class="n">i18n</span><span class="p">(</span> <span class="s">"<qt>The URL <b>%1</b> cannot be downloaded.</qt>"</span><span class="p">,</span> <span class="n">url</span><span class="p">.</span><span class="n"><span class="hl">prettyUrl</span></span><span class="p">()</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">294</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="tb"> </span><span class="tb"> </span><span class="tb"> </span><span class="n">slotShowError</span><span class="p">(</span> <span class="n">i18n</span><span class="p">(</span> <span class="s">"<qt>The URL <b>%1</b> cannot be downloaded.</qt>"</span><span class="p">,</span> <span class="n">url</span><span class="p">.</span><span class="n"><span class="hl">toString</span></span><span class="p">()</span> <span class="p">)</span> <span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
<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;">This should pass at least QUrl::RemoveUserInfo to toString(), we don't want to echo passwords in error messages.</p></pre>
</blockquote>
<p>On Oktober 16th, 2014, 10:52 nachm. UTC, <b>Kevin Kofler</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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;">(Somebody found this serious enough an issue to file http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2074 against KHTML, where the fix back then was to use prettyUrl. I hope there aren't more such issues introduced by this sloppy prettyUrl KF5 porting.)</p></pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; 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;">Actually, rather than QUrl::RemoveUserInfo, QUrl::RemovePassword is enough, you don't have to (and probably shouldn't) strip the user name. But you definitely don't want to output the password.</p></pre>
<br />
<p>- Kevin</p>
<br />
<p>On Oktober 16th, 2014, 5:24 vorm. UTC, Jeremy Whiting 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 kdelibs and Kevin Kofler.</div>
<div>By Jeremy Whiting.</div>
<p style="color: grey;"><i>Updated Okt. 16, 2014, 5:24 vorm.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kompare
</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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I spent a bit of time porting kompare to kf5. It builds and runs and compares files and folders but I'm pretty sure I missed something. </p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I'll reread my changes also but wanted to get this out there to be played with also.</p></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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">It builds, runs and seems to wok ok comparing files and folders. The QFileDialog it uses wasn't showing files I expected to see though, may need to play with the filters etc.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Also ported from KGlobal::ref() and KGlobal::unref() to QEventLoopLocker, though quitting one window closes all windows, not sure if that's expected or not.</p></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>libdialogpages/viewpage.cpp <span style="color: grey">(e26d72843587cf4ed60f0d7dcde51ec4f19aad29)</span></li>
<li>libdialogpages/viewsettings.h <span style="color: grey">(305e934815175c0fc60c8a045070e48f7b932935)</span></li>
<li>main.cpp <span style="color: grey">(ac68e2421c1f02460e732eb4dc7f79036df9db2e)</span></li>
<li>pics/CMakeLists.txt <span style="color: grey">(512f6e8cad202bc592c08531654754bd311fcb5e)</span></li>
<li>pics/hi128-app-kompare.png <span style="color: grey">()</span></li>
<li>pics/hi16-app-kompare.png <span style="color: grey">()</span></li>
<li>pics/hi22-app-kompare.png <span style="color: grey">()</span></li>
<li>pics/hi32-app-kompare.png <span style="color: grey">()</span></li>
<li>pics/hi48-app-kompare.png <span style="color: grey">()</span></li>
<li>pics/hisc-app-kompare.svgz <span style="color: grey">()</span></li>
<li>libdialogpages/pagebase.cpp <span style="color: grey">(4aa33d7d5b8eb6779bb96e5533d0f11235c30aac)</span></li>
<li>libdialogpages/filespage.cpp <span style="color: grey">(417fbd12b0f7622da23d0da0e934476d142df149)</span></li>
<li>libdialogpages/CMakeLists.txt <span style="color: grey">(22906650d1f0f8fb0b5d8d3d272f09d44bf7408c)</span></li>
<li>libdialogpages/diffpage.cpp <span style="color: grey">(94221ca8badbd1773ff48071fd558bd111750e47)</span></li>
<li>komparepart/komparesaveoptionswidget.cpp <span style="color: grey">(06530d85159305fc1330f495a1c52b0155e45e37)</span></li>
<li>komparepart/komparesplitter.h <span style="color: grey">(11a344f29f46d68ca5418c770bd5e502d527e0fe)</span></li>
<li>komparepart/komparesplitter.cpp <span style="color: grey">(2848f881992bae0b0e7141c1f6c47a2239211844)</span></li>
<li>komparepart/kompareview.h <span style="color: grey">(93ea0644a590c56e600e466a69bf227dc93328b1)</span></li>
<li>kompareurldialog.cpp <span style="color: grey">(561dd4518dda0be64198beff56e986da4294fe2b)</span></li>
<li>komparenavtreepart/CMakeLists.txt <span style="color: grey">(da52bc7d0d9f032d80f6f2257dbbed1f6fb0e81a)</span></li>
<li>komparenavtreepart/komparenavtreepart.h <span style="color: grey">(eb08329be477febe93b4ca7a8c787656abbfc68f)</span></li>
<li>komparenavtreepart/komparenavtreepart.cpp <span style="color: grey">(d3bdc93ddaf28e026b7c1847b8d4f6dbc46125ee)</span></li>
<li>komparepart/CMakeLists.txt <span style="color: grey">(ee83458a3034c3fb873629d650efe5668955900b)</span></li>
<li>komparepart/kompare_part.h <span style="color: grey">(0c4d3dd40ca32e07b2402280539d03f155555cfc)</span></li>
<li>komparepart/kompare_part.cpp <span style="color: grey">(08df1dc0985391908eb81da9c4cfdd0836cd4b23)</span></li>
<li>komparepart/kompareconnectwidget.h <span style="color: grey">(03eb746c24dc3899b64d3907ae21e0de656e369f)</span></li>
<li>komparepart/kompareconnectwidget.cpp <span style="color: grey">(2a8cb920280f2b42ab09e7962a441529b8cdfc0c)</span></li>
<li>komparepart/komparelistview.cpp <span style="color: grey">(b2935c917541984532814d301b6a7f5bdd661c72)</span></li>
<li>komparepart/kompareprefdlg.cpp <span style="color: grey">(0b18696acf270cf5a0351312aa3ffe13eff9b9e6)</span></li>
<li>komparepart/komparesaveoptionswidget.h <span style="color: grey">(9c49815b1b95b9448eb5fccda35e4c7c7fb1e2f1)</span></li>
<li>kompare_shell.h <span style="color: grey">(de099ffbcc92a22a4374ad6cfca0bccc6b0e97bc)</span></li>
<li>kompare_shell.cpp <span style="color: grey">(9d22085780fbbffcb9b480cbb16c30e73c0ba71e)</span></li>
<li>CMakeLists.txt <span style="color: grey">(86e4504ad3ae06519cbfaaf35781238f5f234857)</span></li>
<li>doc/CMakeLists.txt <span style="color: grey">(06d898738aabdfc947e89de848e2fbe903d5e6cc)</span></li>
<li>interfaces/CMakeLists.txt <span style="color: grey">(4bb0c6c53e8b995f1c7350cd02268e2e05ddb38a)</span></li>
<li>interfaces/kompareinterface.h <span style="color: grey">(a28d209b058fb06cc970e6ba3538ace721319be5)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/120554/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>