summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2014-10-26 05:56:13 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2014-10-26 19:18:05 +0100
commitd72708c1f58225f50c5ddecbd6f51580a2d9690b (patch)
tree10348ea70bd20a867daeff8433c004c38262e120 /src/citra
parentFix compile errors in Clang (diff)
downloadyuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.gz
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.bz2
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.lz
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.xz
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.zst
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.zip
Diffstat (limited to '')
-rw-r--r--src/citra/emu_window/emu_window_glfw.h8
-rw-r--r--src/citra_qt/bootmanager.cpp4
-rw-r--r--src/citra_qt/bootmanager.hxx16
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.hxx2
-rw-r--r--src/citra_qt/main.hxx2
5 files changed, 16 insertions, 16 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 638e026ef..7c3072145 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -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);
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 0430aa1ed..8f3799351 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -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());
}
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index 816ffed2e..f8afc403e 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -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;
diff --git a/src/citra_qt/debugger/graphics_cmdlists.hxx b/src/citra_qt/debugger/graphics_cmdlists.hxx
index 479ef0326..1523e724f 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.hxx
+++ b/src/citra_qt/debugger/graphics_cmdlists.hxx
@@ -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;
diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.hxx
index a0b41f5f4..b1b40df46 100644
--- a/src/citra_qt/main.hxx
+++ b/src/citra_qt/main.hxx
@@ -32,7 +32,7 @@ public:
private:
void BootGame(std::string filename);
- void closeEvent(QCloseEvent* event);
+ void closeEvent(QCloseEvent* event) override;
private slots:
void OnStartGame();