diff options
author | kh1 <karsten.heimrich@nokia.com> | 2012-09-28 14:46:17 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-10-01 12:13:06 +0200 |
commit | c8cc7d5b521c29e0968ce11dd9c63de0ce260c49 (patch) | |
tree | f5d90f7a7a8daa86848ff1ede9ebc91abbce52aa /src/libs/kdtools | |
parent | a1b2010ce87bd878f78acf01a5677875f34254ef (diff) |
Merge "buffered" calculateHash function and reuse.
Change-Id: I294038888bd47a139b8c3df68e298e66e5ec2202
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/kdtools')
-rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader.cpp | 24 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader.h | 4 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader_p.h | 1 |
3 files changed, 0 insertions, 29 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 diff --git a/src/libs/kdtools/kdupdaterfiledownloader.h b/src/libs/kdtools/kdupdaterfiledownloader.h index 6408b7216..6f6d03cc5 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.h +++ b/src/libs/kdtools/kdupdaterfiledownloader.h @@ -28,15 +28,11 @@ #include <QtCore/QObject> #include <QtCore/QUrl> -#include <QtCore/QCryptographicHash> #include <QtNetwork/QAuthenticator> namespace KDUpdater { -KDTOOLS_EXPORT QByteArray calculateHash(QIODevice *device, QCryptographicHash::Algorithm algo); -KDTOOLS_EXPORT QByteArray calculateHash(const QString &path, QCryptographicHash::Algorithm algo); - class HashVerificationJob; class FileDownloaderProxyFactory; diff --git a/src/libs/kdtools/kdupdaterfiledownloader_p.h b/src/libs/kdtools/kdupdaterfiledownloader_p.h index 81b3c2c98..c47663bd1 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader_p.h +++ b/src/libs/kdtools/kdupdaterfiledownloader_p.h @@ -25,7 +25,6 @@ #include "kdupdaterfiledownloader.h" -#include <QtCore/QCryptographicHash> #include <QtNetwork/QNetworkReply> // these classes are not a part of the public API |