Remove CoverInfoRelative::kNullImageHash

4 files changed, 14 insertions, 15 deletions

diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp
index 351ba5f595..621b424d87 100644
--- a/src/library/coverart.cpp
+++ b/src/library/coverart.cpp
@@ -44,6 +44,13 @@ QString coverInfoToString(const CoverInfo& info) {
 }
 } // anonymous namespace
 
+CoverInfoRelative::CoverInfoRelative()
+        : source(UNKNOWN),
+          type(NONE),
+          hash(0) {
+    // The default hash value should match the calculated hash for a null image
+    DEBUG_ASSERT(CoverArtUtils::calculateHash(QImage()) == hash);
+}
 
 bool operator==(const CoverInfoRelative& a, const CoverInfoRelative& b) {
     return a.source == b.source &&
@@ -82,6 +89,3 @@ QDebug operator<<(QDebug dbg, const CoverArt& art) {
                  toDebugString(art.image.size()),
                  QString::number(art.resizedToWidth));
 }
-
-const quint16 CoverInfoRelative::kNullImageHash = CoverArtUtils::calculateHash(QImage());
-
diff --git a/src/library/coverart.h b/src/library/coverart.h
index 0c458689af..fc0839298a 100644
--- a/src/library/coverart.h
+++ b/src/library/coverart.h
@@ -29,15 +29,7 @@ class CoverInfoRelative {
         FILE = 2
     };
 
-    static const quint16 kNullImageHash;
-
-    CoverInfoRelative()
-            : source(UNKNOWN),
-              type(NONE),
-              // This default value is fine: qChecksum(NULL, 0) is 0.
-              hash(kNullImageHash) {
-    }
-
+    CoverInfoRelative();
     virtual ~CoverInfoRelative() {};
 
     Source source;
diff --git a/src/library/coverartutils.h b/src/library/coverartutils.h
index 86fa4f7677..f1e01d24a1 100644
--- a/src/library/coverartutils.h
+++ b/src/library/coverartutils.h
@@ -11,6 +11,9 @@
 #include "track/track.h"
 #include "util/sandbox.h"
 
+class CoverInfo;
+class CoverInfoRelative;
+
 class CoverArtUtils {
   public:
     static QString defaultCoverLocation();
diff --git a/src/test/coverartutils_test.cpp b/src/test/coverartutils_test.cpp
index 9cd06df548..15295a8c26 100644
--- a/src/test/coverartutils_test.cpp
+++ b/src/test/coverartutils_test.cpp
@@ -136,7 +136,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
     EXPECT_EQ(result.type, CoverInfo::METADATA);
     EXPECT_EQ(result.source, CoverInfo::GUESSED);
     EXPECT_EQ(result.coverLocation, QString());
-    EXPECT_NE(result.hash, CoverInfoRelative::kNullImageHash);
+    EXPECT_NE(result.hash, CoverInfoRelative().hash);
 
     const char* format("jpg");
     const QString qFormat(format);
@@ -164,7 +164,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
 
     // All the following expect the same image/hash to be selected.
     CoverInfoRelative expected2;
-    expected2.hash = CoverInfoRelative::kNullImageHash;
+    expected2.hash = CoverInfoRelative().hash;
 
     // All the following expect FILE and GUESSED.
     expected2.type = CoverInfo::FILE;
@@ -244,7 +244,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
         if (cover.baseName() == "other1") {
             expected2.type = CoverInfo::NONE;
             expected2.coverLocation = QString();
-            expected2.hash = CoverInfoRelative::kNullImageHash;
+            expected2.hash = CoverInfoRelative().hash;
         } else {
             expected2.type = CoverInfo::FILE;
             expected2.coverLocation = cover.fileName();