From 77bbff1454b953782782f8f5484814322e6b9891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Wed, 26 Oct 2016 20:46:47 +0300
Subject: [PATCH] Refactor|FS: Querying currently loaded packages

Renamed a method for clarity.
---
 doomsday/apps/libdoomsday/src/doomsdayapp.cpp           | 4 ++--
 doomsday/apps/plugins/common/src/game/gamesession.cpp   | 2 +-
 doomsday/sdk/libcore/include/de/filesys/packageloader.h | 4 +++-
 doomsday/sdk/libcore/src/filesys/packageloader.cpp      | 7 ++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doomsday/apps/libdoomsday/src/doomsdayapp.cpp b/doomsday/apps/libdoomsday/src/doomsdayapp.cpp
index 94893d20b7..ebb1a398fb 100644
--- a/doomsday/apps/libdoomsday/src/doomsdayapp.cpp
+++ b/doomsday/apps/libdoomsday/src/doomsdayapp.cpp
@@ -539,7 +539,7 @@ bool DoomsdayApp::isGameLoaded()
 
 StringList DoomsdayApp::loadedPackagesIncludedInSavegames() // static
 {
-    StringList ids = PackageLoader::get().loadedPackagesInOrder();
+    StringList ids = PackageLoader::get().loadedPackageIdsInOrder();
     QMutableListIterator<String> iter(ids);
     while (iter.hasNext())
     {
@@ -666,7 +666,7 @@ void DoomsdayApp::makeGameCurrent(GameProfile const &profile)
     if (!newGame.isNull())
     {
         // Remember what was loaded beforehand.
-        d->preGamePackages = PackageLoader::get().loadedPackagesInOrder(PackageLoader::NonVersioned);
+        d->preGamePackages = PackageLoader::get().loadedPackageIdsInOrder(PackageLoader::NonVersioned);
     }
 
     profile.loadPackages();
diff --git a/doomsday/apps/plugins/common/src/game/gamesession.cpp b/doomsday/apps/plugins/common/src/game/gamesession.cpp
index 3a9e36e3ed..f390b3508f 100644
--- a/doomsday/apps/plugins/common/src/game/gamesession.cpp
+++ b/doomsday/apps/plugins/common/src/game/gamesession.cpp
@@ -212,7 +212,7 @@ DENG2_PIMPL(GameSession), public SavedSession::IMapStateReaderFactory
         meta.add("gameRules",       self.rules().toRecord());  // Takes ownership.
 
         auto *loadedPackages = new ArrayValue;
-        for (String id : PackageLoader::get().loadedPackagesInOrder())
+        for (String id : PackageLoader::get().loadedPackageIdsInOrder())
         {
             if (SavedSession::isIncludedInSavegames(id))
             {
diff --git a/doomsday/sdk/libcore/include/de/filesys/packageloader.h b/doomsday/sdk/libcore/include/de/filesys/packageloader.h
index 0040fdf86d..72efa811ec 100644
--- a/doomsday/sdk/libcore/include/de/filesys/packageloader.h
+++ b/doomsday/sdk/libcore/include/de/filesys/packageloader.h
@@ -115,6 +115,8 @@ class DENG2_PUBLIC PackageLoader
      */
     LoadedPackages const &loadedPackages() const;
 
+    QList<Package *> loadedPackagesInOrder() const;
+
     FileSystem::FoundFiles loadedPackagesAsFilesInPackageOrder() const;
 
     enum IdentifierType { NonVersioned, Versioned };
@@ -125,7 +127,7 @@ class DENG2_PUBLIC PackageLoader
      *
      * @return Versioned package IDs.
      */
-    StringList loadedPackagesInOrder(IdentifierType type = Versioned) const;
+    StringList loadedPackageIdsInOrder(IdentifierType type = Versioned) const;
 
     /**
      * Retrieves a specific loaded package. The package must already be loaded
diff --git a/doomsday/sdk/libcore/src/filesys/packageloader.cpp b/doomsday/sdk/libcore/src/filesys/packageloader.cpp
index e85a65b756..0416e279e3 100644
--- a/doomsday/sdk/libcore/src/filesys/packageloader.cpp
+++ b/doomsday/sdk/libcore/src/filesys/packageloader.cpp
@@ -471,6 +471,11 @@ PackageLoader::LoadedPackages const &PackageLoader::loadedPackages() const
     return d->loaded;
 }
 
+QList<Package *> PackageLoader::loadedPackagesInOrder() const
+{
+    return d->loadedInOrder();
+}
+
 FS::FoundFiles PackageLoader::loadedPackagesAsFilesInPackageOrder() const
 {
     QList<Package *> pkgs = d->loadedInOrder();
@@ -482,7 +487,7 @@ FS::FoundFiles PackageLoader::loadedPackagesAsFilesInPackageOrder() const
     return sorted;
 }
 
-StringList PackageLoader::loadedPackagesInOrder(IdentifierType idType) const
+StringList PackageLoader::loadedPackageIdsInOrder(IdentifierType idType) const
 {
     QList<Package *> pkgs = d->loadedInOrder();
     StringList ids;