[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy
From:       David Faure <faure () kde ! org>
Date:       2005-08-28 8:35:18
Message-ID: 1125218118.405147.16511.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 454165 by dfaure:

Fix datastream<<qint64 code to actually write to the stream, not read from it (!), in 3-1-compat mode.
Without the patch, this fails with ""QIODevice::read called on a WriteOnly device".


 A             patches/0105-qdatastream_qint64.diff  
 M  +1 -1      patches/README  
 M  +3 -2      src/corelib/io/qdatastream.cpp  


--- trunk/qt-copy/patches/README #454164:454165
@@ -1,5 +1,5 @@
 Please assign the numbers incrementally, and don't reuse them. The next one:
-#0105
+#0106
 
 This directory contains patches for Qt that haven't been accepted by TrollTech
 yet. All patches in this directory itself shouldn't make qt-copy incompatible
--- trunk/qt-copy/src/corelib/io/qdatastream.cpp #454164:454165
@@ -985,8 +985,9 @@
 {
     CHECK_STREAM_PRECOND(*this)
     if (version() < 6) {
-        quint32 i1, i2;
-        *this >> i2 >> i1;
+        quint32 i1 = i >> 32;
+        quint32 i2 = i & 0xFFFFFFFF;
+        *this << i2 << i1;
         i = ((quint64)i1 << 32) + i2;
     } else if (noswap) {                        // no conversion needed
         dev->write((char *)&i, sizeof(qint64));
[prev in list] [next in list] [prev in thread] [next in thread]