Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #153 from yuriks/add-override

Browse source 
Add override keyword where appropriate
This commit is contained in:
bunnei 2014-10-27 21:23:16 -04:00
commit 19d91a45f5
24 changed files with 87 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/citra/emu_window/emu_window_glfw.h
View file

@ -14,16 +14,16 @@ public:
~EmuWindow_GLFW();
/// Swap buffers to display the next frame
void SwapBuffers();
void SwapBuffers() override;
/// Polls window events
void PollEvents();
void PollEvents() override;
/// 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
void DoneCurrent();
void DoneCurrent() override;
static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods);

4
src/citra_qt/bootmanager.cpp
View file

@ -90,10 +90,10 @@ public:
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_->SetClientAreaHeight(size().height());
}

16
src/citra_qt/bootmanager.hxx
View file

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

2
src/citra_qt/debugger/graphics_cmdlists.hxx
View file

@ -17,7 +17,7 @@ class GPUCommandListModel : public QAbstractListModel
public:
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;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

2
src/citra_qt/main.hxx
View file

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

2
src/common/console_listener.h
View file

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

4
src/common/log_manager.h
View file

@ -30,7 +30,7 @@ class FileLogListener : public LogListener
public:
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 IsEnabled() const { return m_enable; }
@ -47,7 +47,7 @@ private:
class DebuggerLogListener : public LogListener
{
public:
void Log(LogTypes::LOG_LEVELS, const char *msg);
void Log(LogTypes::LOG_LEVELS, const char *msg) override;
};
class LogContainer

1
src/common/swap.h
View file

@ -85,7 +85,6 @@ public:
return *this;
}
operator long() const { return (long)swap(); }
operator s8() const { return (s8)swap(); }
operator u8() const { return (u8)swap(); }
operator s16() const { return (s16)swap(); }

14
src/core/arm/dyncom/arm_dyncom.h
View file

@ -21,7 +21,7 @@ public:
* Set the Program Counter to an address
* @param addr Address to set PC to
*/
void SetPC(u32 pc);
void SetPC(u32 pc) override;
/*
* Get the current Program Counter
@ -41,7 +41,7 @@ public:
* @param index Register index (0-15)
* @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
@ -53,7 +53,7 @@ public:
* Set the current CPSR register
* @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
@ -65,22 +65,22 @@ public:
* Saves the current CPU context
* @param ctx Thread context to save
*/
void SaveContext(ThreadContext& ctx);
void SaveContext(ThreadContext& ctx) override;
/**
* Loads a CPU context
* @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)
void PrepareReschedule();
void PrepareReschedule() override;
/**
* Executes the given number of instructions
* @param num_instructions Number of instructions to executes
*/
void ExecuteInstructions(int num_instructions);
void ExecuteInstructions(int num_instructions) override;
private:

22
src/core/arm/interpreter/arm_interpreter.h
View file

@ -20,60 +20,60 @@ public:
* Set the Program Counter to an address
* @param addr Address to set PC to
*/
void SetPC(u32 pc);
void SetPC(u32 pc) override;
/*
* Get the current Program Counter
* @return Returns current PC
*/
u32 GetPC() const;
u32 GetPC() const override;
/**
* Get an ARM register
* @param index Register index (0-15)
* @return Returns the value in the register
*/
u32 GetReg(int index) const;
u32 GetReg(int index) const override;
/**
* Set an ARM register
* @param index Register index (0-15)
* @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
* @return Returns the value of the CPSR register
*/
u32 GetCPSR() const;
u32 GetCPSR() const override;
/**
* Set the current CPSR register
* @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
* @return Returns number of clock ticks
*/
u64 GetTicks() const;
u64 GetTicks() const override;
/**
* Saves the current CPU context
* @param ctx Thread context to save
*/
void SaveContext(ThreadContext& ctx);
void SaveContext(ThreadContext& ctx) override;
/**
* Loads a CPU context
* @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)
void PrepareReschedule();
void PrepareReschedule() override;
protected:
@ -81,7 +81,7 @@ protected:
* Executes the given number of instructions
* @param num_instructions Number of instructions to executes
*/
void ExecuteInstructions(int num_instructions);
void ExecuteInstructions(int num_instructions) override;
private:

8
src/core/hle/kernel/address_arbiter.cpp
View file

