archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some warnings

Browse source
This commit is contained in:
Megamouse 2019-01-02 16:12:01 +01:00
parent daee2a27a3
commit bb464b0b64
12 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/Io/MouseHandler.h
View file

@ -63,6 +63,7 @@ struct MouseRawData
MouseRawData() MouseRawData()
: len(0) : len(0)
, data()
{ {
} }
}; };
@ -94,11 +95,8 @@ struct MouseTabletData
MouseTabletData() MouseTabletData()
: len(0) : len(0)
, data()
{ {
for (auto d : data)
{
d = 0;
}
} }
}; };
@ -116,11 +114,13 @@ struct Mouse
MouseRawData m_rawdata; MouseRawData m_rawdata;
Mouse() Mouse()
: m_datalist() : x_pos(0)
, y_pos(0)
, buttons(0)
, m_tablet_datalist()
, m_datalist()
, m_rawdata() , m_rawdata()
{ {
x_pos = 0;
y_pos = 0;
} }
}; };

2
rpcs3/Emu/Io/PadHandler.h
View file

@ -461,7 +461,7 @@ public:
PadHandlerBase(pad_handler type = pad_handler::null); PadHandlerBase(pad_handler type = pad_handler::null);
virtual ~PadHandlerBase() = default; virtual ~PadHandlerBase() = default;
//Sets window to config the controller(optional) //Sets window to config the controller(optional)
virtual void GetNextButtonPress(const std::string& /*padId*/, const std::function<void(u16, std::string, std::string, int[])>& /*callback*/, const std::function<void(std::string)>& /*fail_callback*/, bool /*get_blacklist*/ = false, std::vector<std::string> /*buttons*/ = {}) {}; virtual void GetNextButtonPress(const std::string& /*padId*/, const std::function<void(u16, std::string, std::string, int[])>& /*callback*/, const std::function<void(std::string)>& /*fail_callback*/, bool /*get_blacklist*/ = false, const std::vector<std::string>& /*buttons*/ = {}) {};
virtual void TestVibration(const std::string& /*padId*/, u32 /*largeMotor*/, u32 /*smallMotor*/) {}; virtual void TestVibration(const std::string& /*padId*/, u32 /*largeMotor*/, u32 /*smallMotor*/) {};
//Return list of devices for that handler //Return list of devices for that handler
virtual std::vector<std::string> ListDevices() = 0; virtual std::vector<std::string> ListDevices() = 0;

10
rpcs3/Emu/RSX/Common/texture_cache_utils.h
View file

@ -185,14 +185,14 @@ namespace rsx
inline void next() inline void next()
{ {
idx++; ++idx;
if (idx >= block->size()) if (idx >= block->size())
{ {
idx = UINT32_MAX; idx = UINT32_MAX;
return; return;
} }
array_idx++; ++array_idx;
if (array_idx >= array_size) if (array_idx >= array_size)
{ {
array_idx = 0; array_idx = 0;
@ -298,7 +298,7 @@ namespace rsx
value_type *dest = &((*m_data_it)[m_array_idx++]); value_type *dest = &((*m_data_it)[m_array_idx++]);
new (dest) value_type(std::forward<Args>(args)...); new (dest) value_type(std::forward<Args>(args)...);
m_size++; ++m_size;
return *dest; return *dest;
} }
}; };
@ -790,7 +790,7 @@ namespace rsx
auto blk_end = block->unowned_end(); auto blk_end = block->unowned_end();
if (iterate && unowned_it != blk_end) if (iterate && unowned_it != blk_end)
{ {
unowned_it++; ++unowned_it;
} }
if (unowned_it != blk_end) if (unowned_it != blk_end)
@ -820,7 +820,7 @@ namespace rsx
auto blk_end = block->end(); auto blk_end = block->end();
if (iterate && cur_block_it != blk_end) if (iterate && cur_block_it != blk_end)
{ {
cur_block_it++; ++cur_block_it;
} }
if (cur_block_it != blk_end) if (cur_block_it != blk_end)

