Mercurial > dedupe
diff BitDecoder.cpp @ 49:f8d0ea827db3
Use BitArray.
| author | Tom Fredrik Blenning Klaussen <bfg@blenning.no> |
|---|---|
| date | Mon, 10 Sep 2012 23:59:46 +0200 |
| parents | 41cc0d8ac77f |
| children | b9515dc35fe4 |
line wrap: on
line diff
--- a/BitDecoder.cpp Mon Sep 10 23:59:25 2012 +0200 +++ b/BitDecoder.cpp Mon Sep 10 23:59:46 2012 +0200 @@ -41,37 +41,37 @@ } */ -QMap<QString, QBitArray> BitDecoder::createEncoder() const +QMap<QString, BitArray> BitDecoder::createEncoder() const { - QMap<QString, QBitArray> retVal; + QMap<QString, BitArray> retVal; if (!_data.isNull()) { - retVal.insert(_data, QBitArray()); + retVal.insert(_data, BitArray()); } if (low) { - QMap<QString, QBitArray> vals = low->createEncoder(); - for(QMap<QString, QBitArray>::const_iterator it = vals.begin(); + QMap<QString, BitArray> vals = low->createEncoder(); + for(QMap<QString, BitArray>::const_iterator it = vals.begin(); it != vals.end(); ++it) { - retVal.insert(it.key(), unite(QBitArray(1, false), it.value())); + retVal.insert(it.key(), unite(BitArray(1, false), it.value())); } } if (high) { - QMap<QString, QBitArray> vals = high->createEncoder(); - for(QMap<QString, QBitArray>::const_iterator it = vals.begin(); + QMap<QString, BitArray> vals = high->createEncoder(); + for(QMap<QString, BitArray>::const_iterator it = vals.begin(); it != vals.end(); ++it) { - retVal.insert(it.key(), unite(QBitArray(1, true), it.value())); + retVal.insert(it.key(), unite(BitArray(1, true), it.value())); } } return retVal; } -QBitArray BitDecoder::bitsFromString(const QString& str) +BitArray BitDecoder::bitsFromString(const QString& str) { - QBitArray bits(str.size()); + BitArray bits(str.size()); for (int i = 0; i < str.size(); ++i) { if (str[i] == '1') - bits[i] = true; + bits.setBit(i, true); else if (str[i] == '0') - bits[i] = false; + bits.setBit(i, false); else throw InvalidDataException(); }