diff options
author | aavit <qt-info@nokia.com> | 2010-09-08 07:09:35 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-09-08 07:09:35 (GMT) |
commit | 1743a8bea43066c52cf07f6c8a859c3d9ddb65da (patch) | |
tree | 9edf82291de3ab1fa14d32c7d6dcfcf084e3de8c /tests/arthur | |
parent | 296e37e29bb0b364340e1813e18c460354b74acc (diff) | |
download | Qt-1743a8bea43066c52cf07f6c8a859c3d9ddb65da.zip Qt-1743a8bea43066c52cf07f6c8a859c3d9ddb65da.tar.gz Qt-1743a8bea43066c52cf07f6c8a859c3d9ddb65da.tar.bz2 |
Fix: remove baseline checksums before adding rendered
.. otherwise, the comparison will always yield true...
Also a simplification: QList provides default datastreaming ops
Diffstat (limited to 'tests/arthur')
-rw-r--r-- | tests/arthur/common/baselineprotocol.cpp | 20 | ||||
-rw-r--r-- | tests/arthur/common/baselineprotocol.h | 5 |
2 files changed, 0 insertions, 25 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp index cbead24..7996fff 100644 --- a/tests/arthur/common/baselineprotocol.cpp +++ b/tests/arthur/common/baselineprotocol.cpp @@ -129,26 +129,6 @@ QDataStream & operator>> (QDataStream &stream, ImageItem &ii) return stream; } -QDataStream & operator<< (QDataStream &stream, const QList<quint64> &checkSumList) -{ - stream << quint32(checkSumList.count()); - foreach(quint64 checksum, checkSumList) - stream << checksum; - return stream; -} - -QDataStream & operator>> (QDataStream &stream, QList<quint64> &checkSumList) -{ - quint32 numChecksums; - stream >> numChecksums; - quint64 checkSum; - for (int i=0; i<(int)numChecksums; ++i) { - stream >> checkSum; - checkSumList.append(checkSum); - } - return stream; -} - BaselineProtocol::~BaselineProtocol() { socket.close(); diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h index 1cd8bb6..5427023 100644 --- a/tests/arthur/common/baselineprotocol.h +++ b/tests/arthur/common/baselineprotocol.h @@ -57,15 +57,10 @@ public: QDataStream & operator<< (QDataStream &stream, const ImageItem &ii); QDataStream & operator>> (QDataStream& stream, ImageItem& ii); - Q_DECLARE_METATYPE(ImageItem); -QDataStream & operator<< (QDataStream &stream, const QList<quint64> &checkSumList); -QDataStream & operator>> (QDataStream &stream, QList<quint64> &checkSumList); - typedef QVector<ImageItem> ImageItemList; - class BaselineProtocol { public: |