<table><tr><td style="">kfunk added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D7057" rel="noreferrer">View Revision</a></tr></table><br /><div><div><blockquote style="border-left: 3px solid #8C98B8;
color: #6B748C;
font-style: italic;
margin: 4px 0 12px 0;
padding: 8px 12px;
background-color: #F8F9FC;">
<div style="font-style: normal;
padding-bottom: 4px;">In <a href="https://phabricator.kde.org/D7057#131094" style="background-color: #e7e7e7;
border-color: #e7e7e7;
border-radius: 3px;
padding: 0 4px;
font-weight: bold;
color: black;text-decoration: none;" rel="noreferrer">D7057#131094</a>, <a href="https://phabricator.kde.org/p/kossebau/" style="
border-color: #f1f7ff;
color: #19558d;
background-color: #f1f7ff;
border: 1px solid transparent;
border-radius: 3px;
font-weight: bold;
padding: 0 4px;" rel="noreferrer">@kossebau</a> wrote:</div>
<div style="margin: 0;
padding: 0;
border: 0;
color: rgb(107, 116, 140);"><p>Not really sure about this one. Alternative approaches could be:<br />
a) completely trim the license text from any leading and trailing empty lines, not just a last linebreak<br />
b) fix the existing license templates to not end with a linebreak</p>
<p>What do you think?</p></div>
</blockquote>
<p>I just fixing up the license text after having loaded them is fine. Wouldn't touch the license files, as otherwise Git complains about files not having a new line at the EOF.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D7057#inline-28787" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">licensepage.cpp:251</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">QString</span> <span class="n">licenseText</span> <span style="color: #aa2211">=</span> <span class="n">d</span><span style="color: #aa2211">-></span><span class="n">license</span><span style="color: #aa2211">-></span><span class="n">licenseTextEdit</span><span style="color: #aa2211">-></span><span class="n">document</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">toPlainText</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QRegularExpression</span> <span style="color: #004012">anyLinebreakAtEnd</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"(</span><span style="color: #bb6622">\n</span><span style="color: #766510">|</span><span style="color: #bb6622">\r\n</span><span style="color: #766510">)</span><span class="err">$</span><span style="color: #766510">"))</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">licenseText</span><span class="p">.</span><span class="n">remove</span><span class="p">(</span><span class="n">anyLinebreakAtEnd</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I think the additional newline should be rather stripped inside <tt style="background: #ebebeb; font-size: 13px;">LicensePagePrivate::readLicense</tt>, not here.</p>
<p style="padding: 0; margin: 8px;">I just tested this:</p>
<ul class="remarkup-list">
<li class="remarkup-list-item">If I manually enter text, everything works just fine.</li>
<li class="remarkup-list-item">If I use any of the presets, then indeed there's an additional newline added.</li>
</ul>
<p style="padding: 0; margin: 8px;">-> We just need to fix the contents of the presets after they were loaded from disk.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R33 KDevPlatform</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D7057" rel="noreferrer">https://phabricator.kde.org/D7057</a></div></div><br /><div><strong>To: </strong>kossebau, KDevelop<br /><strong>Cc: </strong>kfunk, kdevelop-devel<br /></div>