From 961b5586a5a48a90191eacb0b767e03a7f65abbb Mon Sep 17 00:00:00 2001 From: t895 Date: Sun, 21 Jan 2024 19:31:26 -0500 Subject: frontend_common: Remove default value for installer callbacks We never used these without callbacks and these will break without them in their current state. I could write the default value to return false always but that's unnecessary for now. --- src/frontend_common/content_manager.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/frontend_common/content_manager.h b/src/frontend_common/content_manager.h index 92276700b..0b0fee73e 100644 --- a/src/frontend_common/content_manager.h +++ b/src/frontend_common/content_manager.h @@ -127,14 +127,14 @@ inline bool RemoveMod(const Service::FileSystem::FileSystemController& fs_contro * \param system Raw pointer to the system instance * \param vfs Raw pointer to the VfsFilesystem instance in Core::System * \param filename Path to the NSP file - * \param callback Optional callback to report the progress of the installation. The first size_t + * \param callback Callback to report the progress of the installation. The first size_t * parameter is the total size of the virtual file and the second is the current progress. If you * return true to the callback, it will cancel the installation as soon as possible. * \return [InstallResult] representing how the installation finished */ -inline InstallResult InstallNSP( - Core::System* system, FileSys::VfsFilesystem* vfs, const std::string& filename, - const std::function& callback = std::function()) { +inline InstallResult InstallNSP(Core::System* system, FileSys::VfsFilesystem* vfs, + const std::string& filename, + const std::function& callback) { const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, std::size_t block_size) { if (src == nullptr || dest == nullptr) { @@ -192,15 +192,15 @@ inline InstallResult InstallNSP( * \param filename Path to the NCA file * \param registered_cache Raw pointer to the registered cache that the NCA will be installed to * \param title_type Type of NCA package to install - * \param callback Optional callback to report the progress of the installation. The first size_t + * \param callback Callback to report the progress of the installation. The first size_t * parameter is the total size of the virtual file and the second is the current progress. If you * return true to the callback, it will cancel the installation as soon as possible. * \return [InstallResult] representing how the installation finished */ -inline InstallResult InstallNCA( - FileSys::VfsFilesystem* vfs, const std::string& filename, - FileSys::RegisteredCache* registered_cache, const FileSys::TitleType title_type, - const std::function& callback = std::function()) { +inline InstallResult InstallNCA(FileSys::VfsFilesystem* vfs, const std::string& filename, + FileSys::RegisteredCache* registered_cache, + const FileSys::TitleType title_type, + const std::function& callback) { const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, std::size_t block_size) { if (src == nullptr || dest == nullptr) { @@ -247,14 +247,14 @@ inline InstallResult InstallNCA( * \brief Verifies the installed contents for a given ManualContentProvider * \param system Raw pointer to the system instance * \param provider Raw pointer to the content provider that's tracking indexed games - * \param callback Optional callback to report the progress of the installation. The first size_t + * \param callback Callback to report the progress of the installation. The first size_t * parameter is the total size of the installed contents and the second is the current progress. If * you return true to the callback, it will cancel the installation as soon as possible. * \return A list of entries that failed to install. Returns an empty vector if successful. */ inline std::vector VerifyInstalledContents( Core::System* system, FileSys::ManualContentProvider* provider, - const std::function& callback = std::function()) { + const std::function& callback) { // Get content registries. auto bis_contents = system->GetFileSystemController().GetSystemNANDContents(); auto user_contents = system->GetFileSystemController().GetUserNANDContents(); @@ -337,14 +337,14 @@ inline std::vector VerifyInstalledContents( * \brief Verifies the contents of a given game * \param system Raw pointer to the system instance * \param game_path Patch to the game file - * \param callback Optional callback to report the progress of the installation. The first size_t + * \param callback Callback to report the progress of the installation. The first size_t * parameter is the total size of the installed contents and the second is the current progress. If * you return true to the callback, it will cancel the installation as soon as possible. * \return GameVerificationResult representing how the verification process finished */ inline GameVerificationResult VerifyGameContents( Core::System* system, const std::string& game_path, - const std::function& callback = std::function()) { + const std::function& callback) { const auto loader = Loader::GetLoader( *system, system->GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read)); if (loader == nullptr) { -- cgit v1.2.3