More fixes.

Took 7 minutes

tests/carddatabase/carddatabase_test.cpp

@@ -7,7 +7,6 @@ namespace
 
 TEST(CardDatabaseTest, LoadXml)
 {
-    settingsCache = new SettingsCache;
     CardDatabase *db = new CardDatabase;
 
     // ensure the card database is empty at start

tests/carddatabase/filter_string_test.cpp

@@ -3,6 +3,7 @@
 
 #include "gtest/gtest.h"
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/interfaces/noop_card_preference_provider.h>
 
 #define QUERY(name, card, query, match)                                                                                \
     TEST_F(CardQuery, name)                                                                                            \
@@ -72,8 +73,6 @@ QUERY(Color4, cat, "c!gw", false)
 
 int main(int argc, char **argv)
 {
-    settingsCache = new SettingsCache;
-
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

tests/carddatabase/mocks.cpp

@@ -455,10 +455,3 @@ void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
 void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */)
 {
 }
-
-SettingsCache *settingsCache;
-
-SettingsCache &SettingsCache::instance()
-{
-    return *settingsCache;
-}