Refactor|Fonts|Client: Moved linked-definition clearing from Fonts to…

… ResourceSystem

It is no longer necessary to implement this logic with the resource
collection itself.

doomsday/client/include/resource/fonts.h

@@ -28,6 +28,7 @@
 #include <de/Error>
 #include <de/Observers>
 #include <de/String>
+#include <QList>
 #include <QMap>
 
 /// Special value used to signify an invalid font id.
@@ -78,11 +79,6 @@ DENG2_OBSERVES(AbstractFont, Deletion)
      */
     static void consoleRegister();
 
-    /**
-     * To be called during a definition database reset to clear all links to defs.
-     */
-    void clearDefinitionLinks();
-
     /**
      * Returns the total number of unique fonts in the collection.
      */

doomsday/client/include/resource/resourcesystem.h

@@ -98,6 +98,12 @@ class ResourceSystem : public de::System
     void clearRuntimeFontSchemes();
     void clearSystemFontSchemes();
 
+    /**
+     * To be called during a definition database reset to clear all definitions
+     * linked to by Font resources.
+     */
+    void clearFontDefinitionLinks();
+
     AbstractFont *createFontFromDef(ded_compositefont_t const &def);
     AbstractFont *createFontFromFile(de::Uri const &uri, de::String filePath);
 

doomsday/client/src/def_main.cpp

@@ -1434,7 +1434,7 @@ void Def_Read()
 
         invalidateAllMaterials();
 #ifdef __CLIENT__
-        App_Fonts().clearDefinitionLinks();
+        App_ResourceSystem().clearFontDefinitionLinks();
 #endif
 
         Def_Destroy();

doomsday/client/src/resource/fonts.cpp

@@ -214,17 +214,6 @@ Fonts::Manifest &Fonts::toManifest(fontid_t id) const
     throw UnknownIdError("Fonts::toManifest", QString("Invalid font ID %1, valid range [1..%2)").arg(id).arg(d->manifestCount + 1));
 }
 
-void Fonts::clearDefinitionLinks()
-{
-    foreach(AbstractFont *font, d->fonts)
-    {
-        if(CompositeBitmapFont *compFont = font->maybeAs<CompositeBitmapFont>())
-        {
-            compFont->setDefinition(0);
-        }
-    }
-}
-
 void Fonts::schemeManifestDefined(Scheme & /*scheme*/, Manifest &manifest)
 {
     // We want notification when the manifest is derived to produce a resource.

doomsday/client/src/resource/resourcesystem.cpp

@@ -990,6 +990,17 @@ void ResourceSystem::clearSystemFontSchemes()
     d->fonts.scheme("System").clear();
 }
 
+void ResourceSystem::clearFontDefinitionLinks()
+{
+    foreach(AbstractFont *font, d->fonts.all())
+    {
+        if(CompositeBitmapFont *compFont = font->maybeAs<CompositeBitmapFont>())
+        {
+            compFont->setDefinition(0);
+        }
+    }
+}
+
 AbstractFont *ResourceSystem::createFontFromDef(ded_compositefont_t const &def)
 {
     LOG_AS("ResourceSystem::createFontFromDef");