diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index c76b5e7162..a68901b213 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -35,7 +35,6 @@ android { buildFeatures { viewBinding = true - buildConfig = true } compileOptions { diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 1da29b6797..151f7378d6 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -14,6 +14,8 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kotlin.parallel.tasks.in.project=true +android.defaults.buildfeatures.buildconfig=true + # Android Gradle plugin 8.0.2 android.suppressUnsupportedCompileSdk=34 android.native.buildOutput=verbose \ No newline at end of file diff --git a/src/common/announce_multiplayer_room.h b/src/common/announce_multiplayer_room.h index bbc1dd8a3b..bca0ee8e2e 100644 --- a/src/common/announce_multiplayer_room.h +++ b/src/common/announce_multiplayer_room.h @@ -34,8 +34,8 @@ struct Member { struct RoomInformation { std::string name; ///< Name of the server std::string description; ///< Server description - u32 member_slots; ///< Maximum number of members in this room - u16 port; ///< The port of this room + u32 member_slots{}; ///< Maximum number of members in this room + u16 port{}; ///< The port of this room GameInfo preferred_game; ///< Game to advertise that you want to play std::string host_username; ///< Forum username of the host }; @@ -46,8 +46,8 @@ struct Room { std::string id; std::string verify_uid; ///< UID used for verification std::string ip; - u32 net_version; - bool has_password; + u32 net_version{}; + bool has_password = false; std::vector members; }; diff --git a/src/common/heap_tracker.cpp b/src/common/heap_tracker.cpp index c875683f0f..94f0eb5eab 100644 --- a/src/common/heap_tracker.cpp +++ b/src/common/heap_tracker.cpp @@ -43,14 +43,13 @@ void HeapTracker::Map(size_t virtual_offset, size_t host_offset, size_t length, // We are mapping part of a separate heap. std::scoped_lock lk{m_lock}; - auto* const map = new SeparateHeapMap{ - .vaddr = virtual_offset, - .paddr = host_offset, - .size = length, - .tick = m_tick++, - .perm = perm, - .is_resident = false, - }; + std::unique_ptr map; + map->vaddr = virtual_offset; + map->paddr = host_offset; + map->size = length; + map->tick = m_tick++; + map->perm = perm; + map->is_resident = false; // Insert into mappings. m_map_count++; @@ -248,15 +247,13 @@ void HeapTracker::SplitHeapMapLocked(VAddr offset) { const size_t left_size = offset - left->vaddr; left->size = left_size; - // Create the new right map. - auto* const right = new SeparateHeapMap{ - .vaddr = left->vaddr + left_size, - .paddr = left->paddr + left_size, - .size = orig_size - left_size, - .tick = left->tick, - .perm = left->perm, - .is_resident = left->is_resident, - }; + std::unique_ptr right; + right->vaddr = left->vaddr + left_size; + right->paddr = left->paddr + left_size; + right->size = orig_size - left_size; + right->tick = left->tick; + right->perm = left->perm; + right->is_resident = left->is_resident; // Insert the new right map. m_map_count++; diff --git a/src/core/frontend/applets/cabinet.h b/src/core/frontend/applets/cabinet.h index af3fc6c3d5..a0735d7592 100644 --- a/src/core/frontend/applets/cabinet.h +++ b/src/core/frontend/applets/cabinet.h @@ -16,7 +16,7 @@ namespace Core::Frontend { struct CabinetParameters { Service::NFP::TagInfo tag_info; Service::NFP::RegisterInfo register_info; - Service::NFP::CabinetMode mode; + Service::NFP::CabinetMode mode{}; }; using CabinetCallback = std::function; diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index a32a98e4cf..010543dec8 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -20,9 +20,9 @@ struct KeyboardInitializeParameters { std::u16string initial_text; char16_t left_optional_symbol_key; char16_t right_optional_symbol_key; - u32 max_text_length; - u32 min_text_length; - s32 initial_cursor_position; + u32 max_text_length{}; + u32 min_text_length{}; + s32 initial_cursor_position{}; Service::AM::Frontend::SwkbdType type; Service::AM::Frontend::SwkbdPasswordMode password_mode; Service::AM::Frontend::SwkbdTextDrawType text_draw_type; @@ -34,12 +34,12 @@ struct KeyboardInitializeParameters { }; struct InlineAppearParameters { - u32 max_text_length; - u32 min_text_length; - f32 key_top_scale_x; - f32 key_top_scale_y; - f32 key_top_translate_x; - f32 key_top_translate_y; + u32 max_text_length{}; + u32 min_text_length{}; + f32 key_top_scale_x{}; + f32 key_top_scale_y{}; + f32 key_top_translate_x{}; + f32 key_top_translate_y{}; Service::AM::Frontend::SwkbdType type; Service::AM::Frontend::SwkbdKeyDisableFlags key_disable_flags; bool key_top_as_floating; @@ -50,7 +50,7 @@ struct InlineAppearParameters { struct InlineTextParameters { std::u16string input_text; - s32 cursor_position; + s32 cursor_position{}; }; class SoftwareKeyboardApplet : public Applet { diff --git a/src/core/hle/service/nfc/nfc_types.h b/src/core/hle/service/nfc/nfc_types.h index 68e724442f..288f396564 100644 --- a/src/core/hle/service/nfc/nfc_types.h +++ b/src/core/hle/service/nfc/nfc_types.h @@ -79,7 +79,7 @@ using DeviceHandle = u64; // This is nn::nfc::TagInfo struct TagInfo { - UniqueSerialNumber uuid; + UniqueSerialNumber uuid{}; u8 uuid_length; INSERT_PADDING_BYTES(0x15); NfcProtocol protocol; diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 2505eb551d..2aecf1fdcb 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -315,7 +315,7 @@ static_assert(sizeof(ModelInfo) == 0x40, "ModelInfo is an invalid size"); // This is nn::nfp::RegisterInfo struct RegisterInfo { Service::Mii::CharInfo mii_char_info; - WriteDate creation_date; + WriteDate creation_date{}; AmiiboName amiibo_name; u8 font_region; INSERT_PADDING_BYTES(0x7A); diff --git a/src/core/hle/service/ns/platform_service_manager.cpp b/src/core/hle/service/ns/platform_service_manager.cpp index 23cf05005c..bfbcc9f402 100644 --- a/src/core/hle/service/ns/platform_service_manager.cpp +++ b/src/core/hle/service/ns/platform_service_manager.cpp @@ -161,7 +161,7 @@ IPlatformServiceManager::IPlatformServiceManager(Core::System& system_, const ch // Rebuild shared fonts from data ncas or synthesize impl->shared_font = std::make_shared(SHARED_FONT_MEM_SIZE); - for (auto font : SHARED_FONTS) { + for (auto& font : SHARED_FONTS) { FileSys::VirtualFile romfs; const auto nca = nand->GetEntry(static_cast(font.first), FileSys::ContentRecordType::Data); @@ -258,7 +258,7 @@ Result IPlatformServiceManager::GetSharedFontInOrderOfPriority( out_font_sizes.size(), impl->shared_font_regions.size()}); for (size_t i = 0; i < max_size; i++) { - auto region = impl->GetSharedFontRegion(i); + auto& region = impl->GetSharedFontRegion(i); out_font_codes[i] = static_cast(i); out_font_offsets[i] = region.offset; diff --git a/src/input_common/helpers/joycon_protocol/poller.cpp b/src/input_common/helpers/joycon_protocol/poller.cpp index 1aab9e12a3..0db00e2f71 100644 --- a/src/input_common/helpers/joycon_protocol/poller.cpp +++ b/src/input_common/helpers/joycon_protocol/poller.cpp @@ -13,7 +13,7 @@ JoyconPoller::JoyconPoller(ControllerType device_type_, JoyStickCalibration left right_stick_calibration{right_stick_calibration_}, motion_calibration{motion_calibration_} {} void JoyconPoller::SetCallbacks(const JoyconCallbacks& callbacks_) { - callbacks = std::move(callbacks_); + callbacks = callbacks_; } void JoyconPoller::ReadActiveMode(std::span buffer, const MotionStatus& motion_status, diff --git a/src/network/room_member.h b/src/network/room_member.h index 37e9ea16a5..56e3ae8eff 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h @@ -53,7 +53,7 @@ struct ChatEntry { /// Represents a system status message. struct StatusMessageEntry { - StatusMessageTypes type; ///< Type of the message + StatusMessageTypes type{}; ///< Type of the message /// Subject of the message. i.e. the user who is joining/leaving/being banned, etc. std::string nickname; std::string username; diff --git a/src/video_core/control/scheduler.cpp b/src/video_core/control/scheduler.cpp index f7cbe204ee..d11a070c28 100644 --- a/src/video_core/control/scheduler.cpp +++ b/src/video_core/control/scheduler.cpp @@ -17,7 +17,7 @@ void Scheduler::Push(s32 channel, CommandList&& entries) { std::unique_lock lk(scheduling_guard); auto it = channels.find(channel); ASSERT(it != channels.end()); - auto channel_state = it->second; + auto& channel_state = it->second; gpu.BindChannel(channel_state->bind_id); channel_state->dma_pusher->Push(std::move(entries)); channel_state->dma_pusher->DispatchCalls(); diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 2d12fc658f..c6dfcaa24e 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -108,7 +108,7 @@ VkViewport GetViewportState(const Device& device, const Maxwell& regs, size_t in VkRect2D GetScissorState(const Maxwell& regs, size_t index, u32 up_scale = 1, u32 down_shift = 0) { const auto& src = regs.scissor_test[index]; - VkRect2D scissor; + VkRect2D scissor{}; const auto scale_up = [&](s32 value) -> s32 { if (value == 0) { return 0U; @@ -377,7 +377,7 @@ void RasterizerVulkan::Clear(u32 layer_count) { } UpdateViewportsState(regs); - VkRect2D default_scissor; + VkRect2D default_scissor{}; default_scissor.offset.x = 0; default_scissor.offset.y = 0; default_scissor.extent.width = std::numeric_limits::max(); @@ -1075,7 +1075,7 @@ void RasterizerVulkan::UpdateScissorsState(Tegra::Engines::Maxwell3D::Regs& regs const auto y = static_cast(regs.surface_clip.y); const auto width = static_cast(regs.surface_clip.width); const auto height = static_cast(regs.surface_clip.height); - VkRect2D scissor; + VkRect2D scissor{}; scissor.offset.x = static_cast(x); scissor.offset.y = static_cast(y); scissor.extent.width = static_cast(width != 0.0f ? width : 1.0f); diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index ca9c5cfbdc..fd918a1df6 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -264,7 +264,7 @@ void QtAmiiboSettings::ShowCabinetApplet( const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, std::shared_ptr nfp_device) const { - callback = std::move(callback_); + callback = callback_; emit MainWindowShowAmiiboSettings(parameters, nfp_device); } diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h index beb503dae0..d87885096c 100644 --- a/src/yuzu/configuration/configure_input.h +++ b/src/yuzu/configuration/configure_input.h @@ -71,11 +71,11 @@ private: std::unique_ptr profiles; - std::array player_controllers; - std::array player_tabs; + std::array player_controllers{}; + std::array player_tabs{}; // Checkboxes representing the "Connected Controllers". - std::array connected_controller_checkboxes; - ConfigureInputAdvanced* advanced; + std::array connected_controller_checkboxes{}; + ConfigureInputAdvanced* advanced = nullptr; Core::System& system; }; diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index 5c7eb59d7c..b0a28c2545 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -689,10 +689,10 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen { // Draw joysticks using namespace Settings::NativeAnalog; - const auto l_stick = QPointF(stick_values[LStick].x.value, stick_values[LStick].y.value); - const auto l_button = button_values[Settings::NativeButton::LStick]; - const auto r_stick = QPointF(stick_values[RStick].x.value, stick_values[RStick].y.value); - const auto r_button = button_values[Settings::NativeButton::RStick]; + const auto& l_stick = QPointF(stick_values[LStick].x.value, stick_values[LStick].y.value); + const auto& l_button = button_values[Settings::NativeButton::LStick]; + const auto& r_stick = QPointF(stick_values[RStick].x.value, stick_values[RStick].y.value); + const auto& r_button = button_values[Settings::NativeButton::RStick]; DrawJoystick(p, center + QPointF(-171, -41) + (l_stick * 4), 1.0f, l_button); DrawJoystick(p, center + QPointF(171, 8) + (r_stick * 4), 1.0f, r_button); diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 76340912d3..ceca6eb2b6 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h @@ -214,7 +214,7 @@ private: bool mapping_active{}; int blink_counter{}; - int callback_key; + int callback_key{}; QColor button_color{}; ColorMapping colors{}; Core::HID::LedPattern led_pattern{0, 0, 0, 0}; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4604a7b904..373371555b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1607,7 +1607,7 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { auto_paused = true; OnPauseGame(); - } else if (!emu_thread->IsRunning() && auto_paused && state == Qt::ApplicationActive) { + } else if (!emu_thread->IsRunning() && auto_paused && (state & Qt::ApplicationActive)) { auto_paused = false; OnStartGame(); } @@ -1617,7 +1617,7 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { Settings::values.audio_muted = true; auto_muted = true; - } else if (auto_muted && state == Qt::ApplicationActive) { + } else if (auto_muted && (state & Qt::ApplicationActive)) { Settings::values.audio_muted = false; auto_muted = false; } diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 7857788fcf..91fdadffbd 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -513,13 +513,13 @@ private: MultiplayerState* multiplayer_state = nullptr; - GRenderWindow* render_window; - GameList* game_list; - LoadingScreen* loading_screen; + GRenderWindow* render_window = nullptr; + GameList* game_list = nullptr; + LoadingScreen* loading_screen = nullptr; QTimer shutdown_timer; OverlayDialog* shutdown_dialog{}; - GameListPlaceholder* game_list_placeholder; + GameListPlaceholder* game_list_placeholder = nullptr; std::vector vk_device_records; @@ -566,8 +566,8 @@ private: std::unique_ptr provider; // Debugger panes - WaitTreeWidget* waitTreeWidget; - ControllerDialog* controller_dialog; + WaitTreeWidget* waitTreeWidget = nullptr; + ControllerDialog* controller_dialog = nullptr; QAction* actions_recent_files[max_recent_files_item]; @@ -579,7 +579,7 @@ private: QTranslator translator; // Install progress dialog - QProgressDialog* install_progress; + QProgressDialog* install_progress = nullptr; // Last game booted, used for multi-process apps QString last_filename_booted; diff --git a/src/yuzu/multiplayer/lobby_p.h b/src/yuzu/multiplayer/lobby_p.h index 77ec1fcde1..7873590137 100644 --- a/src/yuzu/multiplayer/lobby_p.h +++ b/src/yuzu/multiplayer/lobby_p.h @@ -175,7 +175,7 @@ public: private: QString username; QString nickname; - u64 title_id; + u64 title_id{}; QString game_name; }; diff --git a/src/yuzu/play_time_manager.h b/src/yuzu/play_time_manager.h index 1714b91313..a521e470b9 100644 --- a/src/yuzu/play_time_manager.h +++ b/src/yuzu/play_time_manager.h @@ -40,7 +40,7 @@ private: void Save(); PlayTimeDatabase database; - u64 running_program_id; + u64 running_program_id{}; std::jthread play_time_thread; Service::Account::ProfileManager& manager; };