<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/106568/">http://git.reviewboard.kde.org/r/106568/</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 27th, 2012, 12:08 p.m., <b>David Faure</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/106568/diff/1/?file=87131#file87131line52" style="color: black; font-weight: bold; text-decoration: underline;">server/serverdatastream.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="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">bool Soprano::Server::DataStream::read( char* data, qint64 size )</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">52</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span> <span class="o">!</span><span class="n">m_device</span><span class="o">-></span><span class="n">waitForReadyRead</span><span class="p">(</span> <span class="mi">30000</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;">I think this line is wrong and should be removed.
See my fix 418ee0f194564e8734d0f06656316bbbd9623685
(and the cleanup of the commented out code in 439ae852647ca56f961eefcad6354c7c319eaeb0)
both in soprano.git</pre>
</blockquote>
<p>On October 2nd, 2012, 3:48 a.m., <b>Vishesh Handa</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;">Noted. I rather not do it in this patch, as I'm just splitting the code up.
I'll try to fix this up after I've committed this.
@Sebastian: Ping?</pre>
</blockquote>
<p>On October 2nd, 2012, 8:41 a.m., <b>David Faure</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;">Well it seems to me that the code was duplicated, and you picked the wrong version of it, the one without my fix ;)
But if you're sure this is the only difference and you'll fix it up afterwards, go ahead.</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;">I'm a little confused.
I just checked, and your commits affect client/socketstream.cpp not server/serverdatastream.cpp. So, I didn't really miss it. I'll remove the m_device->waitForReadyRead from the server code as well, but that will be in another commit so that it can go into 2.8 as well.</pre>
<br />
<p>- Vishesh</p>
<br />
<p>On September 25th, 2012, 2:56 p.m., Vishesh Handa wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/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 Nepomuk, Soprano and Sebastian Trueg.</div>
<div>By Vishesh Handa.</div>
<p style="color: grey;"><i>Updated Sept. 25, 2012, 2:56 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;"> Combine Server and Client streams into a new DataStream class
Instead of both the server and the client implementing their own
streaming operators. We combine all the streaming operators into a new
public class called Soprano::DataStream.
The Server and Client create their own respective class -
ServerDataStream and SocketStream respectively. The just have to
implement a read and write function.
This serves to eliminate code duplication, and allows others to use the
DataStream class, if they need it.
</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>client/CMakeLists.txt <span style="color: grey">(4e73e3c)</span></li>
<li>client/socketstream.h <span style="color: grey">(a7b1eb2)</span></li>
<li>client/socketstream.cpp <span style="color: grey">(36472f1)</span></li>
<li>server/CMakeLists.txt <span style="color: grey">(8155648)</span></li>
<li>server/datastream.h <span style="color: grey">(0ecf2d3)</span></li>
<li>server/datastream.cpp <span style="color: grey">(f98ee2d)</span></li>
<li>server/serverconnection.cpp <span style="color: grey">(786f9df)</span></li>
<li>server/serverdatastream.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>server/serverdatastream.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>soprano/CMakeLists.txt <span style="color: grey">(28c3188)</span></li>
<li>soprano/datastream.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>soprano/datastream.cpp <span style="color: grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/106568/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>