OSDN Git Service

Updated LockedFile class for latest MUtilities changes.
authorLoRd_MuldeR <mulder2@gmx.de>
Sun, 1 Feb 2015 20:11:37 +0000 (21:11 +0100)
committerLoRd_MuldeR <mulder2@gmx.de>
Sun, 1 Feb 2015 20:11:37 +0000 (21:11 +0100)
src/Config.h
src/LockedFile.cpp

index 4d680b1..8d61a16 100644 (file)
@@ -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
 
 ///////////////////////////////////////////////////////////////////////////////
index 36075c4..6c09248 100644 (file)
@@ -24,8 +24,8 @@
 #include "Global.h"
 
 //MUtils
-#include <MUtils/KeccakHash.h>
 #include <MUtils/OSSupport.h>
+#include <MUtils/Hash_Keccak.h>
 #include <MUtils/Exception.h>
 
 //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!");
        }