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

Fix Visual studio project files #9716

Merged
merged 3 commits into from Feb 4, 2021
Merged

Fix Visual studio project files #9716

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
77d6da9
Qt: remove Q_OBJECT for mouse/kb handlers
Nekotekina Feb 4, 2021
f17671a
Rename some variables to snake_case
Megamouse Feb 2, 2021
aa81182
Fix rpcs3.vcxproj
Megamouse Feb 4, 2021
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
3 changes: 1 addition & 2 deletions rpcs3/Input/basic_keyboard_handler.h
View file
Open in desktop
Expand Up @@ -6,9 +6,8 @@
#include <QKeyEvent>
#include <QWindow>

class basic_keyboard_handler final : public QObject, public KeyboardHandlerBase
class basic_keyboard_handler final : public KeyboardHandlerBase, public QObject
{
Q_OBJECT
public:
virtual void Init(const u32 max_connect) override;

Expand Down
3 changes: 1 addition & 2 deletions rpcs3/Input/basic_mouse_handler.h
View file
Open in desktop
Expand Up @@ -7,9 +7,8 @@
#include <QMouseEvent>
#include <QWheelEvent>

class basic_mouse_handler final : public QObject, public MouseHandlerBase
class basic_mouse_handler final : public MouseHandlerBase, public QObject
{
Q_OBJECT
public:
virtual void Init(const u32 max_connect) override;

Expand Down
159 changes: 5 additions & 154 deletions rpcs3/rpcs3.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 15 additions & 39 deletions rpcs3/rpcs3.vcxproj.filters
View file
Open in desktop
Expand Up @@ -316,30 +316,6 @@
<ClCompile Include="Input\basic_keyboard_handler.cpp">
<Filter>Io\Basic</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_basic_keyboard_handler.cpp">
<Filter>Generated Files\Release - LLVM</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Debug\moc_basic_keyboard_handler.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release\moc_basic_keyboard_handler.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_basic_keyboard_handler.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_basic_mouse_handler.cpp">
<Filter>Generated Files\Release - LLVM</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Debug\moc_basic_mouse_handler.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release\moc_basic_mouse_handler.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_basic_mouse_handler.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="Input\basic_mouse_handler.cpp">
<Filter>Io\Basic</Filter>
</ClCompile>
Expand Down Expand Up @@ -1224,6 +1200,21 @@
<ClInclude Include="rpcs3qt\numbered_widget_item.h">
<Filter>Gui\custom items</Filter>
</ClInclude>
<ClInclude Include="Input\basic_keyboard_handler.h">
<Filter>Io\Basic</Filter>
</ClInclude>
<ClInclude Include="Input\basic_mouse_handler.h">
<Filter>Io\Basic</Filter>
</ClInclude>
<ClInclude Include="main_application.h">
<Filter>rpcs3</Filter>
</ClInclude>
<ClInclude Include="rpcs3qt\breakpoint_handler.h">
<Filter>Gui\debugger</Filter>
</ClInclude>
<ClInclude Include="rpcs3qt\progress_dialog.h">
<Filter>Gui\misc dialogs</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="debug\moc_predefs.h.cbt">
Expand All @@ -1232,12 +1223,6 @@
<CustomBuild Include="release\moc_predefs.h.cbt">
<Filter>Generated Files</Filter>
</CustomBuild>
<CustomBuild Include="Input\basic_keyboard_handler.h">
<Filter>Io\Basic</Filter>
</CustomBuild>
<CustomBuild Include="Input\basic_mouse_handler.h">
<Filter>Io\Basic</Filter>
</CustomBuild>
<ClInclude Include="resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -1337,9 +1322,6 @@
<CustomBuild Include="rpcs3qt\save_manager_dialog.h">
<Filter>Gui\save</Filter>
</CustomBuild>
<CustomBuild Include="rpcs3qt\progress_dialog.h">
<Filter>Gui\misc dialogs</Filter>
</CustomBuild>
<CustomBuild Include="rpcs3qt\game_compatibility.h">
<Filter>Gui\game list</Filter>
</CustomBuild>
Expand All @@ -1352,9 +1334,6 @@
<CustomBuild Include="rpcs3qt\debugger_list.h">
<Filter>Gui\debugger</Filter>
</CustomBuild>
<CustomBuild Include="rpcs3qt\breakpoint_handler.h">
<Filter>Gui\debugger</Filter>
</CustomBuild>
<CustomBuild Include="rpcs3qt\breakpoint_list.h">
<Filter>Gui\debugger</Filter>
</CustomBuild>
Expand All @@ -1379,9 +1358,6 @@
<CustomBuild Include="rpcs3qt\gui_application.h">
<Filter>Gui</Filter>
</CustomBuild>
<CustomBuild Include="main_application.h">
<Filter>rpcs3</Filter>
</CustomBuild>
<CustomBuild Include="headless_application.h">
<Filter>rpcs3</Filter>
</CustomBuild>
Expand Down
20 changes: 10 additions & 10 deletions rpcs3/rpcs3qt/emu_settings.cpp
View file
Open in desktop
Expand Up @@ -96,8 +96,8 @@ void emu_settings::LoadSettings(const std::string& title_id)

if (default_error.empty())
{
m_defaultSettings = default_config;
m_currentSettings = YAML::Clone(default_config);
m_default_settings = default_config;
m_current_settings = YAML::Clone(default_config);
}
else
{
Expand All @@ -114,7 +114,7 @@ void emu_settings::LoadSettings(const std::string& title_id)

if (global_error.empty())
{
m_currentSettings += global_config;
m_current_settings += global_config;
}
else
{
Expand Down Expand Up @@ -148,7 +148,7 @@ void emu_settings::LoadSettings(const std::string& title_id)

if (custom_error.empty())
{
m_currentSettings += custom_config;
m_current_settings += custom_config;
}
else
{
Expand All @@ -164,7 +164,7 @@ void emu_settings::LoadSettings(const std::string& title_id)
void emu_settings::SaveSettings()
{
YAML::Emitter out;
emit_data(out, m_currentSettings);
emit_data(out, m_current_settings);

std::string config_name;

Expand Down Expand Up @@ -652,12 +652,12 @@ void emu_settings::EnhanceRadioButton(QButtonGroup* button_group, emu_settings_t

std::vector<std::string> emu_settings::GetLibrariesControl()
{
return m_currentSettings["Core"]["Libraries Control"].as<std::vector<std::string>, std::initializer_list<std::string>>({});
return m_current_settings["Core"]["Libraries Control"].as<std::vector<std::string>, std::initializer_list<std::string>>({});
}

void emu_settings::SaveSelectedLibraries(const std::vector<std::string>& libs)
{
m_currentSettings["Core"]["Libraries Control"] = libs;
m_current_settings["Core"]["Libraries Control"] = libs;
}

QStringList emu_settings::GetSettingOptions(emu_settings_type type) const
Expand All @@ -667,7 +667,7 @@ QStringList emu_settings::GetSettingOptions(emu_settings_type type) const

std::string emu_settings::GetSettingDefault(emu_settings_type type) const
{
if (auto node = cfg_adapter::get_node(m_defaultSettings, settings_location[type]); node && node.IsScalar())
if (auto node = cfg_adapter::get_node(m_default_settings, settings_location[type]); node && node.IsScalar())
{
return node.Scalar();
}
Expand All @@ -678,7 +678,7 @@ std::string emu_settings::GetSettingDefault(emu_settings_type type) const

std::string emu_settings::GetSetting(emu_settings_type type) const
{
if (auto node = cfg_adapter::get_node(m_currentSettings, settings_location[type]); node && node.IsScalar())
if (auto node = cfg_adapter::get_node(m_current_settings, settings_location[type]); node && node.IsScalar())
{
return node.Scalar();
}
Expand All @@ -689,7 +689,7 @@ std::string emu_settings::GetSetting(emu_settings_type type) const

void emu_settings::SetSetting(emu_settings_type type, const std::string& val)
{
cfg_adapter::get_node(m_currentSettings, settings_location[type]) = val;
cfg_adapter::get_node(m_current_settings, settings_location[type]) = val;
}

void emu_settings::OpenCorrectionDialog(QWidget* parent)
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/rpcs3qt/emu_settings.h
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@ public Q_SLOTS:
/** Writes the unsaved settings to file. Used in settings dialog on accept.*/
void SaveSettings();
private:
YAML::Node m_defaultSettings; // The default settings as a YAML node.
YAML::Node m_currentSettings; // The current settings as a YAML node.
YAML::Node m_default_settings; // The default settings as a YAML node.
YAML::Node m_current_settings; // The current settings as a YAML node.
std::string m_title_id;
};
1 change: 0 additions & 1 deletion rpcs3/rpcs3qt/settings_dialog.cpp
View file
Open in desktop
Expand Up @@ -26,7 +26,6 @@
#include "Emu/System.h"
#include "Emu/system_config.h"
#include "Emu/title.h"
#include "Crypto/unself.h"

#include <set>
#include <unordered_set>
Expand Down