preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-08-26 07:25:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes for new LLVM on mac (warns on inconsistent usage of override)

Browse Source
This commit is contained in:
Henrik Rydgård
2015-09-17 20:29:37 +02:00
parent a3eb31994b
commit a71fbccfbc
23 changed files with 125 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/ControlMappingScreen.cpp
+4 -4
View File
@@ -356,13 +356,13 @@ class JoystickHistoryView : public UI::InertView {
public:
JoystickHistoryView(int xAxis, int xDevice, int yAxis, int yDevice, UI::LayoutParams *layoutParams = nullptr)
: UI::InertView(layoutParams),
xAxis_(xAxis), xDevice_(xDevice),
yAxis_(yAxis), yDevice_(yDevice),
xAxis_(xAxis), xDevice_(xDevice),
yAxis_(yAxis), yDevice_(yDevice),
curX_(0.0f), curY_(0.0f),
maxCount_(500) {}
void Draw(UIContext &dc) override;
void Update(const InputState &input_state) override;
void Axis(const AxisInput &input) {
void Axis(const AxisInput &input) override{
if (input.axisId == xAxis_) {
curX_ = input.value;
} else if (input.axisId == yAxis_) {
@@ -379,8 +379,8 @@ private:
};
int xAxis_;
int yAxis_;
int xDevice_;
int yAxis_;
int yDevice_;
float curX_;