2
rpcs3/ds4_pad_handler.cpp
View file

@ -151,7 +151,7 @@ void ds4_pad_handler::init_config(pad_config* cfg, const std::string& name)
cfg->from_default(); cfg->from_default();
} }
void ds4_pad_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, std::vector<std::string> buttons) void ds4_pad_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
{ {
if (get_blacklist) if (get_blacklist)
blacklist.clear(); blacklist.clear();

2
rpcs3/ds4_pad_handler.h
View file

@ -142,7 +142,7 @@ public:
std::vector<std::string> ListDevices() override; std::vector<std::string> ListDevices() override;
bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override; bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override;
void ThreadProc() override; void ThreadProc() override;
void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& buttonCallback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, std::vector<std::string> buttons = {}) override; void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& buttonCallback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override; void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override;
void init_config(pad_config* cfg, const std::string& name) override; void init_config(pad_config* cfg, const std::string& name) override;

2
rpcs3/evdev_joystick_handler.cpp
View file

@ -257,7 +257,7 @@ evdev_joystick_handler::EvdevDevice* evdev_joystick_handler::get_device(const st
return &dev; return &dev;
} }
void evdev_joystick_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, std::vector<std::string> buttons) void evdev_joystick_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
{ {
if (get_blacklist) if (get_blacklist)
blacklist.clear(); blacklist.clear();

2
rpcs3/evdev_joystick_handler.h
View file

@ -338,7 +338,7 @@ public:
bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override; bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override;
void ThreadProc() override; void ThreadProc() override;
void Close(); void Close();
void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, std::vector<std::string> buttons = {}) override; void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override; void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override;
private: private:

2
rpcs3/mm_joystick_handler.cpp
View file

@ -283,7 +283,7 @@ void mm_joystick_handler::ThreadProc()
} }
} }
void mm_joystick_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, std::vector<std::string> buttons) void mm_joystick_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
{ {
if (get_blacklist) if (get_blacklist)
blacklist.clear(); blacklist.clear();

2
rpcs3/mm_joystick_handler.h
View file

@ -108,7 +108,7 @@ public:
std::vector<std::string> ListDevices() override; std::vector<std::string> ListDevices() override;
bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override; bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override;
void ThreadProc() override; void ThreadProc() override;
void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, std::vector<std::string> buttons = {}) override; void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
void init_config(pad_config* cfg, const std::string& name) override; void init_config(pad_config* cfg, const std::string& name) override;
private: private:

18
rpcs3/rpcs3qt/register_editor_dialog.cpp
View file

@ -101,9 +101,9 @@ void register_editor_dialog::updateRegister(const QString& text)
if (first_brk != -1) if (first_brk != -1)
{ {
long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - first_brk - 2).c_str()); long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - first_brk - 2).c_str());
if (reg.find("GPR") == 0) str = fmt::format("%016llx", ppu.gpr[reg_index]); if (reg.compare(0, 3, "GPR") == 0) str = fmt::format("%016llx", ppu.gpr[reg_index]);
if (reg.find("FPR") == 0) str = fmt::format("%016llx", ppu.fpr[reg_index]); if (reg.compare(0, 3, "FPR") == 0) str = fmt::format("%016llx", ppu.fpr[reg_index]);
if (reg.find("VR") == 0) str = fmt::format("%016llx%016llx", ppu.vr[reg_index]._u64[1], ppu.vr[reg_index]._u64[0]); if (reg.compare(0, 2, "VR") == 0) str = fmt::format("%016llx%016llx", ppu.vr[reg_index]._u64[1], ppu.vr[reg_index]._u64[0]);
} }
if (reg == "CR") str = fmt::format("%08x", ppu.cr_pack()); if (reg == "CR") str = fmt::format("%08x", ppu.cr_pack());
if (reg == "LR") str = fmt::format("%016llx", ppu.lr); if (reg == "LR") str = fmt::format("%016llx", ppu.lr);
@ -118,7 +118,7 @@ void register_editor_dialog::updateRegister(const QString& text)
{ {
long reg_index; long reg_index;
reg_index = atol(reg.substr(first_brk + 1, reg.length() - 2).c_str()); reg_index = atol(reg.substr(first_brk + 1, reg.length() - 2).c_str());
if (reg.find("GPR") == 0) str = fmt::format("%016llx%016llx", spu.gpr[reg_index]._u64[1], spu.gpr[reg_index]._u64[0]); if (reg.compare(0, 3, "GPR") == 0) str = fmt::format("%016llx%016llx", spu.gpr[reg_index]._u64[1], spu.gpr[reg_index]._u64[0]);
} }
} }
@ -143,14 +143,14 @@ void register_editor_dialog::OnOkay(const std::shared_ptr<cpu_thread>& _cpu)
if (first_brk != -1) if (first_brk != -1)
{ {
const long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - first_brk - 2).c_str()); const long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - first_brk - 2).c_str());
if (reg.find("GPR") == 0 || reg.find("FPR") == 0) if (reg.compare(0, 3, "GPR") == 0 || reg.compare(0, 3, "FPR") == 0)
{ {
const ullong reg_value = std::stoull(value.substr(16, 31), 0, 16); const ullong reg_value = std::stoull(value.substr(16, 31), 0, 16);
if (reg.find("GPR") == 0) ppu.gpr[reg_index] = (u64)reg_value; if (reg.compare(0, 3, "GPR") == 0) ppu.gpr[reg_index] = (u64)reg_value;
if (reg.find("FPR") == 0) (u64&)ppu.fpr[reg_index] = (u64)reg_value; if (reg.compare(0, 3, "FPR") == 0) (u64&)ppu.fpr[reg_index] = (u64)reg_value;
return; return;
} }
if (reg.find("VR") == 0) if (reg.compare(0, 2, "VR") == 0)
{ {
const ullong reg_value0 = std::stoull(value.substr(16, 31), 0, 16); const ullong reg_value0 = std::stoull(value.substr(16, 31), 0, 16);
const ullong reg_value1 = std::stoull(value.substr(0, 15), 0, 16); const ullong reg_value1 = std::stoull(value.substr(0, 15), 0, 16);
@ -188,7 +188,7 @@ void register_editor_dialog::OnOkay(const std::shared_ptr<cpu_thread>& _cpu)
if (first_brk != -1) if (first_brk != -1)
{ {
const long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - 2).c_str()); const long reg_index = std::atol(reg.substr(first_brk + 1, reg.length() - 2).c_str());
if (reg.find("GPR") == 0) if (reg.compare(0, 3, "GPR") == 0)
{ {
const ullong reg_value0 = std::stoull(value.substr(16, 31), 0, 16); const ullong reg_value0 = std::stoull(value.substr(16, 31), 0, 16);
const ullong reg_value1 = std::stoull(value.substr(0, 15), 0, 16); const ullong reg_value1 = std::stoull(value.substr(0, 15), 0, 16);

2
rpcs3/xinput_pad_handler.cpp
View file

@ -74,7 +74,7 @@ void xinput_pad_handler::init_config(pad_config* cfg, const std::string& name)
cfg->from_default(); cfg->from_default();
} }
void xinput_pad_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, std::vector<std::string> buttons) void xinput_pad_handler::GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
{ {
if (get_blacklist) if (get_blacklist)
blacklist.clear(); blacklist.clear();

2
rpcs3/xinput_pad_handler.h
View file

@ -107,7 +107,7 @@ public:
std::vector<std::string> ListDevices() override; std::vector<std::string> ListDevices() override;
bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override; bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override;
void ThreadProc() override; void ThreadProc() override;
void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, std::vector<std::string> buttons = {}) override; void GetNextButtonPress(const std::string& padId, const std::function<void(u16, std::string, std::string, int[])>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override; void TestVibration(const std::string& padId, u32 largeMotor, u32 smallMotor) override;
void init_config(pad_config* cfg, const std::string& name) override; void init_config(pad_config* cfg, const std::string& name) override;