<table><tr><td style="">jgrulich 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/D17317">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/D17317#inline-94687">View Inline</a><span style="color: #4b4d51; font-weight: bold;">matchsettingtest.cpp:43</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 class="n">map</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span class="n">NM_SETTING_MATCH_INTERFACE_NAME</span><span class="p">),</span> <span class="n">interfaceName</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This define won't exist for NM < 1.12.0</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/D17317#inline-94685">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsettingtest.cpp:58</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 class="n">map</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span class="n">NM_SETTING_TC_CONFIG_TFILTERS</span><span class="p">),</span> <span class="n">QVariant</span><span style="color: #aa2211">::</span><span class="n">fromValue</span><span class="p">(</span><span class="n">tfilters</span><span class="p">));</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">map</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span class="n">NM_SETTING_TC_CONFIG_QDISCS</span><span class="p">),</span> <span class="n">QVariant</span><span style="color: #aa2211">::</span><span class="n">fromValue</span><span class="p">(</span><span class="n">qdiscs</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">TC defines do not exist before NM 1.10.0</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/D17317#inline-94686">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsettingtest.cpp:69</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">while</span> <span class="p">(</span><span class="n">it</span> <span style="color: #aa2211">!=</span> <span class="n">map</span><span class="p">.</span><span class="n">constEnd</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 class="n">QCOMPARE</span><span class="p">(</span><span class="n">it</span><span class="p">.</span><span class="n">value</span><span class="p">(),</span> <span class="n">map1</span><span class="p">.</span><span class="n">value</span><span class="p">(</span><span class="n">it</span><span class="p">.</span><span class="n">key</span><span class="p">()));</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa2211">++</span><span class="n">it</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I think that you cannot compare NMVariantMaps this way, that's why probably the test for IPv4 and IPv6 didn't fail when we swapped values for route-data and address-data. You will need to compare values inside the maps separately.</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/D17317#inline-94689">View Inline</a><span style="color: #4b4d51; font-weight: bold;">matchsetting.h:27</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: #304a96">#include</span> <span class="cpf"><QString></span><span style="color: #304a96"></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I think you don't need to include <QString></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/D17317#inline-94688">View Inline</a><span style="color: #4b4d51; font-weight: bold;">matchsetting.h:29</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: #304a96">#if !NM_CHECK_VERSION(1, 12, 0)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_SETTING_MATCH_SETTING_NAME "match"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Move those defines out of the header file.</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/D17317#inline-94692">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsetting.cpp:115</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 class="n">dbg</span><span class="p">.</span><span class="n">nospace</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="n">NM_SETTING_TC_CONFIG_QDISCS</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">": "</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">'\n'</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Q_FOREACH</span> <span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QVariantMap</span> <span style="color: #aa2211">&</span> <span class="n">qdiscs</span><span class="p">,</span> <span class="n">setting</span><span class="p">.</span><span class="n">qdiscs</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 class="n">QVariantMap</span><span style="color: #aa2211">::</span><span class="n">const_iterator</span> <span class="n">i</span> <span style="color: #aa2211">=</span> <span class="n">qdiscs</span><span class="p">.</span><span class="n">constBegin</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const QVariantMap &qdisc</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/D17317#inline-94691">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsetting.cpp:118</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">while</span> <span class="p">(</span><span class="n">i</span> <span style="color: #aa2211">!=</span> <span class="n">qdiscs</span><span class="p">.</span><span class="n">constEnd</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 class="n">dbg</span><span class="p">.</span><span class="n">nospace</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="n">i</span><span class="p">.</span><span class="n">key</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">": "</span> <span style="color: #aa2211"><<</span> <span class="n">i</span><span class="p">.</span><span class="n">value</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">'\n'</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Indent.</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/D17317#inline-94693">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsetting.cpp:122</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 class="n">dbg</span><span class="p">.</span><span class="n">nospace</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="n">NM_SETTING_TC_CONFIG_TFILTERS</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">": "</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">'\n'</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Q_FOREACH</span> <span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QVariantMap</span> <span style="color: #aa2211">&</span> <span class="n">tfilters</span><span class="p">,</span> <span class="n">setting</span><span class="p">.</span><span class="n">tfilters</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 class="n">QVariantMap</span><span style="color: #aa2211">::</span><span class="n">const_iterator</span> <span class="n">i</span> <span style="color: #aa2211">=</span> <span class="n">tfilters</span><span class="p">.</span><span class="n">constBegin</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const QVariantMap &tfilter</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/D17317#inline-94690">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsetting.h:30</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: #304a96">#if !NM_CHECK_VERSION(1, 12, 0)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_SETTING_TC_CONFIG_SETTING_NAME "tc"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">TC defines are present since NM 1.10.0. Also move them out of the header file.</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/D17317#inline-94694">View Inline</a><span style="color: #4b4d51; font-weight: bold;">tcsetting_p.h:25</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: #304a96">#include</span> <span class="cpf"><QString></span><span style="color: #304a96"></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#include</span> <span class="cpf">"../ipconfig.h"</span><span style="color: #304a96"></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This include shouldn't be needed.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R282 NetworkManagerQt</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D17317">https://phabricator.kde.org/D17317</a></div></div><br /><div><strong>To: </strong>pranavgade, jgrulich<br /><strong>Cc: </strong>kde-frameworks-devel, michaelh, ngraham, bruns<br /></div>