Add override keyword through the code.

This was automated using `clang-modernize`.
This commit is contained in:
Yuri Kunde Schlesner 2014-10-26 02:56:13 -02:00
parent da564d3fe0
commit d72708c1f5
23 changed files with 87 additions and 87 deletions

View File

@ -14,16 +14,16 @@ public:
~EmuWindow_GLFW(); ~EmuWindow_GLFW();
/// Swap buffers to display the next frame /// Swap buffers to display the next frame
void SwapBuffers(); void SwapBuffers() override;
/// Polls window events /// Polls window events
void PollEvents(); void PollEvents() override;
/// Makes the graphics context current for the caller thread /// Makes the graphics context current for the caller thread
void MakeCurrent(); void MakeCurrent() override;
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
void DoneCurrent(); void DoneCurrent() override;
static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods); static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods);

View File

@ -90,10 +90,10 @@ public:
parent_ = parent; parent_ = parent;
} }
void paintEvent(QPaintEvent* ev) void paintEvent(QPaintEvent* ev) override
{ {
} }
void resizeEvent(QResizeEvent* ev) { void resizeEvent(QResizeEvent* ev) override {
parent_->SetClientAreaWidth(size().width()); parent_->SetClientAreaWidth(size().width());
parent_->SetClientAreaHeight(size().height()); parent_->SetClientAreaHeight(size().height());
} }

View File

@ -25,7 +25,7 @@ public:
* *
* @warning Only call when not running! * @warning Only call when not running!
*/ */
void run(); void run() override;
/** /**
* Allow the CPU to process a single instruction (if cpu is not running) * Allow the CPU to process a single instruction (if cpu is not running)
@ -89,13 +89,13 @@ public:
GRenderWindow(QWidget* parent = NULL); GRenderWindow(QWidget* parent = NULL);
~GRenderWindow(); ~GRenderWindow();
void closeEvent(QCloseEvent*); void closeEvent(QCloseEvent*) override;
// EmuWindow implementation // EmuWindow implementation
void SwapBuffers(); void SwapBuffers() override;
void MakeCurrent(); void MakeCurrent() override;
void DoneCurrent(); void DoneCurrent() override;
void PollEvents(); void PollEvents() override;
void BackupGeometry(); void BackupGeometry();
void RestoreGeometry(); void RestoreGeometry();
@ -104,8 +104,8 @@ public:
EmuThread& GetEmuThread(); EmuThread& GetEmuThread();
void keyPressEvent(QKeyEvent* event); void keyPressEvent(QKeyEvent* event) override;
void keyReleaseEvent(QKeyEvent* event); void keyReleaseEvent(QKeyEvent* event) override;
void ReloadSetKeymaps() override; void ReloadSetKeymaps() override;

View File

@ -17,7 +17,7 @@ class GPUCommandListModel : public QAbstractListModel
public: public:
GPUCommandListModel(QObject* parent); GPUCommandListModel(QObject* parent);
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

View File

@ -32,7 +32,7 @@ public:
private: private:
void BootGame(std::string filename); void BootGame(std::string filename);
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event) override;
private slots: private slots:
void OnStartGame(); void OnStartGame();

View File

@ -26,7 +26,7 @@ public:
#ifdef _WIN32 #ifdef _WIN32
COORD GetCoordinates(int BytesRead, int BufferWidth); COORD GetCoordinates(int BytesRead, int BufferWidth);
#endif #endif
void Log(LogTypes::LOG_LEVELS, const char *Text); void Log(LogTypes::LOG_LEVELS, const char *Text) override;
void ClearScreen(bool Cursor = true); void ClearScreen(bool Cursor = true);
private: private:

View File

@ -30,7 +30,7 @@ class FileLogListener : public LogListener
public: public:
FileLogListener(const char *filename); FileLogListener(const char *filename);
void Log(LogTypes::LOG_LEVELS, const char *msg); void Log(LogTypes::LOG_LEVELS, const char *msg) override;
bool IsValid() { return !m_logfile.fail(); } bool IsValid() { return !m_logfile.fail(); }
bool IsEnabled() const { return m_enable; } bool IsEnabled() const { return m_enable; }
@ -47,7 +47,7 @@ private:
class DebuggerLogListener : public LogListener class DebuggerLogListener : public LogListener
{ {
public: public:
void Log(LogTypes::LOG_LEVELS, const char *msg); void Log(LogTypes::LOG_LEVELS, const char *msg) override;
}; };
class LogContainer class LogContainer

View File

@ -21,7 +21,7 @@ public:
* Set the Program Counter to an address * Set the Program Counter to an address
* @param addr Address to set PC to * @param addr Address to set PC to
*/ */
void SetPC(u32 pc); void SetPC(u32 pc) override;
/* /*
* Get the current Program Counter * Get the current Program Counter
@ -41,7 +41,7 @@ public:
* @param index Register index (0-15) * @param index Register index (0-15)
* @param value Value to set register to * @param value Value to set register to
*/ */
void SetReg(int index, u32 value); void SetReg(int index, u32 value) override;
/** /**
* Get the current CPSR register * Get the current CPSR register
@ -53,7 +53,7 @@ public:
* Set the current CPSR register * Set the current CPSR register
* @param cpsr Value to set CPSR to * @param cpsr Value to set CPSR to
*/ */
void SetCPSR(u32 cpsr); void SetCPSR(u32 cpsr) override;
/** /**
* Returns the number of clock ticks since the last reset * Returns the number of clock ticks since the last reset
@ -65,22 +65,22 @@ public:
* Saves the current CPU context * Saves the current CPU context
* @param ctx Thread context to save * @param ctx Thread context to save
*/ */
void SaveContext(ThreadContext& ctx); void SaveContext(ThreadContext& ctx) override;
/** /**
* Loads a CPU context * Loads a CPU context
* @param ctx Thread context to load * @param ctx Thread context to load
*/ */
void LoadContext(const ThreadContext& ctx); void LoadContext(const ThreadContext& ctx) override;
/// Prepare core for thread reschedule (if needed to correctly handle state) /// Prepare core for thread reschedule (if needed to correctly handle state)
void PrepareReschedule(); void PrepareReschedule() override;
/** /**
* Executes the given number of instructions * Executes the given number of instructions
* @param num_instructions Number of instructions to executes * @param num_instructions Number of instructions to executes
*/ */
void ExecuteInstructions(int num_instructions); void ExecuteInstructions(int num_instructions) override;
private: private:

