diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index 5a96d53405..0c89695a0b 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -884,7 +884,6 @@ std::vector SCEDecrypter::MakeFile() SELFDecrypter::SELFDecrypter(const fs::file& s) : self_f(s) , key_v() - , data_buf_length(0) { } diff --git a/rpcs3/Crypto/unself.h b/rpcs3/Crypto/unself.h index ef5d3c893b..5bf77cd228 100644 --- a/rpcs3/Crypto/unself.h +++ b/rpcs3/Crypto/unself.h @@ -414,7 +414,7 @@ class SELFDecrypter std::unique_ptr data_keys; u32 data_keys_length; std::unique_ptr data_buf; - u32 data_buf_length; + u32 data_buf_length = 0; // Main key vault instance. KeyVault key_v; diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h index 5bca84402c..f4dfdcd483 100644 --- a/rpcs3/Emu/Audio/AudioDumper.h +++ b/rpcs3/Emu/Audio/AudioDumper.h @@ -15,8 +15,8 @@ struct WAVHeader RIFFHeader(u32 size) : ID("RIFF"_u32) - , WAVE("WAVE"_u32) , Size(size) + , WAVE("WAVE"_u32) { } } RIFF; @@ -53,10 +53,10 @@ struct WAVHeader WAVHeader() = default; WAVHeader(u16 ch) - : ID("data"_u32) - , Size(0) + : RIFF(sizeof(RIFFHeader) + sizeof(FMTHeader)) , FMT(ch) - , RIFF(sizeof(RIFFHeader) + sizeof(FMTHeader)) + , ID("data"_u32) + , Size(0) { } }; diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/Emu/Cell/Modules/cellAdec.cpp index c542b911fe..18f7b0c55c 100644 --- a/rpcs3/Emu/Cell/Modules/cellAdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAdec.cpp @@ -264,15 +264,15 @@ class AudioDecoder : public ppu_thread { public: squeue_t job; - volatile bool is_closed; - volatile bool is_finished; - bool just_started; - bool just_finished; + volatile bool is_closed = false; + volatile bool is_finished = false; + bool just_started = false; + bool just_finished = false; - AVCodec* codec; - AVInputFormat* input_format; - AVCodecContext* ctx; - AVFormatContext* fmt; + AVCodec* codec = nullptr; + AVInputFormat* input_format = nullptr; + AVCodecContext* ctx = nullptr; + AVFormatContext* fmt = nullptr; u8* io_buf; struct AudioReader @@ -296,7 +296,7 @@ public: const u32 memSize; const vm::ptr cbFunc; const u32 cbArg; - u32 memBias; + u32 memBias = 0; AdecTask task; u64 last_pts, first_pts; @@ -312,17 +312,8 @@ public: , type(type) , memAddr(addr) , memSize(size) - , memBias(0) , cbFunc(func) , cbArg(arg) - , is_closed(false) - , is_finished(false) - , just_started(false) - , just_finished(false) - , codec(nullptr) - , input_format(nullptr) - , ctx(nullptr) - , fmt(nullptr) { av_register_all(); avcodec_register_all(); diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp index 47e20f0cdb..d6c65b7a00 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -57,8 +57,8 @@ cell_audio_config::cell_audio_config() audio_ringbuffer::audio_ringbuffer(cell_audio_config& _cfg) - : cfg(_cfg) - , backend(_cfg.backend) + : backend(_cfg.backend) + , cfg(_cfg) , buf_sz(AUDIO_BUFFER_SAMPLES * _cfg.audio_channels) , emu_paused(Emu.IsPaused()) { diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/Emu/Cell/Modules/cellDmux.cpp index a75982e915..46517146d6 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmux.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDmux.cpp @@ -134,9 +134,9 @@ class ElementaryStream std::mutex m_mutex; squeue_t entries; // AU starting addresses - u32 put_count; // number of AU written - u32 got_count; // number of AU obtained by GetAu(Ex) - u32 released; // number of AU released + u32 put_count = 0; // number of AU written + u32 got_count = 0; // number of AU obtained by GetAu(Ex) + u32 released = 0; // number of AU released u32 put; // AU that is being written now @@ -162,9 +162,9 @@ public: const u32 spec; //addr std::vector raw_data; // demultiplexed data stream (managed by demuxer thread) - size_t raw_pos; // should be <= raw_data.size() - u64 last_dts; - u64 last_pts; + std::size_t raw_pos = 0; // should be <= raw_data.size() + u64 last_dts = CODEC_TS_INVALID; + u64 last_pts = CODEC_TS_INVALID; void push(DemuxerStream& stream, u32 size); // called by demuxer thread (not multithread-safe) @@ -187,17 +187,13 @@ public: const u32 memSize; const vm::ptr cbFunc; const u32 cbArg; - volatile bool is_finished; - volatile bool is_closed; - atomic_t is_running; - atomic_t is_working; + volatile bool is_finished = false; + volatile bool is_closed = false; + atomic_t is_running = false; + atomic_t is_working = false; Demuxer(u32 addr, u32 size, vm::ptr func, u32 arg) : ppu_thread({}, "", 0) - , is_finished(false) - , is_closed(false) - , is_running(false) - , is_working(false) , memAddr(addr) , memSize(size) , cbFunc(func) @@ -738,7 +734,8 @@ PesHeader::PesHeader(DemuxerStream& stream) } ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr cbFunc, u32 cbArg, u32 spec) - : dmux(dmux) + : put(align(addr, 128)) + , dmux(dmux) , memAddr(align(addr, 128)) , memSize(size - (addr - memAddr)) , fidMajor(fidMajor) @@ -748,13 +745,6 @@ ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMaj , cbFunc(cbFunc) , cbArg(cbArg) , spec(spec) - , put(align(addr, 128)) - , put_count(0) - , got_count(0) - , released(0) - , raw_pos(0) - , last_dts(CODEC_TS_INVALID) - , last_pts(CODEC_TS_INVALID) { } diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index c757a8d0f6..e0f6026ced 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -716,8 +716,8 @@ ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u3 , prio(prio) , stack_size(param.stack_size) , stack_addr(param.stack_addr) - , start_time(get_guest_system_time()) , joiner(-!!detached) + , start_time(get_guest_system_time()) , ppu_name(name) { gpr[1] = stack_addr + stack_size - 0x70; diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 5f5a29c0b4..54105aea6f 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1233,11 +1233,11 @@ spu_thread::~spu_thread() spu_thread::spu_thread(vm::addr_t ls, lv2_spu_group* group, u32 index, std::string_view name, u32 lv2_id) : cpu_thread(idm::last_id()) - , spu_name(name) , index(index) , offset(ls) , group(group) , lv2_id(lv2_id) + , spu_name(name) { if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit) { diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.h b/rpcs3/Emu/Cell/lv2/sys_cond.h index 247c812f1b..8483e3e897 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.h +++ b/rpcs3/Emu/Cell/lv2/sys_cond.h @@ -33,8 +33,8 @@ struct lv2_cond final : lv2_obj lv2_cond(u32 shared, s32 flags, u64 key, u64 name, std::shared_ptr mutex) : shared(shared) - , key(key) , flags(flags) + , key(key) , name(name) , mutex(std::move(mutex)) { diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.h b/rpcs3/Emu/Cell/lv2/sys_mutex.h index f2ffc1e16a..7c9edd36a2 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.h +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.h @@ -45,8 +45,8 @@ struct lv2_mutex final : lv2_obj , shared(shared) , adaptive(adaptive) , key(key) - , flags(flags) , name(name) + , flags(flags) { } diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.h b/rpcs3/Emu/Cell/lv2/sys_rwlock.h index e46843a512..16197417d6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.h +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.h @@ -38,8 +38,8 @@ struct lv2_rwlock final : lv2_obj : protocol(protocol) , shared(shared) , key(key) - , flags(flags) , name(name) + , flags(flags) { } }; diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.h b/rpcs3/Emu/Cell/lv2/sys_semaphore.h index 5dede72375..3f5b51c4cb 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.h +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.h @@ -38,8 +38,8 @@ struct lv2_sema final : lv2_obj : protocol(protocol) , shared(shared) , key(key) - , flags(flags) , name(name) + , flags(flags) , max(max) , val(value) { diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.h b/rpcs3/Emu/Cell/lv2/sys_spu.h index 281b1460b5..a92959569c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.h +++ b/rpcs3/Emu/Cell/lv2/sys_spu.h @@ -273,16 +273,16 @@ struct lv2_spu_group std::weak_ptr ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size) - : id(idm::last_id()) - , name(name) + : name(std::move(name)) + , id(idm::last_id()) , max_num(num) - , max_run(num) , mem_size(mem_size) - , init(0) - , prio(prio) , type(type) , ct(ct) , has_scheduler_context(uses_scheduler) + , max_run(num) + , init(0) + , prio(prio) , run_state(SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED) , exit_status(0) , join_state(0) diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp index edfae21b94..ea6471a415 100644 --- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp @@ -9,9 +9,9 @@ extern u64 get_timebased_time(); sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize) : ct(ct) - , psize(psize) , addr(_addr) , size(vsize) + , psize(psize) { // Write ID g_ids[addr >> 28].release(idm::last_id()); diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/Emu/Io/KeyboardHandler.h index 14bcc4689e..60a49e6b53 100644 --- a/rpcs3/Emu/Io/KeyboardHandler.h +++ b/rpcs3/Emu/Io/KeyboardHandler.h @@ -62,11 +62,10 @@ struct KbButton { u32 m_keyCode; u32 m_outKeyCode; - bool m_pressed; + bool m_pressed = false; KbButton(u32 keyCode, u32 outKeyCode) - : m_pressed(false) - , m_keyCode(keyCode) + : m_keyCode(keyCode) , m_outKeyCode(outKeyCode) { } @@ -74,7 +73,7 @@ struct KbButton struct Keyboard { - bool m_key_repeat; // for future use + bool m_key_repeat = false; // for future use KbData m_data; KbConfig m_config; std::vector m_buttons; @@ -82,7 +81,6 @@ struct Keyboard Keyboard() : m_data() , m_config() - , m_key_repeat(false) { } }; diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index 89d1126df5..2b90356faa 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -109,15 +109,13 @@ struct Button u32 m_offset; u32 m_keyCode; u32 m_outKeyCode; - u16 m_value; - bool m_pressed; + u16 m_value = 0; + bool m_pressed = false; Button(u32 offset, u32 keyCode, u32 outKeyCode) - : m_pressed(false) - , m_offset(offset) + : m_offset(offset) , m_keyCode(keyCode) , m_outKeyCode(outKeyCode) - , m_value(0) { } }; @@ -127,13 +125,12 @@ struct AnalogStick u32 m_offset; u32 m_keyCodeMin; u32 m_keyCodeMax; - u16 m_value; + u16 m_value = 128; AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax) : m_offset(offset) , m_keyCodeMin(keyCodeMin) , m_keyCodeMax(keyCodeMax) - , m_value(128) { } }; diff --git a/rpcs3/Emu/RSX/CgBinaryProgram.h b/rpcs3/Emu/RSX/CgBinaryProgram.h index 6f7d08d616..b54b8c87cb 100644 --- a/rpcs3/Emu/RSX/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/CgBinaryProgram.h @@ -120,17 +120,17 @@ class CgBinaryDisasm std::string m_path; // used for FP decompiler thread, delete this later - u8* m_buffer; - size_t m_buffer_size; + u8* m_buffer = nullptr; + std::size_t m_buffer_size = 0; std::string m_arb_shader; std::string m_glsl_shader; std::string m_dst_reg_name; // FP members - u32 m_offset; - u32 m_opcode; - u32 m_step; - u32 m_size; + u32 m_offset = 0; + u32 m_opcode = 0; + u32 m_step = 0; + u32 m_size = 0; std::vector m_end_offsets; std::vector m_else_offsets; std::vector m_loop_end_offsets; @@ -179,14 +179,6 @@ public: CgBinaryDisasm(const std::string& path) : m_path(path) - , m_buffer(nullptr) - , m_buffer_size(0) - , m_offset(0) - , m_opcode(0) - , m_step(0) - , m_size(0) - , m_arb_shader("") - , m_dst_reg_name("") { fs::file f(path); if (!f) return; diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp index d4d35614d5..595467868e 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp @@ -6,12 +6,10 @@ #include -FragmentProgramDecompiler::FragmentProgramDecompiler(const RSXFragmentProgram &prog, u32& size) : - m_prog(prog), - m_size(size), - m_const_index(0), - m_location(0), - m_ctrl(prog.ctrl) +FragmentProgramDecompiler::FragmentProgramDecompiler(const RSXFragmentProgram &prog, u32& size) + : m_size(size) + , m_prog(prog) + , m_ctrl(prog.ctrl) { m_size = 0; } diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h index e73c83e3cd..b0baf8e0ea 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h @@ -146,9 +146,9 @@ class FragmentProgramDecompiler std::string main; u32& m_size; - u32 m_const_index; + u32 m_const_index = 0; u32 m_offset; - u32 m_location; + u32 m_location = 0; u32 m_loop_count; int m_code_level; @@ -208,10 +208,10 @@ class FragmentProgramDecompiler protected: const RSXFragmentProgram &m_prog; u32 m_ctrl = 0; - + u32 m_2d_sampled_textures = 0; //Mask of textures sampled as texture2D (conflicts with samplerShadow fetch) u32 m_shadow_sampled_textures = 0; //Mask of textures sampled as boolean shadow comparisons - + /** returns the type name of float vectors. */ virtual std::string getFloatTypeName(size_t elementCount) = 0; diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 8657e07bd6..1f4c242ff0 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -151,7 +151,11 @@ namespace rsx deferred_subresource(image_resource_type _res, deferred_request_command _op, const image_section_attributes_t& attr, position2u offset, texture_channel_remap_t _remap) - : external_handle(_res), op(_op), x(offset.x), y(offset.y), remap(std::move(_remap)) + : external_handle(_res) + , remap(std::move(_remap)) + , op(_op) + , x(offset.x) + , y(offset.y) { static_cast(*this) = attr; } diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h index 6b854e50c7..58551aa80e 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h +++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h @@ -742,14 +742,15 @@ namespace rsx // Constructors range_iterator_tmpl() = default; // end iterator - explicit range_iterator_tmpl(parent_type &storage, const address_range &_range, section_bounds _bounds, bool _locked_only) : - range(_range), - bounds(_bounds), - block(&storage.block_for(range.start)), - unowned_it(block->unowned_begin()), - unowned_remaining(true), - cur_block_it(block->begin()), - locked_only(_locked_only) + + explicit range_iterator_tmpl(parent_type &storage, const address_range &_range, section_bounds _bounds, bool _locked_only) + : range(_range) + , bounds(_bounds) + , block(&storage.block_for(range.start)) + , unowned_remaining(true) + , unowned_it(block->unowned_begin()) + , cur_block_it(block->begin()) + , locked_only(_locked_only) { // do a "fake" iteration to ensure the internal state is consistent next(false); diff --git a/rpcs3/Emu/RSX/RSXOffload.h b/rpcs3/Emu/RSX/RSXOffload.h index 27b8e7b7bf..19e45f0ae0 100644 --- a/rpcs3/Emu/RSX/RSXOffload.h +++ b/rpcs3/Emu/RSX/RSXOffload.h @@ -32,19 +32,19 @@ namespace rsx u32 aux_param1; transport_packet(void *_dst, void *_src, u32 len) - : src(_src), dst(_dst), length(len), type(op::raw_copy) + : type(op::raw_copy), src(_src), dst(_dst), length(len) {} transport_packet(void *_dst, std::vector& _src, u32 len) - : dst(_dst), opt_storage(std::move(_src)), length(len), type(op::vector_copy) + : type(op::vector_copy), opt_storage(std::move(_src)), dst(_dst), length(len) {} transport_packet(void *_dst, rsx::primitive_type prim, u32 len) - : dst(_dst), aux_param0(static_cast(prim)), length(len), type(op::index_emulate) + : type(op::index_emulate), dst(_dst), length(len), aux_param0(static_cast(prim)) {} transport_packet(u32 command, void* args) - : aux_param0(command), src(args), type(op::callback) + : type(op::callback), src(args), aux_param0(command) {} }; diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 001bedf639..e6f87a752d 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1322,7 +1322,8 @@ private: VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags image_flags) - : m_device(dev), current_layout(initial_layout) + : current_layout(initial_layout) + , m_device(dev) { info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; info.imageType = image_type; @@ -1448,7 +1449,8 @@ private: } image_view(VkDevice dev, VkImageViewCreateInfo create_info) - : m_device(dev), info(create_info) + : info(create_info) + , m_device(dev) { create_impl(); } @@ -1781,7 +1783,8 @@ private: public: framebuffer(VkDevice dev, VkRenderPass pass, u32 width, u32 height, std::vector> &&atts) - : m_device(dev), attachments(std::move(atts)) + : attachments(std::move(atts)) + , m_device(dev) { std::vector image_view_array(attachments.size()); size_t i = 0; diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/Emu/RSX/VK/VKVertexProgram.h index 393f238563..f3256acb99 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.h +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.h @@ -36,8 +36,8 @@ public: VKVertexDecompilerThread(const RSXVertexProgram &prog, std::string& shader, ParamArray&, class VKVertexProgram &dst) : VertexProgramDecompiler(prog) , m_shader(shader) - , rsx_vertex_program(prog) , vk_prog(&dst) + , rsx_vertex_program(prog) { } @@ -46,7 +46,7 @@ public: }; class VKVertexProgram -{ +{ public: VKVertexProgram(); ~VKVertexProgram(); diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h index 1e43634fc9..d474cc485e 100644 --- a/rpcs3/Emu/RSX/rsx_vertex_data.h +++ b/rpcs3/Emu/RSX/rsx_vertex_data.h @@ -24,8 +24,8 @@ private: public: data_array_format_info(int id, std::array& r) - : registers(r) - , index(id) + : index(id) + , registers(r) { } diff --git a/rpcs3/Input/keyboard_pad_handler.cpp b/rpcs3/Input/keyboard_pad_handler.cpp index fe7c620322..e1f5214d85 100644 --- a/rpcs3/Input/keyboard_pad_handler.cpp +++ b/rpcs3/Input/keyboard_pad_handler.cpp @@ -18,7 +18,9 @@ bool keyboard_pad_handler::Init() return true; } -keyboard_pad_handler::keyboard_pad_handler() : PadHandlerBase(pad_handler::keyboard), QObject() +keyboard_pad_handler::keyboard_pad_handler() + : QObject() + , PadHandlerBase(pad_handler::keyboard) { init_configs(); diff --git a/rpcs3/Loader/PSF.h b/rpcs3/Loader/PSF.h index 81429354a8..d8d8eaa59f 100644 --- a/rpcs3/Loader/PSF.h +++ b/rpcs3/Loader/PSF.h @@ -13,10 +13,10 @@ namespace psf class entry final { - std::string m_value_string; - u32 m_value_integer; // TODO: is it really unsigned? - u32 m_max_size; // Entry max size (supplementary info, stored in PSF format) format m_type; + u32 m_max_size; // Entry max size (supplementary info, stored in PSF format) + u32 m_value_integer; // TODO: is it really unsigned? + std::string m_value_string; public: // Construct string entry, assign the value diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake index 7c7d77019e..3759828078 100644 --- a/rpcs3/cmake_modules/ConfigureCompiler.cmake +++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake @@ -30,10 +30,10 @@ else() add_compile_options(-Werror=old-style-cast) add_compile_options(-Werror=sign-compare) + add_compile_options(-Werror=reorder) #TODO Clean the code so these are removed add_compile_options(-Wno-unused-variable) - add_compile_options(-Wno-reorder) add_compile_options(-Wno-unknown-pragmas) add_compile_options(-Wno-invalid-offsetof) add_compile_options(-Wno-unused-function) diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp index eeb082e333..0ba192f066 100644 --- a/rpcs3/rpcs3qt/debugger_list.cpp +++ b/rpcs3/rpcs3qt/debugger_list.cpp @@ -11,8 +11,10 @@ constexpr auto qstr = QString::fromStdString; -debugger_list::debugger_list(QWidget* parent, std::shared_ptr settings, breakpoint_handler* handler) : QListWidget(parent), m_breakpoint_handler(handler), - xgui_settings(settings), m_pc(0), m_item_count(30) +debugger_list::debugger_list(QWidget* parent, std::shared_ptr settings, breakpoint_handler* handler) + : QListWidget(parent) + , xgui_settings(settings) + , m_breakpoint_handler(handler) { setWindowTitle(tr("ASM")); for (uint i = 0; i < m_item_count; ++i) diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3qt/debugger_list.h index b68871327c..2b75616807 100644 --- a/rpcs3/rpcs3qt/debugger_list.h +++ b/rpcs3/rpcs3qt/debugger_list.h @@ -13,8 +13,8 @@ class debugger_list : public QListWidget Q_OBJECT public: - u32 m_pc; - u32 m_item_count; + u32 m_pc = 0; + u32 m_item_count = 30; bool m_no_thread_selected; QColor m_color_bp; QColor m_color_pc; diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index 7e0c53e5a3..5b5346cba8 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -169,9 +169,16 @@ public: bool has_msaa = false; Render_Info() = default; - explicit Render_Info(QString name) : name(std::move(name)), has_adapters(false) {} + explicit Render_Info(QString name) + : name(std::move(name)) + , has_adapters(false) {} + Render_Info(QString name, QStringList adapters, bool supported, SettingsType type, bool has_msaa) - : name(std::move(name)), adapters(std::move(adapters)), supported(supported), type(type), has_msaa(has_msaa) {} + : name(std::move(name)) + , adapters(std::move(adapters)) + , type(type) + , supported(supported) + , has_msaa(has_msaa) {} }; struct Render_Creator diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp index 985d7cf76b..d4bc257c34 100644 --- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp @@ -9,8 +9,8 @@ extern bool ppu_patch(u32 addr, u32 value); instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr& _cpu, CPUDisAsm* _disasm) : QDialog(parent) , m_pc(_pc) - , cpu(_cpu) , m_disasm(_disasm) + , cpu(_cpu) { setWindowTitle(tr("Edit instruction")); setAttribute(Qt::WA_DeleteOnClose); diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 100e15745b..bc49c44537 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -62,11 +62,10 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); } main_window::main_window(std::shared_ptr guiSettings, std::shared_ptr emuSettings, std::shared_ptr persistent_settings, QWidget *parent) : QMainWindow(parent) + , ui(new Ui::main_window) , guiSettings(guiSettings) , emuSettings(emuSettings) , m_persistent_settings(persistent_settings) - , m_sys_menu_opened(false) - , ui(new Ui::main_window) { Q_INIT_RESOURCE(resources); diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3qt/register_editor_dialog.cpp index a8b6a0725d..eddf2a61d5 100644 --- a/rpcs3/rpcs3qt/register_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/register_editor_dialog.cpp @@ -8,8 +8,8 @@ inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); } register_editor_dialog::register_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr& _cpu, CPUDisAsm* _disasm) : QDialog(parent) , m_pc(_pc) - , cpu(_cpu) , m_disasm(_disasm) + , cpu(_cpu) { setWindowTitle(tr("Edit registers")); setAttribute(Qt::WA_DeleteOnClose); diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index 12eb070b1f..46455dfcd4 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -24,9 +24,6 @@ namespace rsx_debugger::rsx_debugger(std::shared_ptr gui_settings, QWidget* parent) : QDialog(parent) , m_gui_settings(gui_settings) - , m_addr(0x0) - , m_cur_texture(0) - , exit(false) { setWindowTitle(tr("RSX Debugger")); setObjectName("rsx_debugger"); @@ -327,7 +324,9 @@ bool rsx_debugger::eventFilter(QObject* object, QEvent* event) } Buffer::Buffer(bool isTex, u32 id, const QString& name, QWidget* parent) - : QGroupBox(name, parent), m_isTex(isTex), m_id(id) + : QGroupBox(name, parent) + , m_id(id) + , m_isTex(isTex) { m_image_size = isTex ? Texture_Size : Panel_Size; diff --git a/rpcs3/rpcs3qt/rsx_debugger.h b/rpcs3/rpcs3qt/rsx_debugger.h index 4ab201bd80..bb3ff76aaa 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.h +++ b/rpcs3/rpcs3qt/rsx_debugger.h @@ -41,7 +41,7 @@ class rsx_debugger : public QDialog { Q_OBJECT - u32 m_addr; + u32 m_addr = 0; QLineEdit* m_addr_line; @@ -62,12 +62,12 @@ class rsx_debugger : public QDialog QLabel* m_text_transform_program; QLabel* m_text_shader_program; - uint m_cur_texture; + uint m_cur_texture = 0; std::shared_ptr m_gui_settings; public: - bool exit; + bool exit = false; rsx_debugger(std::shared_ptr gui_settings, QWidget* parent = 0); ~rsx_debugger(); diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp index 40666ac914..95e2604051 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp @@ -15,7 +15,8 @@ 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), m_sort_column(0), m_sort_ascending(true) + : QDialog(parent) + , m_save_entries(entries) { if (op >= 8) { diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h index a5502c4b87..96c62bada0 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.h +++ b/rpcs3/rpcs3qt/save_data_list_dialog.h @@ -33,7 +33,7 @@ private: void UpdateSelectionLabel(void); void UpdateList(void); - s32 m_entry; + s32 m_entry = selection_code::new_save; QLabel* m_entry_label = nullptr; QTableWidget* m_list = nullptr; @@ -41,6 +41,6 @@ private: std::shared_ptr m_gui_settings; - int m_sort_column; - bool m_sort_ascending; + int m_sort_column = 0; + bool m_sort_ascending = true; }; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 51f1469ae1..304bdeb32a 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -94,7 +94,9 @@ namespace } save_manager_dialog::save_manager_dialog(std::shared_ptr gui_settings, std::string dir, QWidget* parent) - : QDialog(parent), m_save_entries(), m_dir(dir), m_sort_column(1), m_sort_ascending(true), m_gui_settings(gui_settings) + : QDialog(parent) + , m_dir(dir) + , m_gui_settings(gui_settings) { setWindowTitle(tr("Save Manager")); setMinimumSize(QSize(400, 400)); diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h index 2100233bc1..bb3bfbc6ec 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.h +++ b/rpcs3/rpcs3qt/save_manager_dialog.h @@ -44,8 +44,8 @@ private: std::shared_ptr m_gui_settings; - int m_sort_column; - bool m_sort_ascending; + int m_sort_column = 1; + bool m_sort_ascending = true; QSize m_icon_size; QColor m_icon_color; diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 8f865ce0c7..215fa58d47 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -39,7 +39,11 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); } inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); } settings_dialog::settings_dialog(std::shared_ptr guiSettings, std::shared_ptr emuSettings, const int& tabIndex, QWidget *parent, const GameInfo* game) - : QDialog(parent), xgui_settings(guiSettings), xemu_settings(emuSettings), ui(new Ui::settings_dialog), m_tab_Index(tabIndex) + : QDialog(parent) + , m_tab_Index(tabIndex) + , ui(new Ui::settings_dialog) + , xgui_settings(guiSettings) + , xemu_settings(emuSettings) { ui->setupUi(this); ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus(); diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp index 3801a39f8d..db19a9afb3 100644 --- a/rpcs3/rpcs3qt/user_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp @@ -57,7 +57,8 @@ namespace } user_manager_dialog::user_manager_dialog(std::shared_ptr gui_settings, QWidget* parent) - : QDialog(parent), m_user_list(), m_sort_column(1), m_sort_ascending(true), m_gui_settings(gui_settings) + : QDialog(parent) + , m_gui_settings(gui_settings) { setWindowTitle(tr("User Manager")); setMinimumSize(QSize(500, 400)); diff --git a/rpcs3/rpcs3qt/user_manager_dialog.h b/rpcs3/rpcs3qt/user_manager_dialog.h index b83aa04601..eb4f3f4e5f 100644 --- a/rpcs3/rpcs3qt/user_manager_dialog.h +++ b/rpcs3/rpcs3qt/user_manager_dialog.h @@ -51,6 +51,6 @@ private: std::shared_ptr m_gui_settings; - int m_sort_column; - bool m_sort_ascending; + int m_sort_column = 1; + bool m_sort_ascending = true; };