<table><tr><td style="">broulik added inline comments.
</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/D23152">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/D23152#inline-132069">View Inline</a><span style="color: #4b4d51; font-weight: bold;">batterymodel.h:47</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">Q_INVOKABLE</span> <span class="n">Solid</span><span style="color: #aa2211">::</span><span class="n">Battery</span> <span style="color: #aa2211">*</span><span class="n">get</span><span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">index</span><span class="p">)</span> <span style="color: #aa4000">const</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Q_INVOKABLE</span> <span class="n">QString</span> <span style="color: #004012">vendor</span><span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">index</span><span class="p">)</span> <span style="color: #aa4000">const</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Q_INVOKABLE</span> <span class="n">QString</span> <span style="color: #004012">product</span><span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">index</span><span class="p">)</span> <span style="color: #aa4000">const</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">As a cleanup measure (before or after, but separate of this patch), can you remove those separate invokables</p>
<ol class="remarkup-list">
<li class="remarkup-list-item">Add <tt style="background: #ebebeb; font-size: 13px;">Q_ENUM(Roles)</tt></li>
<li class="remarkup-list-item"><tt style="background: #ebebeb; font-size: 13px;">qmlRegisterUncreatableType</tt> the <tt style="background: #ebebeb; font-size: 13px;">BatteryModel</tt></li>
<li class="remarkup-list-item">from QML use <tt style="background: #ebebeb; font-size: 13px;">data()</tt> which is invokable since Qt 5.5 (after this code was written iirc):</li>
</ol>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">kcm.batteries.data(kcm.batteries.index(0, 0), BatteryModel.VendorRole)</pre></div></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/D23152#inline-132070">View Inline</a><span style="color: #4b4d51; font-weight: bold;">main.qml:432</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(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #004012">modelData</span><span class="p">.</span><span style="color: #004012">source</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #004012">modelData</span><span class="p">.</span><span style="color: #004012">source</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"vendor"</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #004012">value</span> <span style="color: #aa2211">=</span> <span style="color: #004012">currentVendor</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Can you make this more generic, e.g.</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">value = root["current" + uppercasefirst(modelData.source)]</pre></div></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R102 KInfoCenter</div></div></div><br /><div><strong>BRANCH</strong><div><div>arcpatch-D23152</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D23152">https://phabricator.kde.org/D23152</a></div></div><br /><div><strong>To: </strong>meven, broulik, ngraham<br /><strong>Cc: </strong>plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>