View File

@ -20,60 +20,60 @@ public:
* Set the Program Counter to an address * Set the Program Counter to an address
* @param addr Address to set PC to * @param addr Address to set PC to
*/ */
void SetPC(u32 pc); void SetPC(u32 pc) override;
/* /*
* Get the current Program Counter * Get the current Program Counter
* @return Returns current PC * @return Returns current PC
*/ */
u32 GetPC() const; u32 GetPC() const override;
/** /**
* Get an ARM register * Get an ARM register
* @param index Register index (0-15) * @param index Register index (0-15)
* @return Returns the value in the register * @return Returns the value in the register
*/ */
u32 GetReg(int index) const; u32 GetReg(int index) const override;
/** /**
* Set an ARM register * Set an ARM register
* @param index Register index (0-15) * @param index Register index (0-15)
* @param value Value to set register to * @param value Value to set register to
*/ */
void SetReg(int index, u32 value); void SetReg(int index, u32 value) override;
/** /**
* Get the current CPSR register * Get the current CPSR register
* @return Returns the value of the CPSR register * @return Returns the value of the CPSR register
*/ */
u32 GetCPSR() const; u32 GetCPSR() const override;
/** /**
* Set the current CPSR register * Set the current CPSR register
* @param cpsr Value to set CPSR to * @param cpsr Value to set CPSR to
*/ */
void SetCPSR(u32 cpsr); void SetCPSR(u32 cpsr) override;
/** /**
* Returns the number of clock ticks since the last reset * Returns the number of clock ticks since the last reset
* @return Returns number of clock ticks * @return Returns number of clock ticks
*/ */
u64 GetTicks() const; u64 GetTicks() const override;
/** /**
* Saves the current CPU context * Saves the current CPU context
* @param ctx Thread context to save * @param ctx Thread context to save
*/ */
void SaveContext(ThreadContext& ctx); void SaveContext(ThreadContext& ctx) override;
/** /**
* Loads a CPU context * Loads a CPU context
* @param ctx Thread context to load * @param ctx Thread context to load
*/ */
void LoadContext(const ThreadContext& ctx); void LoadContext(const ThreadContext& ctx) override;
/// Prepare core for thread reschedule (if needed to correctly handle state) /// Prepare core for thread reschedule (if needed to correctly handle state)
void PrepareReschedule(); void PrepareReschedule() override;
protected: protected:
@ -81,7 +81,7 @@ protected:
* Executes the given number of instructions * Executes the given number of instructions
* @param num_instructions Number of instructions to executes * @param num_instructions Number of instructions to executes
*/ */
void ExecuteInstructions(int num_instructions); void ExecuteInstructions(int num_instructions) override;
private: private:

View File

