Mercurial > dedupe
changeset 86:af7962f3274b
Use quint64 for sizes, rather than qint64.
| author | Tom Fredrik Blenning Klaussen <bfg@bfgconsult.no> |
|---|---|
| date | Thu, 10 Oct 2013 16:07:35 +0200 |
| parents | 1f9e27a0bd7f |
| children | 9e337bd96bd3 |
| files | FileDBLink.cpp FileDBLink.hpp MemoryDBLink.cpp MemoryDBLink.hpp SqliteDBLink.cpp SqliteDBLink.hpp |
| diffstat | 6 files changed, 25 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/FileDBLink.cpp Thu Oct 10 15:55:30 2013 +0200 +++ b/FileDBLink.cpp Thu Oct 10 16:07:35 2013 +0200 @@ -56,7 +56,7 @@ return hash.result(); } -bool FileDBLink::updateAllWithSize(qint64 size) +bool FileDBLink::updateAllWithSize(quint64 size) { const QList<dbinf_ptr_t> others = filesWithSize(size); if (!others.empty()) { @@ -71,7 +71,7 @@ return false; } -void FileDBLink::addFile(const QString& path, qint64 size, +void FileDBLink::addFile(const QString& path, quint64 size, const QDateTime& lastModified, bool lazy) { QByteArray hash; @@ -87,7 +87,7 @@ fileinfo.lastModified(), lazy); } -void FileDBLink::updateFile(const QString& path, qint64 size, +void FileDBLink::updateFile(const QString& path, quint64 size, const QDateTime& lastModified, bool lazy) { QByteArray hash; @@ -195,8 +195,8 @@ } -const QList<FileDBLink::dbinf_ptr_t> -FileDBLink::filesWithSize(qint64 size, const QString& prefix) const +const QList<FileDBLink::dbinf_ptr_t> +FileDBLink::filesWithSize(quint64 size, const QString& prefix) const { QList<dbinf_ptr_t> retVal; const QList<dbinf_ptr_t> vals = values(prefix);
--- a/FileDBLink.hpp Thu Oct 10 15:55:30 2013 +0200 +++ b/FileDBLink.hpp Thu Oct 10 16:07:35 2013 +0200 @@ -9,7 +9,7 @@ public: class DBInfo { public: - DBInfo(const QString& path, qint64 size, + DBInfo(const QString& path, quint64 size, const QDateTime& mtime, const QByteArray& hash) : path_(path), size_(size), mtime_(mtime), @@ -57,7 +57,7 @@ private: QString path_; - qint64 size_; + quint64 size_; QDateTime mtime_; QByteArray hash_; }; @@ -115,24 +115,24 @@ void updateIfModified(const QString& path, bool lazy = false); - virtual void addFile(const QString& path, qint64 size, + virtual void addFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash) = 0; virtual void keepOnlyFromPrefix(const QString& prefix, const QStringList& files) = 0; virtual void deleteFileFromDB(const QString& path) = 0; - virtual const QList<dbinf_ptr_t> filesWithSize(qint64 size, const QString& prefix = QString()) const; + virtual const QList<dbinf_ptr_t> filesWithSize(quint64 size, const QString& prefix = QString()) const; - bool updateAllWithSize(qint64 size); + bool updateAllWithSize(quint64 size); virtual dbinf_ptr_t value(const QString& path) const; - void addFile(const QString& path, qint64 size, const QDateTime& dtime, bool lazy = false); + void addFile(const QString& path, quint64 size, const QDateTime& dtime, bool lazy = false); void addFile(const QFileInfo& fileinfo, bool lazy = false); - virtual void updateFile(const QString& path, qint64 size, + virtual void updateFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash) = 0; - void updateFile(const QString& path, qint64 size, const QDateTime& dtime, bool lazy = false); + void updateFile(const QString& path, quint64 size, const QDateTime& dtime, bool lazy = false); void updateFile(const QFileInfo& fileinfo, bool lazy = false); virtual bool exists(const QString& path) = 0;
--- a/MemoryDBLink.cpp Thu Oct 10 15:55:30 2013 +0200 +++ b/MemoryDBLink.cpp Thu Oct 10 16:07:35 2013 +0200 @@ -2,7 +2,7 @@ #include "Exception/ValueExistsException.hpp" #include <QtCore/QStringList> -void MemoryDBLink::addFile(const QString& path, qint64 size, +void MemoryDBLink::addFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash) { addFile(DBInfo(path, size, dtime, hash)); @@ -84,7 +84,7 @@ return NONE; } -void MemoryDBLink::updateFile(const QString& path, qint64 size, +void MemoryDBLink::updateFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash) { updateFile(DBInfo(path, size, dtime, hash));
--- a/MemoryDBLink.hpp Thu Oct 10 15:55:30 2013 +0200 +++ b/MemoryDBLink.hpp Thu Oct 10 16:07:35 2013 +0200 @@ -14,9 +14,9 @@ QStringList toStringList(); - virtual void addFile(const QString& path, qint64 size, + virtual void addFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash); - virtual void updateFile(const QString& path, qint64 size, + virtual void updateFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash); DBStatus existsWithMtime(const QString& path, const QDateTime& mtime);
--- a/SqliteDBLink.cpp Thu Oct 10 15:55:30 2013 +0200 +++ b/SqliteDBLink.cpp Thu Oct 10 16:07:35 2013 +0200 @@ -71,7 +71,7 @@ return NONE; } -void SqliteDBLink::addFile(const QString& path, qint64 size, +void SqliteDBLink::addFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash) { addFile(DBInfo(path, size, dtime, hash)); @@ -95,7 +95,7 @@ } void SqliteDBLink::updateFile(const QString& path, - qint64 size, const QDateTime& dtime, + quint64 size, const QDateTime& dtime, const QByteArray& hash) { updateFile(DBInfo(path, size, dtime, hash)); @@ -161,7 +161,7 @@ int checksumIndex = query.record().indexOf("checksum"); while (query.next()) { QString path = query.value(pathIndex).toString(); - qint64 size = query.value(sizeIndex).toInt(); + quint64 size = query.value(sizeIndex).toInt(); QDateTime mtime = query.value(dateIndex).toDateTime(); QByteArray checksum = query.value(checksumIndex).toByteArray(); @@ -198,10 +198,9 @@ } } -const QList<FileDBLink::dbinf_ptr_t> -SqliteDBLink::filesWithSize(qint64 size, const QString& prefix) const +const QList<FileDBLink::dbinf_ptr_t> +SqliteDBLink::filesWithSize(quint64 size, const QString& prefix) const { //This is incredibly inefficient and should be reimplemented return FileDBLink::filesWithSize(size, prefix); } -
--- a/SqliteDBLink.hpp Thu Oct 10 15:55:30 2013 +0200 +++ b/SqliteDBLink.hpp Thu Oct 10 16:07:35 2013 +0200 @@ -9,14 +9,14 @@ SqliteDBLink(const QString& dbpath); ~SqliteDBLink(); - virtual void addFile(const QString& path, qint64 size, + virtual void addFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash); - virtual void updateFile(const QString& path, qint64 size, + virtual void updateFile(const QString& path, quint64 size, const QDateTime& dtime, const QByteArray& hash); bool exists(const QString& path); DBStatus existsWithMtime(const QString& path, const QDateTime& mtime); - virtual const QList<dbinf_ptr_t> filesWithSize(qint64 size, const QString& prefix = QString()) const; + virtual const QList<dbinf_ptr_t> filesWithSize(quint64 size, const QString& prefix = QString()) const; QStringList toStringList();