Browse Source

Marked AppLoader_ELF, AppLoader_NCCH, and Archive_RomFS virtual functions as "override".

pull/15/merge
bunnei 12 years ago
parent
commit
1099d83455
  1. 8
      src/core/file_sys/archive_romfs.h
  2. 4
      src/core/loader/elf.h
  3. 14
      src/core/loader/ncch.h

8
src/core/file_sys/archive_romfs.h

@ -20,13 +20,13 @@ namespace FileSys {
class Archive_RomFS final : public Archive { class Archive_RomFS final : public Archive {
public: public:
Archive_RomFS(const Loader::AppLoader& app_loader); Archive_RomFS(const Loader::AppLoader& app_loader);
~Archive_RomFS();
~Archive_RomFS() override;
/** /**
* Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.)
* @return IdCode of the archive * @return IdCode of the archive
*/ */
IdCode GetIdCode() const { return IdCode::RomFS; };
IdCode GetIdCode() const override { return IdCode::RomFS; };
/** /**
* Read data from the archive * Read data from the archive
@ -35,13 +35,13 @@ public:
* @param buffer Buffer to read data into * @param buffer Buffer to read data into
* @return Number of bytes read * @return Number of bytes read
*/ */
size_t Read(const u64 offset, const u32 length, u8* buffer) const;
size_t Read(const u64 offset, const u32 length, u8* buffer) const override;
/** /**
* Get the size of the archive in bytes * Get the size of the archive in bytes
* @return Size of the archive in bytes * @return Size of the archive in bytes
*/ */
size_t GetSize() const;
size_t GetSize() const override;
private: private:
std::vector<u8> raw_data; std::vector<u8> raw_data;

4
src/core/loader/elf.h

@ -16,13 +16,13 @@ namespace Loader {
class AppLoader_ELF final : public AppLoader { class AppLoader_ELF final : public AppLoader {
public: public:
AppLoader_ELF(const std::string& filename); AppLoader_ELF(const std::string& filename);
~AppLoader_ELF();
~AppLoader_ELF() override;
/** /**
* Load the bootable file * Load the bootable file
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus Load();
ResultStatus Load() override;
private: private:
std::string filename; std::string filename;

14
src/core/loader/ncch.h

@ -148,48 +148,48 @@ namespace Loader {
class AppLoader_NCCH final : public AppLoader { class AppLoader_NCCH final : public AppLoader {
public: public:
AppLoader_NCCH(const std::string& filename); AppLoader_NCCH(const std::string& filename);
~AppLoader_NCCH();
~AppLoader_NCCH() override;
/** /**
* Load the application * Load the application
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus Load();
ResultStatus Load() override;
/** /**
* Get the code (typically .code section) of the application * Get the code (typically .code section) of the application
* @param buffer Reference to buffer to store data * @param buffer Reference to buffer to store data
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus ReadCode(std::vector<u8>& buffer) const;
ResultStatus ReadCode(std::vector<u8>& buffer) const override;
/** /**
* Get the icon (typically icon section) of the application * Get the icon (typically icon section) of the application
* @param buffer Reference to buffer to store data * @param buffer Reference to buffer to store data
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus ReadIcon(std::vector<u8>& buffer) const;
ResultStatus ReadIcon(std::vector<u8>& buffer) const override;
/** /**
* Get the banner (typically banner section) of the application * Get the banner (typically banner section) of the application
* @param buffer Reference to buffer to store data * @param buffer Reference to buffer to store data
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus ReadBanner(std::vector<u8>& buffer) const;
ResultStatus ReadBanner(std::vector<u8>& buffer) const override;
/** /**
* Get the logo (typically logo section) of the application * Get the logo (typically logo section) of the application
* @param buffer Reference to buffer to store data * @param buffer Reference to buffer to store data
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus ReadLogo(std::vector<u8>& buffer) const;
ResultStatus ReadLogo(std::vector<u8>& buffer) const override;
/** /**
* Get the RomFS of the application * Get the RomFS of the application
* @param buffer Reference to buffer to store data * @param buffer Reference to buffer to store data
* @return ResultStatus result of function * @return ResultStatus result of function
*/ */
ResultStatus ReadRomFS(std::vector<u8>& buffer) const;
ResultStatus ReadRomFS(std::vector<u8>& buffer) const override;
private: private:

Loading…
Cancel
Save