Refactor|libdeng2|SavedSession: Use pimpl-friendly audiences for game…

…::SavedSession
skyjake · Mar 5, 2014 · aab5318 · aab5318
1 parent d3951b1
commit aab5318
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/doomsday/libdeng2/include/de/game/savedsession.h b/doomsday/libdeng2/include/de/game/savedsession.h
@@ -39,10 +39,10 @@ class DENG2_PUBLIC SavedSession
 {
 public:
     /// Notified whenever the status of the saved game session changes.
-    DENG2_DEFINE_AUDIENCE(StatusChange, void savedSessionStatusChanged(SavedSession &session))
+    DENG2_DEFINE_AUDIENCE2(StatusChange, void savedSessionStatusChanged(SavedSession &session))
 
     /// Notified whenever the metadata of the saved game session changes.
-    DENG2_DEFINE_AUDIENCE(MetadataChange, void savedSessionMetadataChanged(SavedSession &session))
+    DENG2_DEFINE_AUDIENCE2(MetadataChange, void savedSessionMetadataChanged(SavedSession &session))
 
     /// Required/referenced repository is missing. @ingroup errors
     DENG2_ERROR(MissingRepositoryError);

diff --git a/doomsday/libdeng2/src/game/savedsession.cpp b/doomsday/libdeng2/src/game/savedsession.cpp
@@ -62,7 +62,7 @@ DENG2_PIMPL(SavedSession)
 
     void notifyMetadataChanged()
     {
-        DENG2_FOR_PUBLIC_AUDIENCE(MetadataChange, i)
+        DENG2_FOR_PUBLIC_AUDIENCE2(MetadataChange, i)
         {
             i->savedSessionMetadataChanged(self);
         }
@@ -90,14 +90,20 @@ DENG2_PIMPL(SavedSession)
 
         if(status != oldStatus)
         {
-            DENG2_FOR_PUBLIC_AUDIENCE(StatusChange, i)
+            DENG2_FOR_PUBLIC_AUDIENCE2(StatusChange, i)
             {
                 i->savedSessionStatusChanged(self);
             }
         }
     }
+
+    DENG2_PIMPL_AUDIENCE(StatusChange)
+    DENG2_PIMPL_AUDIENCE(MetadataChange)
 };
 
+DENG2_AUDIENCE_METHOD(SavedSession, StatusChange)
+DENG2_AUDIENCE_METHOD(SavedSession, MetadataChange)
+
 SavedSession::SavedSession(String const &fileName) : d(new Instance(this))
 {
     d->fileName = fileName;
@@ -236,11 +242,12 @@ void SavedSession::deleteFilesInRepository()
             {
                 // Remove this file.
                 delete file;
+                d->needUpdateStatus = true;
             }
         }
     }
 
-    // Force a status update.
+    /// Force a status update. @todo necessary?
     updateFromRepository();
 }
 

diff --git a/doomsday/plugins/common/src/saveslots.cpp b/doomsday/plugins/common/src/saveslots.cpp
@@ -181,8 +181,8 @@ void SaveSlots::Slot::replaceSavedSession(SavedSession *newSession)
     if(d->gameMenuWidgetId)
     {
         // We want notification of subsequent changes so that we can update the menu widget.
-        session.audienceForStatusChange   += d;
-        session.audienceForMetadataChange += d;
+        session.audienceForStatusChange()   += d;
+        session.audienceForMetadataChange() += d;
     }
 }