archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some includes and warnings

Browse source
This commit is contained in:
Megamouse 2023-01-10 20:30:03 +01:00
parent cf1e68fb0e
commit 6bcb5ae66b
6 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/rpcs3qt/emu_settings_type.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <QMap> #include <QMap>
#include <vector>
// Node location // Node location
using cfg_location = std::vector<const char*>; using cfg_location = std::vector<const char*>;

2
rpcs3/rpcs3qt/log_viewer.cpp
View file

@ -3,9 +3,9 @@
#include "log_viewer.h" #include "log_viewer.h"
#include "gui_settings.h" #include "gui_settings.h"
#include "syntax_highlighter.h" #include "syntax_highlighter.h"
#include "find_dialog.h"
#include "config_checker.h" #include "config_checker.h"
#include <QActionGroup>
#include <QApplication> #include <QApplication>
#include <QMenu> #include <QMenu>
#include <QFile> #include <QFile>

3
rpcs3/rpcs3qt/log_viewer.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "find_dialog.h"
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QDropEvent> #include <QDropEvent>
@ -8,7 +10,6 @@
class LogHighlighter; class LogHighlighter;
class gui_settings; class gui_settings;
class find_dialog;
class log_viewer : public QWidget class log_viewer : public QWidget
{ {

7
rpcs3/rpcs3qt/patch_manager_dialog.cpp
View file

@ -288,7 +288,9 @@ void patch_manager_dialog::populate_tree()
const QString q_description = QString::fromStdString(description); const QString q_description = QString::fromStdString(description);
QString visible_description = q_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) // 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) if (const auto matches = gui::utils::find_children_by_data(serial_level_item, match_criteria, false); matches.count() > 0)
@ -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--) for (int i = ui->patch_tree->topLevelItemCount() - 1; i >= 0; i--)
{ {

2
rpcs3/rpcs3qt/update_manager.cpp
View file

@ -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); update_log.error("Failed to create new AppImage file: %s (%s)", replace_path, fs::g_tls_error);
return false; 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); update_log.error("Failed to write new AppImage file: %s", replace_path);
return false; return false;

3
rpcs3/util/cpu_stats.hpp
View file

@ -1,12 +1,11 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include <vector>
#ifdef _WIN32 #ifdef _WIN32
#include <pdh.h> #include <pdh.h>
#include <pdhmsg.h> #include <pdhmsg.h>
#elif __linux__
#include <vector>
#endif #endif
namespace utils namespace utils