More changes

stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.cpp

@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../lr_contentlocationresolver.hpp"
+#include "../lr_content_location_resolver.hpp"
-#include "../lr_redirectonlylocationresolver.hpp"
+#include "../lr_redirect_only_location_resolver.hpp"
 #include "lr_location_resolver_manager_impl.hpp"
 
 namespace ams::lr::impl {

stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.hpp

@@ -18,10 +18,10 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "../lr_addoncontentlocationresolver.hpp"
+#include "../lr_add_on_content_location_resolver.hpp"
-#include "../lr_ilocationresolver.hpp"
+#include "../lr_i_location_resolver.hpp"
 #include "../lr_i_location_resolver_manager.hpp"
-#include "../lr_registeredlocationresolver.hpp"
+#include "../lr_registered_location_resolver.hpp"
 #include "ncm_bounded_map.hpp"
 
 namespace ams::lr::impl {

stratosphere/ncm/source/impl/ncm_content_manager.cpp

@@ -19,11 +19,11 @@
 #include <stratosphere/kvdb/kvdb_memory_key_value_store.hpp>
 #include <optional>
 
-#include "../ncm_contentmetadatabase.hpp"
+#include "../ncm_content_meta_database.hpp"
-#include "../ncm_contentstorage.hpp"
+#include "../ncm_content_storage.hpp"
 #include "../ncm_fs.hpp"
 #include "../ncm_make_path.hpp"
-#include "../ncm_readonlycontentstorage.hpp"
+#include "../ncm_read_only_content_storage.hpp"
 #include "ncm_content_manager.hpp"
 #include "ncm_rights_cache.hpp"
 

stratosphere/ncm/source/impl/ncm_content_manager.hpp

@@ -18,8 +18,8 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "../ncm_icontentmetadatabase.hpp"
+#include "../ncm_i_content_meta_database.hpp"
-#include "../ncm_icontentstorage.hpp"
+#include "../ncm_i_content_storage.hpp"
 
 namespace ams::ncm::impl {
 

stratosphere/ncm/source/lr_add_on_content_location_resolver.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "impl/ncm_content_manager.hpp"
-#include "lr_addoncontentlocationresolver.hpp"
+#include "lr_add_on_content_location_resolver.hpp"
 
 namespace ams::lr {
 

stratosphere/ncm/source/lr_content_location_resolver.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "impl/ncm_content_manager.hpp"
-#include "lr_contentlocationresolver.hpp"
+#include "lr_content_location_resolver.hpp"
 
 namespace ams::lr {
 

stratosphere/ncm/source/lr_content_location_resolver.hpp

@@ -18,9 +18,9 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "lr_ilocationresolver.hpp"
+#include "lr_i_location_resolver.hpp"
-#include "ncm_icontentmetadatabase.hpp"
+#include "ncm_i_content_meta_database.hpp"
-#include "ncm_icontentstorage.hpp"
+#include "ncm_i_content_storage.hpp"
 
 namespace ams::lr {
 

stratosphere/ncm/source/lr_i_location_resolver_manager.hpp

@@ -18,9 +18,9 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "lr_addoncontentlocationresolver.hpp"
+#include "lr_add_on_content_location_resolver.hpp"
-#include "lr_ilocationresolver.hpp"
+#include "lr_i_location_resolver.hpp"
-#include "lr_registeredlocationresolver.hpp"
+#include "lr_registered_location_resolver.hpp"
 
 namespace ams::lr {
 

stratosphere/ncm/source/lr_redirect_only_location_resolver.cpp

@@ -15,16 +15,12 @@
  */
 
 #include "impl/ncm_content_manager.hpp"
-#include "lr_redirectonlylocationresolver.hpp"
+#include "lr_redirect_only_location_resolver.hpp"
 
 namespace ams::lr {
 
     RedirectOnlyLocationResolverInterface::~RedirectOnlyLocationResolverInterface() {
-        this->program_redirector.ClearRedirections();
+        this->ClearRedirections();
-        this->debug_program_redirector.ClearRedirections();
-        this->app_control_redirector.ClearRedirections();
-        this->html_docs_redirector.ClearRedirections();
-        this->legal_info_redirector.ClearRedirections();
     }
 
     Result RedirectOnlyLocationResolverInterface::ResolveProgramPath(sf::Out<Path> out, ncm::ProgramId id) {
@@ -87,11 +83,7 @@ namespace ams::lr {
     }
 
     Result RedirectOnlyLocationResolverInterface::Refresh() {
-        this->program_redirector.ClearRedirections();
+        this->ClearRedirections();
-        this->debug_program_redirector.ClearRedirections();
-        this->app_control_redirector.ClearRedirections();
-        this->html_docs_redirector.ClearRedirections();
-        this->legal_info_redirector.ClearRedirections();
         return ResultSuccess();
     }
 
@@ -106,11 +98,7 @@ namespace ams::lr {
     }
 
     Result RedirectOnlyLocationResolverInterface::ClearApplicationRedirectionDeprecated() {
-        this->program_redirector.ClearRedirections(impl::RedirectionFlags_Application);
+        this->ClearRedirections(impl::RedirectionFlags_Application);
-        this->debug_program_redirector.ClearRedirections(impl::RedirectionFlags_Application);
-        this->app_control_redirector.ClearRedirections(impl::RedirectionFlags_Application);
-        this->html_docs_redirector.ClearRedirections(impl::RedirectionFlags_Application);
-        this->legal_info_redirector.ClearRedirections(impl::RedirectionFlags_Application);
         return ResultSuccess();
     }
 

stratosphere/ncm/source/lr_redirect_only_location_resolver.hpp

@@ -18,7 +18,7 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "lr_contentlocationresolver.hpp"
+#include "lr_content_location_resolver.hpp"
 
 namespace ams::lr {
 

stratosphere/ncm/source/lr_registered_location_resolver.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lr_registeredlocationresolver.hpp"
+#include "lr_registered_location_resolver.hpp"
 
 namespace ams::lr {
 
@@ -46,7 +46,7 @@ namespace ams::lr {
 
     Result RegisteredLocationResolverInterface::RefreshImpl(const ncm::ProgramId* excluding_ids, size_t num_ids) {
         /* On < 9.0.0, exclusion lists were not supported yet, so simply clear and return. */
-        if (hos::GetVersion < hos::Version_900) {
+        if (hos::GetVersion() < hos::Version_900) {
             this->ClearRedirections();
             return ResultSuccess();
         }

stratosphere/ncm/source/ncm_content_manager_service.hpp

@@ -18,8 +18,8 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "ncm_icontentmetadatabase.hpp"
+#include "ncm_i_content_meta_database.hpp"
-#include "ncm_icontentstorage.hpp"
+#include "ncm_i_content_storage.hpp"
 
 namespace ams::ncm {
 

stratosphere/ncm/source/ncm_content_meta_database.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ncm_contentmetadatabase.hpp"
+#include "ncm_content_meta_database.hpp"
 #include "ncm_utils.hpp"
 
 namespace ams::ncm {

stratosphere/ncm/source/ncm_content_meta_database.hpp

@@ -18,7 +18,7 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "ncm_icontentmetadatabase.hpp"
+#include "ncm_i_content_meta_database.hpp"
 
 namespace ams::ncm {
 

stratosphere/ncm/source/ncm_content_storage.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ncm_contentstorage.hpp"
+#include "ncm_content_storage.hpp"
 #include "ncm_fs.hpp"
 #include "ncm_make_path.hpp"
 #include "ncm_utils.hpp"

stratosphere/ncm/source/ncm_content_storage.hpp

@@ -20,7 +20,7 @@
 
 #include "impl/ncm_placeholder_accessor.hpp"
 #include "impl/ncm_rights_cache.hpp"
-#include "ncm_icontentstorage.hpp"
+#include "ncm_i_content_storage.hpp"
 #include "ncm_path_utils.hpp"
 
 namespace ams::ncm {

stratosphere/ncm/source/ncm_read_only_content_storage.cpp

@@ -16,7 +16,7 @@
 
 #include "ncm_fs.hpp"
 #include "ncm_path_utils.hpp"
-#include "ncm_readonlycontentstorage.hpp"
+#include "ncm_read_only_content_storage.hpp"
 
 namespace ams::ncm {
 

stratosphere/ncm/source/ncm_read_only_content_storage.hpp

@@ -18,7 +18,7 @@
 #include <switch.h>
 #include <stratosphere.hpp>
 
-#include "ncm_icontentstorage.hpp"
+#include "ncm_i_content_storage.hpp"
 
 namespace ams::ncm {