From c20929cb2039d6185fe8142360f719239e5b499c Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 1 Feb 2015 21:11:37 +0100 Subject: [PATCH] Updated LockedFile class for latest MUtilities changes. --- src/Config.h | 2 +- src/LockedFile.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Config.h b/src/Config.h index 4d680b12..8d61a163 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 14 -#define VER_LAMEXP_BUILD 1676 +#define VER_LAMEXP_BUILD 1677 #define VER_LAMEXP_CONFG 1558 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/LockedFile.cpp b/src/LockedFile.cpp index 36075c4f..6c092481 100644 --- a/src/LockedFile.cpp +++ b/src/LockedFile.cpp @@ -24,8 +24,8 @@ #include "Global.h" //MUtils -#include #include +#include #include //Qt @@ -75,13 +75,13 @@ QByteArray LockedFile::fileHash(QFile &file) if(file.isOpen() && file.reset()) { - MUtils::KeccakHash keccak; + MUtils::Hash::Keccak keccak; const QByteArray data = file.readAll(); const QByteArray seed = QByteArray::fromHex(g_seed); const QByteArray salt = QByteArray::fromHex(g_salt); - if(keccak.init(MUtils::KeccakHash::hb384)) + if(keccak.init(MUtils::Hash::Keccak::hb384)) { bool ok = true; ok = ok && keccak.addData(seed); @@ -270,7 +270,7 @@ const QString &LockedFile::filePath() void LockedFile::selfTest() { - if(!MUtils::KeccakHash::selfTest()) + if(!MUtils::Hash::Keccak::selfTest()) { MUTILS_THROW("QKeccakHash self-test has failed!"); }