@ -17,11 +17,11 @@ namespace Kernel {
class AddressArbiter : public Object { class AddressArbiter : public Object {
public: public:
std::string GetTypeName() const { return "Arbiter"; } std::string GetTypeName() const override { return "Arbiter"; }
std::string GetName() const { return name; } std::string GetName() const override { return name; }
static Kernel::HandleType GetStaticHandleType() { return HandleType::AddressArbiter; } static Kernel::HandleType GetStaticHandleType() { return HandleType::AddressArbiter; }
Kernel::HandleType GetHandleType() const { return HandleType::AddressArbiter; } Kernel::HandleType GetHandleType() const override { return HandleType::AddressArbiter; }
std::string name; ///< Name of address arbiter object (optional) std::string name; ///< Name of address arbiter object (optional)
@ -30,7 +30,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0; return 0;

View File

@ -42,11 +42,11 @@ enum class DirectoryCommand : u32 {
class Archive : public Object { class Archive : public Object {
public: public:
std::string GetTypeName() const { return "Archive"; } std::string GetTypeName() const override { return "Archive"; }
std::string GetName() const { return name; } std::string GetName() const override { return name; }
static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; }
Kernel::HandleType GetHandleType() const { return HandleType::Archive; } Kernel::HandleType GetHandleType() const override { return HandleType::Archive; }
std::string name; ///< Name of archive (optional) std::string name; ///< Name of archive (optional)
FileSys::Archive* backend; ///< Archive backend interface FileSys::Archive* backend; ///< Archive backend interface
@ -56,7 +56,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer(); u32* cmd_buff = Service::GetCommandBuffer();
FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
@ -119,7 +119,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0; return 0;
@ -128,11 +128,11 @@ public:
class File : public Object { class File : public Object {
public: public:
std::string GetTypeName() const { return "File"; } std::string GetTypeName() const override { return "File"; }
std::string GetName() const { return path; } std::string GetName() const override { return path; }
static Kernel::HandleType GetStaticHandleType() { return HandleType::File; } static Kernel::HandleType GetStaticHandleType() { return HandleType::File; }
Kernel::HandleType GetHandleType() const { return HandleType::File; } Kernel::HandleType GetHandleType() const override { return HandleType::File; }
std::string path; ///< Path of the file std::string path; ///< Path of the file
std::unique_ptr<FileSys::File> backend; ///< File backend interface std::unique_ptr<FileSys::File> backend; ///< File backend interface
@ -142,7 +142,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer(); u32* cmd_buff = Service::GetCommandBuffer();
FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
switch (cmd) { switch (cmd) {
@ -211,7 +211,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0; return 0;
@ -220,11 +220,11 @@ public:
class Directory : public Object { class Directory : public Object {
public: public:
std::string GetTypeName() const { return "Directory"; } std::string GetTypeName() const override { return "Directory"; }
std::string GetName() const { return path; } std::string GetName() const override { return path; }
static Kernel::HandleType GetStaticHandleType() { return HandleType::Directory; } static Kernel::HandleType GetStaticHandleType() { return HandleType::Directory; }
Kernel::HandleType GetHandleType() const { return HandleType::Directory; } Kernel::HandleType GetHandleType() const override { return HandleType::Directory; }
std::string path; ///< Path of the directory std::string path; ///< Path of the directory
std::unique_ptr<FileSys::Directory> backend; ///< File backend interface std::unique_ptr<FileSys::Directory> backend; ///< File backend interface
@ -234,7 +234,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer(); u32* cmd_buff = Service::GetCommandBuffer();
DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]); DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
switch (cmd) { switch (cmd) {
@ -274,7 +274,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0; return 0;

View File

@ -16,11 +16,11 @@ namespace Kernel {
class Event : public Object { class Event : public Object {
public: public:
std::string GetTypeName() const { return "Event"; } std::string GetTypeName() const override { return "Event"; }
std::string GetName() const { return name; } std::string GetName() const override { return name; }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Event; }
ResetType intitial_reset_type; ///< ResetType specified at Event initialization ResetType intitial_reset_type; ///< ResetType specified at Event initialization
ResetType reset_type; ///< Current ResetType ResetType reset_type; ///< Current ResetType
@ -35,7 +35,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
*wait = locked; *wait = locked;
if (locked) { if (locked) {
Handle thread = GetCurrentThreadHandle(); Handle thread = GetCurrentThreadHandle();

View File

@ -15,11 +15,11 @@ namespace Kernel {
class Mutex : public Object { class Mutex : public Object {
public: public:
std::string GetTypeName() const { return "Mutex"; } std::string GetTypeName() const override { return "Mutex"; }
std::string GetName() const { return name; } std::string GetName() const override { return name; }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Mutex; }
bool initial_locked; ///< Initial lock state when mutex was created bool initial_locked; ///< Initial lock state when mutex was created
bool locked; ///< Current locked state bool locked; ///< Current locked state
@ -32,7 +32,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
locked = true; locked = true;
return 0; return 0;
@ -43,7 +43,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
*wait = locked; *wait = locked;

View File

@ -11,17 +11,17 @@ namespace Kernel {
class SharedMemory : public Object { class SharedMemory : public Object {
public: public:
std::string GetTypeName() const { return "SharedMemory"; } std::string GetTypeName() const override { return "SharedMemory"; }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::SharedMemory; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::SharedMemory; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::SharedMemory; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::SharedMemory; }
/** /**
* Wait for kernel object to synchronize * Wait for kernel object to synchronize
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0; return 0;

View File

@ -21,11 +21,11 @@ namespace Kernel {
class Thread : public Kernel::Object { class Thread : public Kernel::Object {
public: public:
std::string GetName() const { return name; } std::string GetName() const override { return name; }
std::string GetTypeName() const { return "Thread"; } std::string GetTypeName() const override { return "Thread"; }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Thread; }
inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; } inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; }
inline bool IsStopped() const { return (status & THREADSTATUS_DORMANT) != 0; } inline bool IsStopped() const { return (status & THREADSTATUS_DORMANT) != 0; }
@ -38,7 +38,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
if (status != THREADSTATUS_DORMANT) { if (status != THREADSTATUS_DORMANT) {
Handle thread = GetCurrentThreadHandle(); Handle thread = GetCurrentThreadHandle();
if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) { if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) {

View File

@ -29,7 +29,7 @@ public:
* Gets the string port name used by CTROS for the service * Gets the string port name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "APT:U"; return "APT:U";
} }
}; };

View File

@ -23,7 +23,7 @@ public:
* Gets the string port name used by CTROS for the service * Gets the string port name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "fs:USER"; return "fs:USER";
} }
}; };

View File

@ -167,7 +167,7 @@ public:
* Gets the string port name used by CTROS for the service * Gets the string port name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "gsp::Gpu"; return "gsp::Gpu";
} }

View File

@ -111,7 +111,7 @@ public:
* Gets the string port name used by CTROS for the service * Gets the string port name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "hid:USER"; return "hid:USER";
} }

View File

@ -24,7 +24,7 @@ public:
* Gets the string port name used by CTROS for the service * Gets the string port name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "ndm:u"; return "ndm:u";
} }

View File

@ -39,11 +39,11 @@ class Interface : public Kernel::Object {
friend class Manager; friend class Manager;
public: public:
std::string GetName() const { return GetPortName(); } std::string GetName() const override { return GetPortName(); }
std::string GetTypeName() const { return GetPortName(); } std::string GetTypeName() const override { return GetPortName(); }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Service; }
typedef void (*Function)(Interface*); typedef void (*Function)(Interface*);
@ -80,7 +80,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) override {
u32* cmd_buff = GetCommandBuffer(); u32* cmd_buff = GetCommandBuffer();
auto itr = m_functions.find(cmd_buff[0]); auto itr = m_functions.find(cmd_buff[0]);
@ -113,7 +113,7 @@ public:
* @param wait Boolean wait set if current thread should wait as a result of sync operation * @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "unimplemented function"); ERROR_LOG(OSHLE, "unimplemented function");
return 0; return 0;

View File

@ -22,7 +22,7 @@ public:
* Gets the string name used by CTROS for the service * Gets the string name used by CTROS for the service
* @return Port name of service * @return Port name of service
*/ */
std::string GetPortName() const { std::string GetPortName() const override {
return "srv:"; return "srv:";
} }

View File

@ -21,19 +21,19 @@ public:
~RendererOpenGL() override; ~RendererOpenGL() override;
/// Swap buffers (render frame) /// Swap buffers (render frame)
void SwapBuffers(); void SwapBuffers() override;
/** /**
* Set the emulator window to use for renderer * Set the emulator window to use for renderer
* @param window EmuWindow handle to emulator window to use for rendering * @param window EmuWindow handle to emulator window to use for rendering
*/ */
void SetWindow(EmuWindow* window); void SetWindow(EmuWindow* window) override;
/// Initialize the renderer /// Initialize the renderer
void Init(); void Init() override;
/// Shutdown the renderer /// Shutdown the renderer
void ShutDown(); void ShutDown() override;
private: private:
/// Structure used for storing information about the textures for each 3DS screen /// Structure used for storing information about the textures for each 3DS screen