<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/100008/">http://git.reviewboard.kde.org/r/100008/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On September 29th, 2010, 4:17 p.m., <b>Alex Merry</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="/r/100008/diff/1/?file=462#file462line174" style="color: black; font-weight: bold; text-decoration: underline;">src/aboutdialog/OcsPersonItem.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">OcsPersonItem::fillOcsData( const AmarokAttica::Person &ocsPerson )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">174</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">m_aboutText</span><span class="p">.</span><span class="n">append</span><span class="p">(</span> <span class="s">"<br/>"</span> <span class="o">+</span> <span class="p">(</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">city</span><span class="p">().</span><span class="n">isEmpty</span><span class="p">()</span> <span class="o">?</span> <span class="s">""</span> <span class="o">:</span> <span class="p">(</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">city</span><span class="p">()</span> <span class="o">+</span> <span class="s">", "</span> <span class="p">)</span> <span class="p">)</span> <span class="o">+</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">country</span><span class="p">()</span> <span class="p">);</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">174</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span><span class="p">(</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">city</span><span class="p">().</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">)</span></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">175</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">m_aboutText</span><span class="p">.</span><span class="n">append</span><span class="p">(</span> <span class="n">QString</span><span class="p">(</span> <span class="s">"<br/>"</span> <span class="o">+</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">city</span><span class="p">()</span> <span class="o">+</span> <span class="s">", "</span> <span class="p">)</span> <span class="p">);</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">176</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">else</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">177</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">m_aboutText</span><span class="p">.</span><span class="n">append</span><span class="p">(</span> <span class="n">QString</span><span class="p">(</span> <span class="s">"<br/>"</span> <span class="o">+</span> <span class="n">ocsPerson</span><span class="p">.</span><span class="n">country</span><span class="p">()</span> <span class="p">)</span> <span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The new behaviour is different to the old behaviour when both city and country are populated.
Also, I don't think either version works sensibly when city is populated but country isn't.</pre>
</blockquote>
<p>On September 30th, 2010, 12:14 p.m., <b>Mark Kretschmann</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Got a concrete solution maybe?</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Three cases:
if ( !ocsPerson.city().isEmpty() && !ocsPerson.country().isEmpty() )
m_aboutText.append( QString( "<br/>" + ocsPerson.city() + ", " + ocsPerson.country() ) );
else if ( !ocsPerson.city().isEmpty() )
m_aboutText.append( QString( "<br/>" + ocsPerson.city() ) );
else if ( !ocsPerson.country().isEmpty() )
m_aboutText.append( QString( "<br/>" + ocsPerson.country() ) );</pre>
<br />
<p>- Alex</p>
<br />
<p>On September 30th, 2010, 4:12 p.m., Mark Kretschmann wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for amarok.</div>
<div>By Mark Kretschmann.</div>
<p style="color: grey;"><i>Updated 2010-09-30 16:12:51</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"> Use QT_USE_FAST_CONCATENATION and QT_USE_FAST_OPERATOR_PLUS for performance.
See http://doc.trolltech.com/4.6/qstring.html#more-efficient-string-construction.
I had to clean up lots of incorrect string concatenations. Please check for
correctness.
</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This still fails to compile because of one error in libLastFM. Who is up for fixing the lib? :)
</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/CMakeLists.txt <span style="color: grey">(abdcee8)</span></li>
<li>src/aboutdialog/OcsPersonItem.cpp <span style="color: grey">(6685aa1)</span></li>
<li>src/browsers/collectionbrowser/CollectionWidget.cpp <span style="color: grey">(196837c)</span></li>
<li>src/browsers/playlistbrowser/DynamicModel.cpp <span style="color: grey">(af7742d)</span></li>
<li>src/context/applets/similarartists/SimilarArtistsApplet.cpp <span style="color: grey">(e1e5d59)</span></li>
<li>src/context/applets/upcomingevents/UpcomingEventsApplet.cpp <span style="color: grey">(7233785)</span></li>
<li>src/core-impl/collections/audiocd/AudioCdCollection.cpp <span style="color: grey">(a10976b)</span></li>
<li>src/core-impl/collections/daap/DaapCollection.cpp <span style="color: grey">(06e97b2)</span></li>
<li>src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp <span style="color: grey">(e9411e6)</span></li>
<li>src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp <span style="color: grey">(b3b40bc)</span></li>
<li>src/core/support/Debug.h <span style="color: grey">(62766c4)</span></li>
<li>src/dynamic/Bias.cpp <span style="color: grey">(dec2db2)</span></li>
<li>src/dynamic/BiasSolver.cpp <span style="color: grey">(0be91da)</span></li>
<li>src/dynamic/biases/EchoNest.cpp <span style="color: grey">(2d0038a)</span></li>
<li>src/scriptengine/AmarokCollectionScript.cpp <span style="color: grey">(da87d33)</span></li>
<li>src/services/lastfm/CMakeLists.txt <span style="color: grey">(7f17ff7)</span></li>
<li>src/services/lastfm/LastFmService.cpp <span style="color: grey">(3b291fe)</span></li>
<li>src/services/lastfm/LastFmServiceSettings.cpp <span style="color: grey">(6517fea)</span></li>
<li>src/services/lastfm/biases/LastFmBias.cpp <span style="color: grey">(6f3286c)</span></li>
<li>src/services/lastfm/biases/WeeklyTopBias.cpp <span style="color: grey">(98f9257)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/100008/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>