<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/108716/">http://git.reviewboard.kde.org/r/108716/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On February 9th, 2013, 12:06 p.m. UTC, <b>Matěj Laitl</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="http://git.reviewboard.kde.org/r/108716/diff/2/?file=113315#file113315line836" style="color: black; font-weight: bold; text-decoration: underline;">src/MainWindow.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</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; ">MainWindow::createActions()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">836</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">connect</span><span class="p">(</span> <span class="n">action</span><span class="p">,</span> <span class="n">SIGNAL</span><span class="p">(</span> <span class="n">triggered</span><span class="p">(</span> <span class="kt">bool</span> <span class="p">)</span> <span class="p">),</span><span class="k">this</span><span class="p">,</span><span class="n">SLOT</span><span class="p">(</span><span class="n">shuffle<span class="hl">Track</span></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">836</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">connect</span><span class="p">(</span> <span class="n">action</span><span class="p">,</span> <span class="n">SIGNAL</span><span class="p">(</span> <span class="n">triggered</span><span class="p">(</span> <span class="kt">bool</span> <span class="p">)</span> <span class="p">),</span><span class="k">this</span><span class="p">,</span><span class="n">SLOT</span><span class="p">(</span><span class="n">s<span class="hl">lotS</span>huffle<span class="hl">Playlist</span></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;">Amarok coding style says:
connect( action, SIGNAL(triggered(bool)), this, SLOT(slotShufflePlaylist()) );
(note that SIGNAL/SLOT macros are the only exception when there are no spaces around arguments)</pre>
</blockquote>
<p>On February 9th, 2013, 9:03 p.m. UTC, <b>Harsh Gupta</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;">Thanks of pointing out minor details. I have fixed all the above things but in the process I some how deleted one patch file. So I tried to create patch using "git format-patch commit-tag --stdout > patchfile" but it appears that there is something wrong with the patch. Please help. Thanks again.</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;">It looks like you've uploaded the difference between the second and third patch rather than the difference between origin/master and v3 of your work. If you work in git (good), it probably means that you created extra commit for the third version of your patch. I strongly recommend you use a tool like gitk to visualize changes in your git repository. All your work on this feature should be squelched into a single patch - a comand like `git rebase -i <starting-point>` (where <starting point> is the upstream commit/branch (most probably just origin/master)) can help you edit and merge existing commits.
`git format patch orgin/master` is the right command to export commits you have on top of the upstream code.</pre>
<br />
<p>- Matěj</p>
<br />
<p>On February 9th, 2013, 8:51 p.m. UTC, Harsh Gupta wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Amarok.</div>
<div>By Harsh Gupta.</div>
<p style="color: grey;"><i>Updated Feb. 9, 2013, 8:51 p.m.</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;">Added a shortcut button for shuffle with default shortcut as Ctrl + H.
Created a slot shuffleTrack() in mainWindow.cpp which is triggered on pressing Ctrl + H</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;">All tests passed.</pre>
</td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://bugs.kde.org/show_bug.cgi?id=208061">208061</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/MainWindow.cpp <span style="color: grey">(8587784)</span></li>
<li>src/MainWindow.cpp <span style="color: grey">(8587784)</span></li>
<li>src/MainWindow.h <span style="color: grey">(4b23679)</span></li>
<li>ChangeLog <span style="color: grey">(139ffa5)</span></li>
<li>ChangeLog <span style="color: grey">(749ed6d)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/108716/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>