libcommon: Cleanup

skyjake · Feb 10, 2014 · fcd8f30 · fcd8f30
1 parent 594db1a
commit fcd8f30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/doomsday/plugins/common/include/saveslots.h b/doomsday/plugins/common/include/saveslots.h
@@ -156,10 +156,10 @@ void SaveSlots_UpdateAllSaveInfo(SaveSlots *sslots);
 dd_bool SaveSlots_IsValidSlot(SaveSlots *sslots, int slot);
 AutoStr *SaveSlots_ComposeSlotIdentifier(SaveSlots *sslots, int slot);
 int SaveSlots_ParseSlotIdentifier(SaveSlots *sslots, char const *str);
-int SaveSlots_SlotForSaveName(SaveSlots *sslots, char const *description);
+int SaveSlots_FindSlotWithSaveDescription(SaveSlots *sslots, char const *description);
 dd_bool SaveSlots_SlotInUse(SaveSlots *sslots, int slot);
 dd_bool SaveSlots_SlotIsUserWritable(SaveSlots *sslots, int slot);
-SaveInfo *SaveSlots_FindSaveInfoForSlot(SaveSlots *sslots, int slot);
+SaveInfo *SaveSlots_SaveInfo(SaveSlots *sslots, int slot);
 void SaveSlots_ReplaceSaveInfo(SaveSlots *sslots, int slot, SaveInfo *newInfo);
 void SaveSlots_ClearSlot(SaveSlots *sslots, int slot);
 void SaveSlots_CopySlot(SaveSlots *sslots, int sourceSlot, int destSlot);

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -2139,7 +2139,7 @@ void G_DoReborn(int plrNum)
             else
             {
                 // Compose the confirmation message.
-                SaveInfo *info = SaveSlots_FindSaveInfoForSlot(saveSlots, chosenSlot);
+                SaveInfo *info = SaveSlots_SaveInfo(saveSlots, chosenSlot);
                 AutoStr *msg = Str_Appendf(AutoStr_NewStd(), REBORNLOAD_CONFIRM, Str_Text(SaveInfo_Description(info)));
                 S_LocalSound(SFX_REBORNLOAD_CONFIRM, NULL);
                 Hu_MsgStart(MSG_YESNO, Str_Text(msg), rebornLoadConfirmResponse, chosenSlot, 0);
@@ -2906,7 +2906,7 @@ void G_DoSaveGame(void)
     else
     {
         // No name specified.
-        SaveInfo *info = SaveSlots_FindSaveInfoForSlot(saveSlots, gaSaveGameSlot);
+        SaveInfo *info = SaveSlots_SaveInfo(saveSlots, gaSaveGameSlot);
         if(!gaSaveGameGenerateName && !Str_IsEmpty(SaveInfo_Description(info)))
         {
             // Slot already in use; reuse the existing name.
@@ -3698,7 +3698,7 @@ D_CMD(LoadGame)
             return G_LoadGame(slot);
         }
 
-        info = SaveSlots_FindSaveInfoForSlot(saveSlots, slot);
+        info = SaveSlots_SaveInfo(saveSlots, slot);
         // Compose the confirmation message.
         msg = Str_Appendf(AutoStr_NewStd(), QLPROMPT, Str_Text(SaveInfo_Description(info)));
 
@@ -3786,7 +3786,7 @@ D_CMD(SaveGame)
     {
         // A known slot identifier.
         dd_bool const slotIsUsed = SaveSlots_SlotInUse(saveSlots, slot);
-        SaveInfo *info = SaveSlots_FindSaveInfoForSlot(saveSlots, slot);
+        SaveInfo *info = SaveSlots_SaveInfo(saveSlots, slot);
         ddstring_t localName, *name;
         AutoStr *msg;
 
@@ -3842,7 +3842,7 @@ dd_bool G_DeleteSaveGame(int slot)
     if(!SaveSlots_SlotInUse(saveSlots, slot)) return false;
 
     // A known slot identifier.
-    info = SaveSlots_FindSaveInfoForSlot(saveSlots, slot);
+    info = SaveSlots_SaveInfo(saveSlots, slot);
     DENG_ASSERT(info != 0);
     SaveSlots_ClearSlot(saveSlots, slot);
 
@@ -3894,7 +3894,7 @@ D_CMD(DeleteGameSave)
         else
         {
             // Compose the confirmation message.
-            SaveInfo *info = SaveSlots_FindSaveInfoForSlot(saveSlots, slot);
+            SaveInfo *info = SaveSlots_SaveInfo(saveSlots, slot);
             AutoStr *msg = Str_Appendf(AutoStr_NewStd(), DELETESAVEGAME_CONFIRM, Str_Text(SaveInfo_Description(info)));
             S_LocalSound(SFX_DELETESAVEGAME_CONFIRM, NULL);
             Hu_MsgStart(MSG_YESNO, Str_Text(msg), deleteSaveGameConfirmResponse, slot, 0);

diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -5661,7 +5661,7 @@ void Hu_MenuUpdateGameSaveWidgets(void)
         MNObject_SetFlags(obj, FO_SET, MNF_DISABLED);
         if(SaveSlots_SlotInUse(saveSlots, edit->data2))
         {
-            SaveInfo *info = SaveSlots_FindSaveInfoForSlot(saveSlots, edit->data2);
+            SaveInfo *info = SaveSlots_SaveInfo(saveSlots, edit->data2);
             text = Str_Text(SaveInfo_Description(info));
             MNObject_SetFlags(obj, FO_CLEAR, MNF_DISABLED);
         }

diff --git a/doomsday/plugins/common/src/saveslots.cpp b/doomsday/plugins/common/src/saveslots.cpp
@@ -447,7 +447,7 @@ int SaveSlots_ParseSlotIdentifier(SaveSlots *sslots, char const *str)
     return sslots->parseSlotIdentifier(str);
 }
 
-int SaveSlots_SlotForSaveName(SaveSlots *sslots, char const *description)
+int SaveSlots_FindSlotWithSaveDescription(SaveSlots *sslots, char const *description)
 {
     DENG_ASSERT(sslots != 0);
     return sslots->findSlotWithSaveDescription(description);
@@ -465,7 +465,7 @@ dd_bool SaveSlots_SlotIsUserWritable(SaveSlots *sslots, int slot)
     return sslots->slotIsUserWritable(slot);
 }
 
-SaveInfo *SaveSlots_FindSaveInfoForSlot(SaveSlots *sslots, int slot)
+SaveInfo *SaveSlots_SaveInfo(SaveSlots *sslots, int slot)
 {
     DENG_ASSERT(sslots != 0);
     return sslots->saveInfo(slot);