<table><tr><td style="">broulik 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/D15946">View Revision</a></tr></table><br /><div><div><p>Nice findings, feel free to ignore the stylistic changes I commented, except the <tt style="background: #ebebeb; font-size: 13px;">qDeleteAll</tt> one, and do unrelated further cleanup in a separate patch</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/D15946#inline-86361">View Inline</a><span style="color: #4b4d51; font-weight: bold;">waylandoutput.cpp:64</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: #aa4000"><span class="bright">if</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">!</span></span><span class="n">m_modeIdMap</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">values</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="bright"></span><span class="n"><span class="bright">contains</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="n">kwaylandmodeid</span><span class="p">)<span class="bright">)</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">auto</span></span><span class="bright"> </span><span class="n"><span class="bright">it</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n"><span class="bright">std</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">find</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="n">m_modeIdMap</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">cbegin</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span><span class="bright"> </span><span class="n"><span class="bright">m_modeIdMap</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">cend</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span><span class="bright"> </span><span class="n">kwaylandmodeid</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 style="color: #aa4000">if</span> <span class="p">(</span><span class="n">it</span> <span style="color: #aa2211">==</span> <span class="n">m_modeIdMap</span><span class="p">.</span><span class="n">cend</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">qCWarning</span><span class="p">(</span><span class="n">KSCREEN_WAYLAND</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"Invalid kwayland mode id:"</span> <span style="color: #aa2211"><<</span> <span class="n">kwaylandmodeid</span> <span style="color: #aa2211"><<</span> <span class="n">m_modeIdMap</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I think we typically use <tt style="background: #ebebeb; font-size: 13px;">const...()</tt> instead of <tt style="background: #ebebeb; font-size: 13px;">c...()</tt> but since this method is <tt style="background: #ebebeb; font-size: 13px;">const</tt>, shouldn't be neccessary to begin with</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/D15946#inline-86360">View Inline</a><span style="color: #4b4d51; font-weight: bold;">qscreenconfig.cpp: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="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">foreach</span><span class="p">(</span><span style="color: #aa4000">auto</span> <span class="n">output</span><span class="p">,</span> <span class="n">m_outputMap<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">values</span></span><span class="bright"></span><span class="p"><span class="bright">()</span>)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">foreach</span><span class="p">(</span><span style="color: #aa4000">auto</span> <span class="n">output</span><span class="p">,</span> <span class="n">m_outputMap</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">delete</span> <span class="n">output</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">qDeleteAll(m_outputMap);</tt></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/D15946#inline-86362">View Inline</a><span style="color: #4b4d51; font-weight: bold;">qscreenconfig.cpp:62</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>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">QList</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">ids</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">foreach</span><span class="p">(</span><span style="color: #aa4000">auto</span> <span class="n">output</span><span class="p">,</span> <span class="n">m_outputMap<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">values</span></span><span class="bright"></span><span class="p"><span class="bright">()</span>)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">foreach</span><span class="p">(</span><span style="color: #aa4000">auto</span> <span class="n">output</span><span class="p">,</span> <span class="n">m_outputMap</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;">This seems unused</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/D15946#inline-86363">View Inline</a><span style="color: #4b4d51; font-weight: bold;">output.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>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">before</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">keys</span></span><span class="p">()</span> <span style="color: #aa2211">!=</span> <span class="n">after</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">keys</span></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 class="n">before</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">size</span></span><span class="p">()</span> <span style="color: #aa2211">!=</span> <span class="n">after</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">size</span></span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">return</span> <span style="color: #304a96">false</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">count()</tt></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/D15946#inline-86365">View Inline</a><span style="color: #4b4d51; font-weight: bold;">waylandconfigreader.cpp:117</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 style="color: #aa4000">if</span> <span class="p">(</span><span class="n">mode</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">keys</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="n">contains</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"refreshRate"</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 class="n">mode</span><span class="p">.</span><span class="n">contains</span><span class="p">(</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"refreshRate"</span><span class="p">)))</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">m0</span><span class="p">.</span><span class="n">refreshRate</span> <span style="color: #aa2211">=</span> <span class="n">qRound</span><span class="p">(</span><span class="n">mode</span><span class="p">[</span><span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"refreshRate"</span><span class="p">)].</span><span class="n">toReal</span><span class="p">()</span> <span style="color: #aa2211">*</span> <span style="color: #601200">1000</span><span class="p">);</span> <span style="color: #74777d">// config has it in Hz</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;">We do a double lookup here, <tt style="background: #ebebeb; font-size: 13px;">contains()</tt> and then <tt style="background: #ebebeb; font-size: 13px;">operator[]</tt> afterwards, should be combined to a single <tt style="background: #ebebeb; font-size: 13px;">find()</tt></p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R110 KScreen Library</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D15946">https://phabricator.kde.org/D15946</a></div></div><br /><div><strong>To: </strong>volkov, Plasma<br /><strong>Cc: </strong>broulik, plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>