X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=71492d5b8f92e255340e4e66f0063cc8e73be77e;hb=dd69349ca91776432a4a53aa4d18dd8ef018cd26;hp=989f33142e18e63de06795d7491ff8391ff67c63;hpb=1e57394b3bb6aaf6213270658e00975b19f02d26;p=quassel.git

diff --git a/src/core/storage.h b/src/core/storage.h
index 989f3314..71492d5b 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -43,13 +43,10 @@ public:
     };
 
     enum HashVersion {
-        sha1,
-#if QT_VERSION >= 0x050000
-        sha2_512,
-        latest=sha2_512
-#else
-        latest=sha1
-#endif
+        Sha1,
+        Sha2_512,
+        Latest=Sha2_512
+        
     };
 
 public slots:
@@ -425,10 +422,9 @@ private:
     QString hashPasswordSha1(const QString &password);
     bool checkHashedPasswordSha1(const QString &password, const QString &hashedPassword);
 
-#if QT_VERSION >= 0x050000
     QString hashPasswordSha2_512(const QString &password);
     bool checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword);
-#endif
+    QString sha2_512(const QString &input);
 };