loader/xci: Remove unnecessary includes and member variables

Many of these aren't necessary and will cause this file to be required
to be recompiled whenever any changes to those files are made, which
lengthens compile times for no reason.

This also removes an unused metadata variable from AppLoader_XCI
merge-requests/60/head
Lioncash 2018-08-14 22:27:01 +07:00
parent d1520410a3
commit c8e3f98c27
2 changed files with 11 additions and 15 deletions

@ -4,22 +4,14 @@
#include <vector> #include <vector>
#include "common/file_util.h" #include "common/common_types.h"
#include "common/logging/log.h" #include "core/file_sys/card_image.h"
#include "common/string_util.h"
#include "common/swap.h"
#include "core/core.h"
#include "core/file_sys/content_archive.h" #include "core/file_sys/content_archive.h"
#include "core/file_sys/control_metadata.h" #include "core/file_sys/control_metadata.h"
#include "core/file_sys/program_metadata.h"
#include "core/file_sys/romfs.h" #include "core/file_sys/romfs.h"
#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/hle/kernel/resource_limit.h" #include "core/loader/nca.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/loader/nso.h"
#include "core/loader/xci.h" #include "core/loader/xci.h"
#include "core/memory.h"
namespace Loader { namespace Loader {

@ -6,12 +6,18 @@
#include <memory> #include <memory>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/card_image.h" #include "core/file_sys/vfs.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "core/loader/nca.h"
namespace FileSys {
class NACP;
class XCI;
} // namespace FileSys
namespace Loader { namespace Loader {
class AppLoader_NCA;
/// Loads an XCI file /// Loads an XCI file
class AppLoader_XCI final : public AppLoader { class AppLoader_XCI final : public AppLoader {
public: public:
@ -37,8 +43,6 @@ public:
ResultStatus ReadTitle(std::string& title) override; ResultStatus ReadTitle(std::string& title) override;
private: private:
FileSys::ProgramMetadata metadata;
std::unique_ptr<FileSys::XCI> xci; std::unique_ptr<FileSys::XCI> xci;
std::unique_ptr<AppLoader_NCA> nca_loader; std::unique_ptr<AppLoader_NCA> nca_loader;