<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/119763/">https://git.reviewboard.kde.org/r/119763/</a>
</td>
</tr>
</table>
<br />
<p>Ship it!</p>
<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/119763/diff/1/?file=305090#file305090line165" style="color: black; font-weight: bold; text-decoration: underline;">plugins/appwizard/appwizardplugin.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 initializeDVCS(IDistributedVersionControl* dvcs, const ApplicationInfo& info, KTempDir& scratchArea)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">164</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">job</span> <span class="o">=</span> <span class="n">dvcs</span><span class="o">-></span><span class="n">add</span><span class="p">(</span><span class="n"><span class="hl">Q</span>Url</span><span class="o">::</span><span class="n">List</span><span class="p">(</span><span class="n">dest</span><span class="p">),</span> <span class="n">KDevelop</span><span class="o">::</span><span class="n">IBasicVersionControl</span><span class="o">::</span><span class="n">Recursive</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">165</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">job</span> <span class="o">=</span> <span class="n">dvcs</span><span class="o">-></span><span class="n">add</span><span class="p">(</span><span class="n"><span class="hl">K</span>Url</span><span class="o">::</span><span class="n">List</span><span class="p">(</span><span class="n">dest</span><span class="p">),</span> <span class="n">KDevelop</span><span class="o">::</span><span class="n">IBasicVersionControl</span><span class="o">::</span><span class="n">Recursive</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;">Why turning from QUrl to KUrl? Looks backwards...</p></pre>
</div>
</div>
<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/119763/diff/1/?file=305090#file305090line238" style="color: black; font-weight: bold; text-decoration: underline;">plugins/appwizard/appwizardplugin.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; ">QString AppWizardPlugin::createProject(const ApplicationInfo& info)</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">236</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">qDebug</span><span class="p">()</span> <span class="o"><<</span> <span class="s">"Template name does not exist in the template list"</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;">qWarning?</p></pre>
</div>
</div>
<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/119763/diff/1/?file=305090#file305090line281" style="color: black; font-weight: bold; text-decoration: underline;">plugins/appwizard/appwizardplugin.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; ">QString AppWizardPlugin::createProject(const ApplicationInfo& info)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">279</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">QUrl</span> <span class="n">parentdir</span> <span class="o">=</span> <span class="n">dest</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">278</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">const</span> <span class="n">QString</span> <span class="n">parentString</span> <span class="o">=</span> <span class="n">dest</span><span class="p">.</span><span class="n">toLocalFile</span><span class="p">()</span> <span class="o">+</span> <span class="s">"/.."</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;">Use KIO::upUrl?</p></pre>
</div>
</div>
<br />
<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;">All in all looks good to me, can be merged I'd say.</p></pre>
<p>- Aleix Pol Gonzalez</p>
<br />
<p>On August 13th, 2014, 3:20 p.m. UTC, Simon Wächter 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 Kevin Funk.</div>
<div>By Simon Wächter.</div>
<p style="color: grey;"><i>Updated Aug. 13, 2014, 3:20 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdevplatform
</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;">The idea of this patch is to reenable the app wizard and file template wizard of KDevelop in the framework branch. For this, I had to reactivate Grantlee and fix/port away a few other things:</p>
<ul style="padding: 0;text-rendering: inherit;margin: 0 0 0 1em;line-height: inherit;white-space: normal;">
<li style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">Reenable Grantlee (Unofficial version 1.0) and change some CMake files (See note)</li>
<li style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">Port kdevfilters to the new Qt5 plugin system. The install location was fixed, so the plugin is correctly loaded by Grantlee</li>
<li style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">Renable the app wizard and file template wizard plugin. Change the serching and write paths for templates</li>
<li style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">Change the default paths of several models. Because the dirs() method of KComponentData is deprecated, I had to introdue methods for adding search paths to the model </li>
<li style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">Fixed the unit tests (See testing comment)</li>
</ul>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Note: Grantlee provides a Qt5 branch called 'volatile_qt5_port. I will ask the current maintainer of Grantlee when this branch will result in a new (official) release</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;">Although this patch was tested under two different project neon systems, I would be very glad if someone can retest it</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>CMakeLists.txt <span style="color: grey">(d73caa8)</span></li>
<li>language/CMakeLists.txt <span style="color: grey">(f49664c)</span></li>
<li>language/codegen/sourcefiletemplate.h <span style="color: grey">(4085476)</span></li>
<li>language/codegen/sourcefiletemplate.cpp <span style="color: grey">(412b8b9)</span></li>
<li>language/codegen/templateengine.cpp <span style="color: grey">(fc7c61e)</span></li>
<li>language/codegen/templatesmodel.h <span style="color: grey">(fbd5514)</span></li>
<li>language/codegen/templatesmodel.cpp <span style="color: grey">(5779050)</span></li>
<li>language/codegen/tests/CMakeLists.txt <span style="color: grey">(077add5)</span></li>
<li>language/codegen/tests/codegen_tests_config.h.cmake <span style="color: grey">(a963e7b)</span></li>
<li>language/codegen/tests/test_templateclassgenerator.cpp <span style="color: grey">(af18ddd)</span></li>
<li>language/codegen/tests/test_templatesmodel.cpp <span style="color: grey">(0a1b65d)</span></li>
<li>plugins/CMakeLists.txt <span style="color: grey">(a63447c)</span></li>
<li>plugins/appwizard/CMakeLists.txt <span style="color: grey">(fc5a98d)</span></li>
<li>plugins/appwizard/appwizardplugin.cpp <span style="color: grey">(1bb134e)</span></li>
<li>plugins/appwizard/projectselectionpage.h <span style="color: grey">(fafad0e)</span></li>
<li>plugins/appwizard/projectselectionpage.cpp <span style="color: grey">(ae253f4)</span></li>
<li>plugins/filetemplates/filetemplatesplugin.cpp <span style="color: grey">(8739871)</span></li>
<li>plugins/filetemplates/outputpage.h <span style="color: grey">(347296e)</span></li>
<li>plugins/filetemplates/outputpage.cpp <span style="color: grey">(2b98cb9)</span></li>
<li>template/filters/CMakeLists.txt <span style="color: grey">(5eba65e)</span></li>
<li>template/filters/kdevfilters.h <span style="color: grey">(1a33fc6)</span></li>
<li>template/filters/kdevfilters.cpp <span style="color: grey">(b8ffb8a)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/119763/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>