<table><tr><td style="">ervin requested changes to this revision.<br />ervin added inline comments.<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/D24716">View Revision</a></tr></table><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/D24716#inline-139571">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcmoduleloader.cpp:101</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="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">KQuickAddons</span><span style="color: #aa2211">::</span><span class="n">ConfigModule</span> <span style="color: #aa2211">*</span><span class="n">cm</span> <span style="color: #aa2211">=</span> <span class="n">factory</span><span style="color: #aa2211">-></span><span class="n">create</span><span style="color: #aa2211"><</span><span class="n">KQuickAddons</span><span style="color: #aa2211">::</span><span class="n">ConfigModule</span><span style="color: #aa2211">></span><span class="p">(</span><span style="color: #aa4000">nullptr</span><span class="p">,</span> <span class="n">args2</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">cm</span><span class="p">)</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Easier fix is likely to wrap that into a std::unique_ptr here and calling release() on it when creating the KCModuleQml later on. Would be even better to change KCModuleQml to take a std::unique_ptr in the ctor and use a unique_ptr internally (AFAICT it's not public API so doable).</p>
<p style="padding: 0; margin: 8px;">That's admittedly more intrusive change though but at least would make some of that ownership issues more explicit and easier to track.</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/D24716#inline-139570">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcmoduleloader.cpp:107</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 style="color: #aa4000">return</span> <span class="n">reportError</span><span class="p">(</span><span class="n">report</span><span class="p">,</span> <span class="n">i18n</span><span class="p">(</span><span style="color: #766510">"Error loading QML file."</span><span class="p">),</span> <span class="n">cm</span><span style="color: #aa2211">-></span><span class="n">errorString</span><span class="p">(),</span> <span class="n">parent</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">delete</span> <span class="n">cm</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This is unreachable code. You want to delete before the reportError call but after the cm->errorString() call.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R295 KCMUtils</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D24716">https://phabricator.kde.org/D24716</a></div></div><br /><div><strong>To: </strong>davidedmundson, Plasma, ervin<br /><strong>Cc: </strong>ervin, kde-frameworks-devel, LeGast00n, GB_2, michaelh, ngraham, bruns<br /></div>