mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-17 19:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle some warnings

Browse Source
This commit is contained in:
Megamouse 2019-05-16 20:49:48 +02:00
parent d9ab2c7104
commit 34964e0e4f
13 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -277,7 +277,7 @@ error_code getText(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo, bool is
bool do_copy = OutputInfo->pResultString && (OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK || (is_unload && OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT)); bool do_copy = OutputInfo->pResultString && (OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK || (is_unload && OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT));
for (u32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++) for (s32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
{ {
osk->osk_text_old[i] = osk->osk_text[i]; osk->osk_text_old[i] = osk->osk_text[i];

12
rpcs3/Emu/GameInfo.h
View File

@ -1,4 +1,4 @@
#pragma once #pragma once
struct GameInfo struct GameInfo
{ {
@ -11,11 +11,11 @@ struct GameInfo
std::string category; std::string category;
std::string fw; std::string fw;
u32 attr; u32 attr = 0;
u32 bootable; u32 bootable = 0;
u32 parental_lvl; u32 parental_lvl = 0;
u32 sound_format; u32 sound_format = 0;
u32 resolution; u32 resolution = 0;
GameInfo() GameInfo()
{ {

7
rpcs3/Emu/Io/PadHandler.h
View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <cmath> #include <cmath>
#include <vector> #include <vector>
@ -175,7 +175,7 @@ struct Pad
// Cable State: 0 - 1 plugged in ? // Cable State: 0 - 1 plugged in ?
u8 m_cable_state; u8 m_cable_state;
// DS4: 0 - 9 while unplugged, 0 - 10 while plugged in, 11 charge complete // DS4: 0 - 9 while unplugged, 0 - 10 while plugged in, 11 charge complete
// XInput: 0 = Empty, 1 = Low, 2 = Medium, 3 = Full // XInput: 0 = Empty, 1 = Low, 2 = Medium, 3 = Full
u8 m_battery_level; u8 m_battery_level;
@ -227,6 +227,9 @@ struct Pad
, m_port_status(port_status) , m_port_status(port_status)
, m_device_capability(device_capability) , m_device_capability(device_capability)
, m_device_type(device_type) , m_device_type(device_type)
, m_class_type(0)
, m_cable_state(0)
, m_battery_level(0)
, m_digital_1(0) , m_digital_1(0)
, m_digital_2(0) , m_digital_2(0)

4
rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp
View File

@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "overlays.h" #include "overlays.h"
#include "../GSRender.h" #include "../GSRender.h"
@ -19,7 +19,7 @@ namespace rsx
} }
unsigned long hexval; unsigned long hexval;
const int len = hex_color.length(); const size_t len = hex_color.length();
try try
{ {

4
rpcs3/ds4_pad_handler.cpp
View File

@ -1,4 +1,4 @@
#include "ds4_pad_handler.h" #include "ds4_pad_handler.h"
#include <thread> #include <thread>
@ -494,7 +494,7 @@ void ds4_pad_handler::ProcessDataToPad(const std::shared_ptr<DS4Device>& device,
#endif #endif
// used to get the absolute value of an axis // used to get the absolute value of an axis
s32 stick_val[4]; s32 stick_val[4]{0};
// Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now) // Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now)
for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++) for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++)

4
rpcs3/mm_joystick_handler.cpp
View File

@ -1,4 +1,4 @@
#ifdef _WIN32 #ifdef _WIN32
#include "mm_joystick_handler.h" #include "mm_joystick_handler.h"
mm_joystick_handler::mm_joystick_handler() : PadHandlerBase(pad_handler::mm) mm_joystick_handler::mm_joystick_handler() : PadHandlerBase(pad_handler::mm)
@ -244,7 +244,7 @@ void mm_joystick_handler::ThreadProc()
TranslateButtonPress(btn.m_keyCode, btn.m_pressed, btn.m_value); TranslateButtonPress(btn.m_keyCode, btn.m_pressed, btn.m_value);
} }
s32 stick_val[4]; s32 stick_val[4]{0};
// Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now) // Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now)
for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++) for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++)

2
rpcs3/rpcs3qt/game_list_frame.h
View File

@ -310,5 +310,5 @@ private:
QSize m_Icon_Size = gui::gl_icon_size_min; // ensure a valid size QSize m_Icon_Size = gui::gl_icon_size_min; // ensure a valid size
qreal m_Margin_Factor; qreal m_Margin_Factor;
qreal m_Text_Factor; qreal m_Text_Factor;
bool m_drawCompatStatusToGrid; bool m_drawCompatStatusToGrid = false;
}; };

9
rpcs3/rpcs3qt/main_window.cpp
View File

@ -1417,7 +1417,7 @@ void main_window::CreateConnects()
connect(m_categoryVisibleActGroup, &QActionGroup::triggered, [=](QAction* act) connect(m_categoryVisibleActGroup, &QActionGroup::triggered, [=](QAction* act)
{ {
QStringList categories; QStringList categories;
int id; int id = 0;
const bool& checked = act->isChecked(); const bool& checked = act->isChecked();
if (act == ui->showCatHDDGameAct) categories += category::hdd_game, id = Category::HDD_Game; if (act == ui->showCatHDDGameAct) categories += category::hdd_game, id = Category::HDD_Game;
@ -1432,8 +1432,11 @@ void main_window::CreateConnects()
else if (act == ui->showCatOtherAct) categories += category::others, id = Category::Others; else if (act == ui->showCatOtherAct) categories += category::others, id = Category::Others;
else LOG_WARNING(GENERAL, "categoryVisibleActGroup: category action not found"); else LOG_WARNING(GENERAL, "categoryVisibleActGroup: category action not found");
m_gameListFrame->ToggleCategoryFilter(categories, checked); if (!categories.isEmpty())
guiSettings->SetCategoryVisibility(id, checked); {
m_gameListFrame->ToggleCategoryFilter(categories, checked);
guiSettings->SetCategoryVisibility(id, checked);
}
}); });
connect(ui->aboutAct, &QAction::triggered, [this] connect(ui->aboutAct, &QAction::triggered, [this]

16
rpcs3/rpcs3qt/main_window.h
View File

@ -29,7 +29,7 @@ class main_window : public QMainWindow
Ui::main_window *ui; Ui::main_window *ui;
bool m_sys_menu_opened; bool m_sys_menu_opened = false;
bool m_is_list_mode = true; bool m_is_list_mode = true;
bool m_save_slider_pos = false; bool m_save_slider_pos = false;
int m_other_slider_pos = 0; int m_other_slider_pos = 0;
@ -130,17 +130,17 @@ private:
q_pair_list m_rg_entries; q_pair_list m_rg_entries;
QList<QAction*> m_recentGameActs; QList<QAction*> m_recentGameActs;
QActionGroup* m_iconSizeActGroup; QActionGroup* m_iconSizeActGroup = nullptr;
QActionGroup* m_listModeActGroup; QActionGroup* m_listModeActGroup = nullptr;
QActionGroup* m_categoryVisibleActGroup; QActionGroup* m_categoryVisibleActGroup = nullptr;
QMessageBox::StandardButton m_install_bulk = QMessageBox::NoButton; QMessageBox::StandardButton m_install_bulk = QMessageBox::NoButton;
// Dockable widget frames // Dockable widget frames
QMainWindow *m_mw; QMainWindow *m_mw = nullptr;
log_frame *m_logFrame; log_frame* m_logFrame = nullptr;
debugger_frame *m_debuggerFrame; debugger_frame* m_debuggerFrame = nullptr;
game_list_frame *m_gameListFrame; game_list_frame* m_gameListFrame = nullptr;
std::shared_ptr<gui_settings> guiSettings; std::shared_ptr<gui_settings> guiSettings;
std::shared_ptr<emu_settings> emuSettings; std::shared_ptr<emu_settings> emuSettings;
}; };

6
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -416,7 +416,7 @@ void pad_settings_dialog::InitButtons()
continue; continue;
} }
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>();
m_handler->GetNextButtonPress(info.name, [=](u16 val, std::string name, std::string pad_name, int preview_values[6]) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false); m_handler->GetNextButtonPress(info.name, [=](u16, std::string, std::string pad_name, int[6]) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
} }
}); });
} }
@ -670,7 +670,7 @@ void pad_settings_dialog::mouseReleaseEvent(QMouseEvent* event)
ReactivateButtons(); ReactivateButtons();
} }
void pad_settings_dialog::mouseMoveEvent(QMouseEvent* event) void pad_settings_dialog::mouseMoveEvent(QMouseEvent*/* event*/)
{ {
if (m_handler->m_type != pad_handler::keyboard) if (m_handler->m_type != pad_handler::keyboard)
{ {
@ -960,7 +960,7 @@ void pad_settings_dialog::ChangeInputType()
continue; continue;
} }
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>();
m_handler->GetNextButtonPress(info.name, [=](u16 val, std::string name, std::string pad_name, int preview_values[6]) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false); m_handler->GetNextButtonPress(info.name, [=](u16, std::string, std::string pad_name, int[6]) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
if (info.name == device) if (info.name == device)
{ {
ui->chooseDevice->setCurrentIndex(i); ui->chooseDevice->setCurrentIndex(i);

10
rpcs3/rpcs3qt/pad_settings_dialog.h
View File

@ -18,7 +18,7 @@ namespace Ui
struct pad_info struct pad_info
{ {
std::string name; std::string name;
bool is_connected; bool is_connected{false};
}; };
Q_DECLARE_METATYPE(pad_info); Q_DECLARE_METATYPE(pad_info);
@ -104,7 +104,7 @@ private:
std::string m_title_id; std::string m_title_id;
// TabWidget // TabWidget
QTabWidget* m_tabs; QTabWidget* m_tabs = nullptr;
// Capabilities // Capabilities
bool m_enable_buttons{ false }; bool m_enable_buttons{ false };
@ -113,7 +113,7 @@ private:
bool m_enable_led{ false }; bool m_enable_led{ false };
// Button Mapping // Button Mapping
QButtonGroup* m_padButtons; QButtonGroup* m_padButtons = nullptr;
u32 m_button_id = id_pad_begin; u32 m_button_id = id_pad_begin;
std::map<int /*id*/, pad_button /*info*/> m_cfg_entries; std::map<int /*id*/, pad_button /*info*/> m_cfg_entries;
@ -124,8 +124,8 @@ private:
int ry = 0; int ry = 0;
// Rumble // Rumble
s32 m_min_force; s32 m_min_force = 0;
s32 m_max_force; s32 m_max_force = 0;
// Backup for standard button palette // Backup for standard button palette
QPalette m_palette; QPalette m_palette;

4
rpcs3/rpcs3qt/rsx_debugger.cpp
View File

@ -1,4 +1,4 @@

#include "rsx_debugger.h" #include "rsx_debugger.h"
#include "qt_utils.h" #include "qt_utils.h"
@ -633,7 +633,7 @@ void rsx_debugger::GetMemory()
int item_count = m_list_commands->rowCount(); int item_count = m_list_commands->rowCount();
// Write information // Write information
for(u32 i=0, addr = m_addr; i < item_count; i++, addr += 4) for (int i = 0, addr = m_addr; i < item_count; i++, addr += 4)
{ {
QTableWidgetItem* address_item = new QTableWidgetItem(qstr(fmt::format("%07x", addr))); QTableWidgetItem* address_item = new QTableWidgetItem(qstr(fmt::format("%07x", addr)));
address_item->setData(Qt::UserRole, addr); address_item->setData(Qt::UserRole, addr);

4
rpcs3/xinput_pad_handler.cpp
View File

@ -1,4 +1,4 @@

#ifdef _WIN32 #ifdef _WIN32
#include "xinput_pad_handler.h" #include "xinput_pad_handler.h"
@ -369,7 +369,7 @@ void xinput_pad_handler::ThreadProc()
} }
// used to get the absolute value of an axis // used to get the absolute value of an axis
s32 stick_val[4]; s32 stick_val[4]{0};
// Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now) // Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now)
for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++) for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++)