<table><tr><td style="">kfunk requested changes to this revision.<br />kfunk added a comment.<br />This revision now requires changes to proceed.
</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/D15532">View Revision</a></tr></table><br /><div><div><p>Please update the Diff according to our requests, then I think this can still go into 5.3 branch. Friedrich, you still agree this could go into 5.3? :)</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/D15532#inline-84257">View Inline</a><span style="color: #4b4d51; font-weight: bold;">astyle_plugin.cpp:377</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; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\t</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">if(isFoo(a,b))</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\t</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">bar(a,b);</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #766510"><span class="bright">"if(isFoo)</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000"><span class="bright">return</span></span><span class="bright"> </span><span class="n"><span class="bright">QLatin1String</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">formattingObjCSample</span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000"><span class="bright">break</span></span><span class="bright"></span><span class="p"><span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000"><span class="bright">default</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">:</span></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">No <tt style="background: #ebebeb; font-size: 13px;">break;</tt> needed after return.</p></div></div><br /><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/D15532#inline-84258">View Inline</a><span style="color: #4b4d51; font-weight: bold;">astyle_plugin.cpp:380</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; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\t</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">a=bar((b-c)*a,*d--);</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #766510"><span class="bright">"if( isFoo( a,b ) )</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"> </span><span style="color: #766510"><span class="bright">"</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\t</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">bar(a, b);</span></span><span class="bright"></span><span style="color: #bb6622"><span class="bright">\n</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"if (isFoo) {isFoo=false;cat << isFoo <<endl;}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"if(isFoo)DoBar();if (isFoo){</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"</span><span style="color: #bb6622">\t</span><span style="color: #766510">bar();</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"</span><span style="color: #bb6622">\t</span><span style="color: #766510">else if(isBar()){</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"</span><span style="color: #bb6622">\t</span><span style="color: #766510">annotherBar();</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"int var = 1;</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"int *ptr = &var;</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"int& ref = i;</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"QList<int>::const_iterator it = list.begin();</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"namespace A {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"namespace B {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"class someClass {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"void foo() {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">" if (true) {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">" func();</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">" } else {</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">" // bla</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">" }</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"};</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #766510">"}</span><span style="color: #bb6622">\n</span><span style="color: #766510">"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000"><span class="bright">return</span></span><span class="bright"> </span><span class="n"><span class="bright">QLatin1String</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">formattingCxxSample</span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000"><span class="bright">break</span></span><span class="bright"></span><span class="p"><span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span class="p"><span class="bright">}</span></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Add a <tt style="background: #ebebeb; font-size: 13px;">Q_UNREACHABLE();</tt> at the end of this function, as a small debugging aid.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R32 KDevelop</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D15532">https://phabricator.kde.org/D15532</a></div></div><br /><div><strong>To: </strong>rjvbb, KDevelop, kossebau, kfunk<br /><strong>Cc: </strong>kfunk, pino, kossebau, kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd<br /></div>