Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-09-26 11:43:27 +02:00
commit 3b2a39fd38
16 changed files with 73 additions and 72 deletions

View file

@ -31,8 +31,8 @@ public:
HashedBlockStream(QIODevice* baseDevice, qint32 blockSize);
~HashedBlockStream();
bool reset();
void close();
bool reset() Q_DECL_OVERRIDE;
void close() Q_DECL_OVERRIDE;
protected:
qint64 readData(char* data, qint64 maxSize) override;