diff --git a/rpcs3/ds3_pad_handler.cpp b/rpcs3/ds3_pad_handler.cpp index 0bf7edad04..69ad127cc0 100644 --- a/rpcs3/ds3_pad_handler.cpp +++ b/rpcs3/ds3_pad_handler.cpp @@ -318,7 +318,7 @@ std::shared_ptr ds3_pad_handler::get_device(const s int pad_number = std::stoi(padId.substr(pos + 9)); if (pad_number > 0 && pad_number <= controllers.size()) - return controllers[pad_number - 1]; + return controllers[static_cast(pad_number) - 1]; return nullptr; } diff --git a/rpcs3/ds3_pad_handler.h b/rpcs3/ds3_pad_handler.h index 05592b0006..fe58cdb3ca 100644 --- a/rpcs3/ds3_pad_handler.h +++ b/rpcs3/ds3_pad_handler.h @@ -106,7 +106,7 @@ class ds3_pad_handler final : public PadHandlerBase std::string device = {}; hid_device *handle = nullptr; pad_config* config{ nullptr }; - u8 buf[64]; + u8 buf[64]{ 0 }; u8 large_motor = 0; u8 small_motor = 0; u8 status = DS3Status::Disconnected; diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp index 6f422b925e..42add41ca6 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_dialog.cpp @@ -1,4 +1,4 @@ -#include "save_data_dialog.h" +#include "save_data_dialog.h" #include "save_data_list_dialog.h" #include diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3qt/save_data_dialog.h index c0db209e19..2a49f37d4d 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.h +++ b/rpcs3/rpcs3qt/save_data_dialog.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "stdafx.h" #include "Emu/Memory/vm.h" diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp index fa50b4f00b..906ad07550 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp @@ -14,7 +14,7 @@ constexpr auto qstr = QString::fromStdString; //Show up the savedata list, either to choose one to save/load or to manage saves. //I suggest to use function callbacks to give save data list or get save data entry. (Not implemented or stubbed) save_data_list_dialog::save_data_list_dialog(const std::vector& entries, s32 focusedEntry, u32 op, vm::ptr listSet, QWidget* parent) - : QDialog(parent), m_save_entries(entries), m_entry(selection_code::new_save), m_entry_label(nullptr) + : QDialog(parent), m_save_entries(entries), m_entry(selection_code::new_save), m_entry_label(nullptr), m_sort_column(0), m_sort_ascending(true) { if (op >= 8) { diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h index 4273eaa22d..3bbafecd2b 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.h +++ b/rpcs3/rpcs3qt/save_data_list_dialog.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once // I just want the struct for the save data. #include "stdafx.h" @@ -35,9 +35,9 @@ private: void UpdateList(void); s32 m_entry; - QLabel* m_entry_label; + QLabel* m_entry_label = nullptr; - QTableWidget* m_list; + QTableWidget* m_list = nullptr; std::vector m_save_entries; std::shared_ptr m_gui_settings; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 332b8e5ce7..6f694e770a 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -25,7 +25,8 @@ namespace constexpr auto qstr = QString::fromStdString; inline std::string sstr(const QString& _in) { return _in.toStdString(); } - QString FormatTimestamp(u64 time) { + QString FormatTimestamp(u64 time) + { QDateTime dateTime; dateTime.setTime_t(time); return dateTime.toString("yyyy-MM-dd HH:mm:ss"); diff --git a/rpcs3/xinput_pad_handler.h b/rpcs3/xinput_pad_handler.h index 8bf2d91d6e..eb9d6c6f27 100644 --- a/rpcs3/xinput_pad_handler.h +++ b/rpcs3/xinput_pad_handler.h @@ -135,5 +135,5 @@ private: // holds internal controller state change XINPUT_STATE state; - DWORD result; + DWORD result{ 0 }; };