aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-14 22:27:01 -0400
committerLioncash <mathew1800@gmail.com>2018-08-15 01:41:35 -0400
commitc8e3f98c27b15055d033ab75c75c8b3e0455a40e (patch)
treea6709c16e5d97822be7001b03ba5c18582877b32 /src
parentd1520410a3cf38a14cd3f3b1dc3fcc5ae38c6b0b (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/core/loader/xci.cpp14
-rw-r--r--src/core/loader/xci.h12
2 files changed, 11 insertions, 15 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp
index 5d67fb1862..4c49795454 100644
--- a/src/core/loader/xci.cpp
+++ b/src/core/loader/xci.cpp
@@ -4,22 +4,14 @@
#include <vector>
-#include "common/file_util.h"
-#include "common/logging/log.h"
-#include "common/string_util.h"
-#include "common/swap.h"
-#include "core/core.h"
+#include "common/common_types.h"
+#include "core/file_sys/card_image.h"
#include "core/file_sys/content_archive.h"
#include "core/file_sys/control_metadata.h"
-#include "core/file_sys/program_metadata.h"
#include "core/file_sys/romfs.h"
-#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/process.h"
-#include "core/hle/kernel/resource_limit.h"
-#include "core/hle/service/filesystem/filesystem.h"
-#include "core/loader/nso.h"
+#include "core/loader/nca.h"
#include "core/loader/xci.h"
-#include "core/memory.h"
namespace Loader {
diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h
index 973833050e..cc4287e178 100644
--- a/src/core/loader/xci.h
+++ b/src/core/loader/xci.h
@@ -6,12 +6,18 @@
#include <memory>
#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/nca.h"
+
+namespace FileSys {
+class NACP;
+class XCI;
+} // namespace FileSys
namespace Loader {
+class AppLoader_NCA;
+
/// Loads an XCI file
class AppLoader_XCI final : public AppLoader {
public:
@@ -37,8 +43,6 @@ public:
ResultStatus ReadTitle(std::string& title) override;
private:
- FileSys::ProgramMetadata metadata;
-
std::unique_ptr<FileSys::XCI> xci;
std::unique_ptr<AppLoader_NCA> nca_loader;