<table><tr><td style="">tobiasdeiminger 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/D21332">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/D21332#inline-120010">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:499</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">m_useColor</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">new</span> <span class="n">QCheckBox</span><span class="p">(</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">"Inner color:"</span> <span class="p">),</span> <span class="n">gb2</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">gridlay2</span><span style="color: #aa2211">-></span><span class="n">addWidget</span><span class="p">(</span> <span class="n">m_useColor</span><span class="p">,</span> <span style="color: #601200">1</span><span class="p">,</span> <span style="color: #601200">0</span> <span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Checking a polygons Inner color checkbox now causes segfault. It's because <tt style="background: #ebebeb; font-size: 13px;">LineAnnotationWidget::applyChanges</tt> accesses <tt style="background: #ebebeb; font-size: 13px;">m_startStyleCombo</tt> and <tt style="background: #ebebeb; font-size: 13px;">m_endStyleCombo</tt> unconditionally. But in case of <tt style="background: #ebebeb; font-size: 13px;">m_lineType == 1</tt> that QComboBoxes have never been constructed. Access should be guarded by <tt style="background: #ebebeb; font-size: 13px;">if ( m_lineType == 0 )</tt>, and probably an additional <tt style="background: #ebebeb; font-size: 13px;">nullptr</tt> check.</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/D21332#inline-120011">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:528</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">for</span> <span class="p">(</span> <span style="color: #aa4000">const</span> <span class="n">QString</span> <span style="color: #aa2211">&</span><span style="color: #a0a000">i</span><span class="p">:</span> <span class="p">{</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Square"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Circle"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Diamond"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Open Arrow"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Closed Arrow"</span> <span class="p">),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" None"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Butt"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Right Open Arrow"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">" Right Closed Arrow"</span> <span class="p">),</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">"Slash"</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;">Are the leading whitespaces in " Square", " Circle", and so on, intentional?</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/D21332#inline-120013">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:542</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">else</span> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">m_lineType</span> <span style="color: #aa2211">==</span> <span style="color: #601200">1</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;">Is this <tt style="background: #ebebeb; font-size: 13px;">else if ( m_lineType == 1 )</tt> branch really necessary? Looks like the code within could just be moved to the previous <tt style="background: #ebebeb; font-size: 13px;">if ( m_lineType == 1 )</tt> at L. 497.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D21332">https://phabricator.kde.org/D21332</a></div></div><br /><div><strong>To: </strong>knambiar, Okular<br /><strong>Cc: </strong>tobiasdeiminger, okular-devel, joaonetto, tfella, ngraham, darcyshen, aacid<br /></div>