<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/120164/">https://git.reviewboard.kde.org/r/120164/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On September 13th, 2014, 3:11 p.m. UTC, <b>Milian Wolff</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/120164/diff/1/?file=311778#file311778line75" style="color: black; font-weight: bold; text-decoration: underline;">projectmanagers/cmake/cmakeimportjsonjob.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<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">75</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">QVariantList</span> <span class="n">values</span> <span class="o">=</span> <span class="n">parser</span><span class="p">.</span><span class="n">fromJson</span><span class="p">(</span><span class="n">f</span><span class="p">.</span><span class="n">readAll</span><span class="p">(),</span> <span class="o">&</span><span class="n">error</span><span class="p">).</span><span class="n">toVariant</span><span class="p">().</span><span class="n">toList</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;">here and below: this should be cleaned up, do not copy the data into QVariant's, use the QJson API instead.</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%">QJsonDocument document <span style="color: #666666">=</span> QJsonDocument<span style="color: #666666">::</span>fromJson(f.readAll(), <span style="color: #666666">&</span>error);
<span style="color: #008000; font-weight: bold">if</span> (error.error <span style="color: #666666">||</span> <span style="color: #666666">!</span>document.isObject()) {
data.isValid <span style="color: #666666">=</span> <span style="color: #008000">false</span>;
qCDebug(...) <span style="color: #666666"><<</span> <span style="color: #BA2121">"Failed to parse CMake JSON data:"</span> <span style="color: #666666"><<</span> error.errorString;
<span style="color: #008000; font-weight: bold">return</span> data;
}
foreach (<span style="color: #008000; font-weight: bold">const</span> QJsonValue<span style="color: #666666">&</span> v, document.object()) {
QJsonObject entry <span style="color: #666666">=</span> v.object();
data.files[Path(entry[<span style="color: #BA2121">"file"</span>].toString())] <span style="color: #666666">=</span> dataFromJson(entry);
}
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I'd appreciate if you could do a follow-up commit to clean this code up.</p></pre>
</blockquote>
<p>On September 13th, 2014, 5:21 p.m. UTC, <b>Kevin Funk</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;">Note: This was just copied over code.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I can have a look at it as soon as we have working unit tests for the CMake manager. I guess Aleix is going to work on that.</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;">I've fixed this now, btw.</p></pre>
<br />
<p>- Milian</p>
<br />
<p>On September 12th, 2014, 3:48 p.m. UTC, Kevin Funk 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 KDevelop and Aleix Pol Gonzalez.</div>
<div>By Kevin Funk.</div>
<p style="color: grey;"><i>Updated Sept. 12, 2014, 3:48 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdevelop
</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;">CMake: Make JSON import threaded</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Before this patch parsing the compile_commands.json file blocked the<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" />
main thread. Make the parsing async instead.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">The tests are quite broken right now (due to the refactoring), I cannot really test using them.</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>projectmanagers/cmake/CMakeLists.txt <span style="color: grey">(148d9f3743af1b2f9a74ee897d8eaef5809ef5d2)</span></li>
<li>projectmanagers/cmake/cmakeimportjsonjob.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>projectmanagers/cmake/cmakeimportjsonjob.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>projectmanagers/cmake/cmakemanager.h <span style="color: grey">(cc5ea0b205bebaab9e244bee80533aebe276a37d)</span></li>
<li>projectmanagers/cmake/cmakemanager.cpp <span style="color: grey">(ba8746cb0b04a98056cb77b4258fb6de921cbc8e)</span></li>
<li>projectmanagers/cmake/cmakeprojectdata.h <span style="color: grey">(fbe33122be81bb1a5e6eda7273e6ed4c397b841a)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/120164/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>