@ -17,11 +17,11 @@ namespace Kernel {
class AddressArbiter : public Object {
public:
std::string GetTypeName() const { return "Arbiter"; }
std::string GetName() const { return name; }
std::string GetTypeName() const override { return "Arbiter"; }
std::string GetName() const override { return name; }
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)
@ -30,7 +30,7 @@ public:
* @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
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0;

30
src/core/hle/kernel/archive.cpp
View file

@ -42,11 +42,11 @@ enum class DirectoryCommand : u32 {
class Archive : public Object {
public:
std::string GetTypeName() const { return "Archive"; }
std::string GetName() const { return name; }
std::string GetTypeName() const override { return "Archive"; }
std::string GetName() const override { return name; }
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)
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
* @return Result of operation, 0 on success, otherwise error code
*/
Result SyncRequest(bool* wait) {
Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer();
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
* @return Result of operation, 0 on success, otherwise error code
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0;
@ -128,11 +128,11 @@ public:
class File : public Object {
public:
std::string GetTypeName() const { return "File"; }
std::string GetName() const { return path; }
std::string GetTypeName() const override { return "File"; }
std::string GetName() const override { return path; }
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::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
* @return Result of operation, 0 on success, otherwise error code
*/
Result SyncRequest(bool* wait) {
Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer();
FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
switch (cmd) {
@ -211,7 +211,7 @@ public:
* @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
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0;
@ -220,11 +220,11 @@ public:
class Directory : public Object {
public:
std::string GetTypeName() const { return "Directory"; }
std::string GetName() const { return path; }
std::string GetTypeName() const override { return "Directory"; }
std::string GetName() const override { return path; }
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::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
* @return Result of operation, 0 on success, otherwise error code
*/
Result SyncRequest(bool* wait) {
Result SyncRequest(bool* wait) override {
u32* cmd_buff = Service::GetCommandBuffer();
DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
switch (cmd) {
@ -274,7 +274,7 @@ public:
* @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
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0;

8
src/core/hle/kernel/event.cpp
View file

@ -16,11 +16,11 @@ namespace Kernel {
class Event : public Object {
public:
std::string GetTypeName() const { return "Event"; }
std::string GetName() const { return name; }
std::string GetTypeName() const override { return "Event"; }
std::string GetName() const override { return name; }
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 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
* @return Result of operation, 0 on success, otherwise error code
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
*wait = locked;
if (locked) {
Handle thread = GetCurrentThreadHandle();

10
src/core/hle/kernel/mutex.cpp
View file

@ -15,11 +15,11 @@ namespace Kernel {
class Mutex : public Object {
public:
std::string GetTypeName() const { return "Mutex"; }
std::string GetName() const { return name; }
std::string GetTypeName() const override { return "Mutex"; }
std::string GetName() const override { return name; }
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 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
* @return Result of operation, 0 on success, otherwise error code
*/
Result SyncRequest(bool* wait) {
Result SyncRequest(bool* wait) override {
// TODO(bunnei): ImplementMe
locked = true;
return 0;
@ -43,7 +43,7 @@ public:
* @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
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
*wait = locked;

6
src/core/hle/kernel/shared_memory.cpp
View file

@ -11,17 +11,17 @@ namespace Kernel {
class SharedMemory : public Object {
public:
std::string GetTypeName() const { return "SharedMemory"; }
std::string GetTypeName() const override { return "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
* @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
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
return 0;

8
src/core/hle/kernel/thread.cpp
View file

@ -21,11 +21,11 @@ namespace Kernel {
class Thread : public Kernel::Object {
public:
std::string GetName() const { return name; }
std::string GetTypeName() const { return "Thread"; }
std::string GetName() const override { return name; }
std::string GetTypeName() const override { return "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 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
* @return Result of operation, 0 on success, otherwise error code
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
if (status != THREADSTATUS_DORMANT) {
Handle thread = GetCurrentThreadHandle();
if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) {

2
src/core/hle/service/apt.h
View file

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

2
src/core/hle/service/fs.h
View file

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

2
src/core/hle/service/gsp.h
View file

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

2
src/core/hle/service/hid.h
View file

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

2
src/core/hle/service/ndm.h
View file

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

10
src/core/hle/service/service.h
View file

@ -39,11 +39,11 @@ class Interface : public Kernel::Object {
friend class Manager;
public:
std::string GetName() const { return GetPortName(); }
std::string GetTypeName() const { return GetPortName(); }
std::string GetName() const override { return GetPortName(); }
std::string GetTypeName() const override { return GetPortName(); }
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*);
@ -80,7 +80,7 @@ public:
* @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
*/
Result SyncRequest(bool* wait) {
Result SyncRequest(bool* wait) override {
u32* cmd_buff = GetCommandBuffer();
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
* @return Result of operation, 0 on success, otherwise error code
*/
Result WaitSynchronization(bool* wait) {
Result WaitSynchronization(bool* wait) override {
// TODO(bunnei): ImplementMe
ERROR_LOG(OSHLE, "unimplemented function");
return 0;

2
src/core/hle/service/srv.h
View file

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

8
src/video_core/renderer_opengl/renderer_opengl.h
View file

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