Move FileKey::isHex() to Tools.

src/core/Tools.cpp

@@ -103,4 +103,15 @@ QString imageReaderFilter()
     return formatsStringList.join(" ");
 }
 
+bool isHex(const QByteArray& ba)
+{
+    Q_FOREACH (char c, ba) {
+        if ( !( (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') ) ) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 } // namespace Tools

src/core/Tools.h

@@ -31,6 +31,7 @@ bool hasChild(const QObject* parent, const QObject* child);
 bool readAllFromDevice(QIODevice* device, QByteArray& data);
 QDateTime currentDateTimeUtc();
 QString imageReaderFilter();
+bool isHex(const QByteArray& ba);
 
 } // namespace Tools
 

src/keys/FileKey.cpp

@@ -20,6 +20,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QXmlStreamReader>
 
+#include "core/Tools.h"
 #include "crypto/CryptoHash.h"
 #include "crypto/Random.h"
 
@@ -233,7 +234,7 @@ bool FileKey::loadHex(QIODevice* device)
 
     QByteArray data = device->readAll();
 
-    if (!isHex(data)) {
+    if (!Tools::isHex(data)) {
         return false;
     }
 
@@ -262,14 +263,3 @@ bool FileKey::loadHashed(QIODevice* device)
 
     return true;
 }
-
-bool FileKey::isHex(const QByteArray& ba)
-{
-    Q_FOREACH (char c, ba) {
-        if ( !( (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') ) ) {
-            return false;
-        }
-    }
-
-    return true;
-}

src/keys/FileKey.h

@@ -42,7 +42,6 @@ private:
     bool loadBinary(QIODevice* device);
     bool loadHex(QIODevice* device);
     bool loadHashed(QIODevice* device);
-    static bool isHex(const QByteArray& ba);
 
     QByteArray m_key;
 };