Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Road to Qt6: preparations #13202

Merged
merged 3 commits into from Jan 10, 2023
Merged

Road to Qt6: preparations #13202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c731a
Fix some includes and warnings
Megamouse Jan 10, 2023
46ab9cc
cellMouse: decrease some log levels
Megamouse Jan 10, 2023
ecc6ecd
Qt: use play_sound callback instead of QSound
Megamouse Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions rpcs3/Emu/Cell/Modules/cellMouse.cpp
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ void MouseHandlerBase::save(utils::serial& ar)

error_code cellMouseInit(u32 max_connect)
{
sys_io.warning("cellMouseInit(max_connect=%d)", max_connect);
sys_io.notice("cellMouseInit(max_connect=%d)", max_connect);

auto& handler = g_fxo->get<MouseHandlerBase>();

Expand Down Expand Up @@ -259,7 +259,7 @@ error_code cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)

error_code cellMouseGetDataList(u32 port_no, vm::ptr<CellMouseDataList> data)
{
sys_io.warning("cellMouseGetDataList(port_no=%d, data=0x%x)", port_no, data);
sys_io.notice("cellMouseGetDataList(port_no=%d, data=0x%x)", port_no, data);

auto& handler = g_fxo->get<MouseHandlerBase>();

Expand Down Expand Up @@ -406,7 +406,7 @@ error_code cellMouseGetTabletDataList(u32 port_no, vm::ptr<CellMouseTabletDataLi

error_code cellMouseGetRawData(u32 port_no, vm::ptr<CellMouseRawData> data)
{
sys_io.warning("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data);
sys_io.notice("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data);

auto& handler = g_fxo->get<MouseHandlerBase>();

Expand Down
1 change: 1 addition & 0 deletions rpcs3/rpcs3qt/emu_settings_type.h
View file
Open in desktop
@@ -1,6 +1,7 @@
#pragma once

#include <QMap>
#include <vector>

// Node location
using cfg_location = std::vector<const char*>;
Expand Down
5 changes: 2 additions & 3 deletions rpcs3/rpcs3qt/gs_frame.cpp
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@
#include <QMessageBox>
#include <QPainter>
#include <QScreen>
#include <QSound>

#include <string>
#include <thread>
Expand Down Expand Up @@ -465,7 +464,7 @@ void gs_frame::toggle_recording()
// Play a sound
if (const std::string sound_path = fs::get_config_dir() + "sounds/snd_recording.wav"; fs::is_file(sound_path))
{
QSound::play(qstr(sound_path));
Emu.GetCallbacks().play_sound(sound_path);
}
else
{
Expand Down Expand Up @@ -1006,7 +1005,7 @@ void gs_frame::take_screenshot(std::vector<u8> data, const u32 sshot_width, cons
{
if (const std::string sound_path = fs::get_config_dir() + "sounds/snd_screenshot.wav"; fs::is_file(sound_path))
{
QSound::play(qstr(sound_path));
Emu.GetCallbacks().play_sound(sound_path);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/log_viewer.cpp
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
#include "log_viewer.h"
#include "gui_settings.h"
#include "syntax_highlighter.h"
#include "find_dialog.h"
#include "config_checker.h"

#include <QActionGroup>
#include <QApplication>
#include <QMenu>
#include <QFile>
Expand Down
3 changes: 2 additions & 1 deletion rpcs3/rpcs3qt/log_viewer.h
View file
Open in desktop
@@ -1,5 +1,7 @@
#pragma once

#include "find_dialog.h"

#include <QPlainTextEdit>
#include <QDropEvent>

Expand All @@ -8,7 +10,6 @@

class LogHighlighter;
class gui_settings;
class find_dialog;

class log_viewer : public QWidget
{
Expand Down
7 changes: 5 additions & 2 deletions rpcs3/rpcs3qt/patch_manager_dialog.cpp
View file
Open in desktop
Expand Up @@ -288,7 +288,9 @@ void patch_manager_dialog::populate_tree()
const QString q_description = QString::fromStdString(description);
QString visible_description = q_description;

const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(description_role, q_description) << QPair(persistance_role, true);
const QList<QPair<int, QVariant>> match_criteria = QList<QPair<int, QVariant>>()
<< QPair<int, QVariant>(description_role, q_description)
<< QPair<int, QVariant>(persistance_role, true);

// Add counter to leafs if the name already exists due to different hashes of the same game (PPU, SPU, PRX, OVL)
if (const auto matches = gui::utils::find_children_by_data(serial_level_item, match_criteria, false); matches.count() > 0)
Expand Down Expand Up @@ -322,7 +324,8 @@ void patch_manager_dialog::populate_tree()
}
}

const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(persistance_role, true);
const QList<QPair<int, QVariant>> match_criteria = QList<QPair<int, QVariant>>()
<< QPair<int, QVariant>(persistance_role, true);

for (int i = ui->patch_tree->topLevelItemCount() - 1; i >= 0; i--)
{
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/update_manager.cpp
View file
Open in desktop
Expand Up @@ -606,7 +606,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
update_log.error("Failed to create new AppImage file: %s (%s)", replace_path, fs::g_tls_error);
return false;
}
if (new_appimage.write(data.data(), data.size()) != data.size() + 0u)
if (new_appimage.write(data.data(), data.size()) != data.size() + 0ull)
{
update_log.error("Failed to write new AppImage file: %s", replace_path);
return false;
Expand Down
3 changes: 1 addition & 2 deletions rpcs3/util/cpu_stats.hpp
View file
Open in desktop
@@ -1,12 +1,11 @@
#pragma once

#include "util/types.hpp"
#include <vector>

#ifdef _WIN32
#include <pdh.h>
#include <pdhmsg.h>
#elif __linux__
#include <vector>
#endif

namespace utils
Expand Down