summaryrefslogtreecommitdiffstats
path: root/src/libs/kdtools/kdupdaterfiledownloader.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-09-28 14:46:17 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2012-10-01 12:13:06 +0200
commitc8cc7d5b521c29e0968ce11dd9c63de0ce260c49 (patch)
treef5d90f7a7a8daa86848ff1ede9ebc91abbce52aa /src/libs/kdtools/kdupdaterfiledownloader.cpp
parenta1b2010ce87bd878f78acf01a5677875f34254ef (diff)
Merge "buffered" calculateHash function and reuse.
Change-Id: I294038888bd47a139b8c3df68e298e66e5ec2202 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/kdtools/kdupdaterfiledownloader.cpp')
-rw-r--r--src/libs/kdtools/kdupdaterfiledownloader.cpp24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp
index 818c8ac70..ec2293a2c 100644
--- a/src/libs/kdtools/kdupdaterfiledownloader.cpp
+++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp
@@ -35,7 +35,6 @@
#include <QUrl>
#include <QTemporaryFile>
#include <QFileInfo>
-#include <QCryptographicHash>
#include <QThreadPool>
#include <QDebug>
#include <QSslError>
@@ -50,29 +49,6 @@ static double calcProgress(qint32 done, qint32 total)
return total ? (double(done) / double(total)) : 0;
}
-QByteArray KDUpdater::calculateHash(QIODevice* device, QCryptographicHash::Algorithm algo)
-{
- Q_ASSERT(device);
- QCryptographicHash hash(algo);
- QByteArray buffer;
- buffer.resize(512 * 1024);
- while (true) {
- const qint64 numRead = device->read(buffer.data(), buffer.size());
- if (numRead <= 0)
- return hash.result();
- hash.addData(buffer.constData(), numRead);
- }
- return QByteArray(); // never reached
-}
-
-QByteArray KDUpdater::calculateHash(const QString &path, QCryptographicHash::Algorithm algo)
-{
- QFile file(path);
- if (!file.open(QIODevice::ReadOnly))
- return QByteArray();
- return calculateHash(&file, algo);
-}
-
// -- HashVerificationJob